1 files changed, 35 insertions, 35 deletions
diff --git a/docs/doc/fromDyalog.html b/docs/doc/fromDyalog.html
index 57196984..ae6fc64b 100644
--- a/docs/doc/fromDyalog.html
+++ b/docs/doc/fromDyalog.html
@@ -25,7 +25,7 @@
 <tr>
 <td>Monad</td>
 <td><code><span class='Value'>*</span></code></td>
-<td><code><span class='Value'>*</span><span class='Composition'>∘</span><span class='Paren'>(</span><span class='Function'>÷</span><span class='Number'>2</span><span class='Paren'>)</span></code></td>
+<td><code><span class='Value'>*</span><span class='Modifier2'>∘</span><span class='Paren'>(</span><span class='Function'>÷</span><span class='Number'>2</span><span class='Paren'>)</span></code></td>
 <td><code><span class='Value'>[</span><span class='Function'>⍋</span><span class='Value'>]</span></code></td>
 <td><code><span class='Value'>[</span><span class='Function'>⍒</span><span class='Value'>]</span></code></td>
 <td><code><span class='Value'>~</span></code></td>
@@ -40,7 +40,7 @@
 <tr>
 <td>Dyad</td>
 <td><code><span class='Value'>*</span></code></td>
-<td><code><span class='Value'>*</span><span class='Composition'>∘</span><span class='Function'>÷</span><span class='Value'>⍨</span></code></td>
+<td><code><span class='Value'>*</span><span class='Modifier2'>∘</span><span class='Function'>÷</span><span class='Value'>⍨</span></code></td>
 <td><code><span class='Function'>∧</span></code></td>
 <td><code><span class='Function'>∨</span></code></td>
 <td><code><span class='Number'>1</span><span class='Function'>+-</span></code></td>
@@ -108,7 +108,7 @@
 </tr>
 </tbody>
 </table>
-<p>Modifiers and combinators are a little harder. Many have equivalents in some cases, but Dyalog sometimes chooses different functionality based on whether the operand is an array. In BQN an array is always treated as a constant function.</p>
+<p>Modifiers are a little harder. Many have equivalents in some cases, but Dyalog sometimes chooses different functionality based on whether the operand is an array. In BQN an array is always treated as a constant function.</p>
 <table>
 <thead>
 <tr>
@@ -116,55 +116,55 @@
 <th><code><span class='Modifier'>¨</span></code></th>
 <th><code><span class='Modifier'>⌜</span></code></th>
 <th><code><span class='Modifier'>´</span></code></th>
-<th><code><span class='Composition'>⎉</span></code></th>
-<th><code><span class='Composition'>⍟</span></code></th>
+<th><code><span class='Modifier2'>⎉</span></code></th>
+<th><code><span class='Modifier2'>⍟</span></code></th>
 <th><code><span class='Modifier'>˜</span></code></th>
-<th><code><span class='Composition'>∘</span></code></th>
-<th><code><span class='Composition'>○</span></code></th>
-<th><code><span class='Composition'>⟜</span></code></th>
+<th><code><span class='Modifier2'>∘</span></code></th>
+<th><code><span class='Modifier2'>○</span></code></th>
+<th><code><span class='Modifier2'>⟜</span></code></th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td>Dyalog</td>
 <td><code><span class='Modifier'>¨</span></code></td>
-<td><code><span class='Composition'>∘</span><span class='Number'>.</span></code></td>
+<td><code><span class='Modifier2'>∘</span><span class='Number'>.</span></code></td>
 <td><code><span class='Value'>⌿</span></code></td>
 <td><code><span class='Value'>⍤</span></code></td>
 <td><code><span class='Value'>⍣</span></code></td>
 <td><code><span class='Value'>⍨</span></code></td>
 <td><code><span class='Value'>⍤</span></code></td>
 <td><code><span class='Value'>⍥</span></code></td>
-<td><code><span class='Composition'>∘</span></code></td>
+<td><code><span class='Modifier2'>∘</span></code></td>
 </tr>
 </tbody>
 </table>
-<p>In BQN <code><span class='Composition'>⎉</span></code> is Rank and <code><span class='Composition'>∘</span></code> is Atop. Dyalog's Atop (<code><span class='Value'>⍤</span></code>) and Over (<code><span class='Value'>⍥</span></code>) were added in version 18.0.</p>
+<p>In BQN <code><span class='Modifier2'>⎉</span></code> is Rank and <code><span class='Modifier2'>∘</span></code> is Atop. Dyalog's Atop (<code><span class='Value'>⍤</span></code>) and Over (<code><span class='Value'>⍥</span></code>) were added in version 18.0.</p>
 <h2 id="for-writing">For writing</h2>
-<p>The tables below give approximate implementations of Dyalog primitives for the ones that aren't the same. First- and last-axis pairs are also mostly omitted. BQN just has the first-axis form, and you can get the last-axis form with <code><span class='Composition'>⎉</span><span class='Number'>1</span></code>.</p>
+<p>The tables below give approximate implementations of Dyalog primitives for the ones that aren't the same. First- and last-axis pairs are also mostly omitted. BQN just has the first-axis form, and you can get the last-axis form with <code><span class='Modifier2'>⎉</span><span class='Number'>1</span></code>.</p>
 <table>
 <tr><th colspan=3>Functions</th></tr>
 <tr><th> Glyph          </th><th> Monadic                      </th><th> Dyadic </th>               </tr>
 <tr><td> <code><span class='Value'>*</span></code> </td><td colspan=2><code><span class='Function'>⋆</span></code></td>                                      </tr>
-<tr><td> <code><span class='Composition'>⍟</span></code> </td><td colspan=2><code><span class='Function'>⋆</span><span class='Modifier'>⁼</span></code></td>                                     </tr>
+<tr><td> <code><span class='Modifier2'>⍟</span></code> </td><td colspan=2><code><span class='Function'>⋆</span><span class='Modifier'>⁼</span></code></td>                                     </tr>
 <tr><td> <code><span class='Function'>!</span></code> </td><td colspan=2>Implement it yourself</td>                               </tr>
-<tr><td> <code><span class='Composition'>○</span></code> </td><td colspan=2>Some complex exponential stuff, maybe</td>               </tr>
-<tr><td> <code><span class='Value'>~</span></code> </td><td> <code><span class='Function'>¬</span></code>               </td><td> <code><span class='Function'>¬</span><span class='Composition'>∘</span><span class='Function'>∊/⊣</span></code></td>    </tr>
+<tr><td> <code><span class='Modifier2'>○</span></code> </td><td colspan=2>Some complex exponential stuff, maybe</td>               </tr>
+<tr><td> <code><span class='Value'>~</span></code> </td><td> <code><span class='Function'>¬</span></code>               </td><td> <code><span class='Function'>¬</span><span class='Modifier2'>∘</span><span class='Function'>∊/⊣</span></code></td>    </tr>
 <tr><td> <code><span class='Value'>?</span></code> </td><td colspan=2>Library?</td>                                            </tr>
-<tr><td> <code><span class='Value'>⍲</span></code> </td><td>                              </td><td> <code><span class='Function'>¬</span><span class='Composition'>∘</span><span class='Function'>∧</span></code></td>      </tr>
-<tr><td> <code><span class='Value'>⍱</span></code> </td><td>                              </td><td> <code><span class='Function'>¬</span><span class='Composition'>∘</span><span class='Function'>∨</span></code></td>      </tr>
+<tr><td> <code><span class='Value'>⍲</span></code> </td><td>                              </td><td> <code><span class='Function'>¬</span><span class='Modifier2'>∘</span><span class='Function'>∧</span></code></td>      </tr>
+<tr><td> <code><span class='Value'>⍱</span></code> </td><td>                              </td><td> <code><span class='Function'>¬</span><span class='Modifier2'>∘</span><span class='Function'>∨</span></code></td>      </tr>
 <tr><td> <code><span class='Value'>⍴</span></code> </td><td> <code><span class='Function'>≢</span></code>               </td><td> <code><span class='Function'>⥊</span></code></td>        </tr>
-<tr><td> <code><span class='Separator'>,</span></code> </td><td> <code><span class='Function'>⥊</span></code>               </td><td> <code><span class='Function'>∾</span><span class='Composition'>⎉</span><span class='Number'>1</span></code></td>      </tr>
+<tr><td> <code><span class='Separator'>,</span></code> </td><td> <code><span class='Function'>⥊</span></code>               </td><td> <code><span class='Function'>∾</span><span class='Modifier2'>⎉</span><span class='Number'>1</span></code></td>      </tr>
 <tr><td> <code><span class='Value'>⍪</span></code> </td><td> <code><span class='Function'>⥊</span><span class='Modifier'>˘</span></code>              </td><td> <code><span class='Function'>∾</span></code></td>        </tr>
 <tr><td> <code><span class='Function'>↑</span></code> </td><td> <code><span class='Function'>></span></code>               </td><td> <code><span class='Function'>↑</span></code></td>        </tr>
 <tr><td> <code><span class='Function'>↓</span></code> </td><td> <code><span class='Function'><</span><span class='Modifier'>˘</span></code>              </td><td> <code><span class='Function'>↑</span></code></td>        </tr>
-<tr><td> <code><span class='Value'>⊂</span></code> </td><td> <code><span class='Function'><</span></code>               </td><td> <code><span class='Function'>+</span><span class='Modifier'>`</span><span class='Composition'>⊸</span><span class='Function'>⊔</span></code></td>     </tr>
-<tr><td> <code><span class='Value'>⊆</span></code> </td><td> <code><span class='Function'><</span><span class='Composition'>⍟</span><span class='Paren'>(</span><span class='Number'>0</span><span class='Function'><≡</span><span class='Paren'>)</span></code>         </td><td> <code><span class='Function'>⊔</span></code></td>        </tr>
+<tr><td> <code><span class='Value'>⊂</span></code> </td><td> <code><span class='Function'><</span></code>               </td><td> <code><span class='Function'>+</span><span class='Modifier'>`</span><span class='Modifier2'>⊸</span><span class='Function'>⊔</span></code></td>     </tr>
+<tr><td> <code><span class='Value'>⊆</span></code> </td><td> <code><span class='Function'><</span><span class='Modifier2'>⍟</span><span class='Paren'>(</span><span class='Number'>0</span><span class='Function'><≡</span><span class='Paren'>)</span></code>         </td><td> <code><span class='Function'>⊔</span></code></td>        </tr>
 <tr><td> <code><span class='Function'>∊</span></code> </td><td> <code><span class='Brace'>{</span><span class='Number'>0</span><span class='Function'>=≡</span><span class='Value'>𝕩:</span><span class='Function'>⥊</span><span class='Value'>𝕩</span><span class='Separator'>⋄</span><span class='Function'>∾⥊</span><span class='Value'>∇</span><span class='Modifier'>¨</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code> </td><td> <code><span class='Function'>∊</span></code></td>        </tr>
 <tr><td> <code><span class='Value'>⊃</span></code> </td><td colspan=2><code><span class='Function'>⊑</span></code></td>                                      </tr>
 <tr><td> <code><span class='Value'>⍀</span></code> </td><td>                              </td><td> <code><span class='Function'>/</span><span class='Modifier'>⁼</span></code></td>       </tr>
 <tr><td> <code><span class='Value'>∩</span></code> </td><td>                              </td><td> <code><span class='Function'>∊/⊣</span></code></td>      </tr>
-<tr><td> <code><span class='Value'>∪</span></code> </td><td> <code><span class='Function'>⍷</span></code>               </td><td> <code><span class='Function'>⊣∾∊</span><span class='Modifier'>˜</span><span class='Function'>¬</span><span class='Composition'>⊸</span><span class='Function'>/⊢</span></code></td> </tr>
+<tr><td> <code><span class='Value'>∪</span></code> </td><td> <code><span class='Function'>⍷</span></code>               </td><td> <code><span class='Function'>⊣∾∊</span><span class='Modifier'>˜</span><span class='Function'>¬</span><span class='Modifier2'>⊸</span><span class='Function'>/⊢</span></code></td> </tr>
 <tr><td> <code><span class='Value'>⍳</span></code> </td><td> <code><span class='Function'>↕</span></code>               </td><td> <code><span class='Function'>⊐</span></code></td>        </tr>
 <tr><td> <code><span class='Value'>⍸</span></code> </td><td> <code><span class='Function'>/</span></code>               </td><td> <code><span class='Function'>⍋</span></code></td>        </tr>
 <tr><td> <code><span class='Function'>⍋</span></code> </td><td> <code><span class='Function'>⍋</span></code>               </td><td> Give up </td>              </tr>
@@ -172,9 +172,9 @@
 <tr><td> <code><span class='Function'>≢</span></code> </td><td> <code><span class='Function'>≠</span></code>               </td><td> <code><span class='Function'>≢</span></code></td>        </tr>
 <tr><td> <code><span class='Value'>⍎</span></code> </td><td colspan=2 rowspan=2>To be decided</td>                             </tr>
 <tr><td> <code><span class='Value'>⍕</span></code> </td>                                                                       </tr>
-<tr><td> <code><span class='Value'>⊥</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Function'>+</span><span class='Composition'>⟜</span><span class='Paren'>(</span><span class='Value'>𝕨</span><span class='Composition'>⊸</span><span class='Function'>×</span><span class='Paren'>)</span><span class='Modifier'>´</span><span class='Function'>⌽</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code>    </td> </tr>
-<tr><td> <code><span class='Value'>⊤</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Value'>𝕨</span><span class='Function'>|</span><span class='Number'>1</span><span class='Function'>↓⌊</span><span class='Composition'>∘</span><span class='Function'>÷</span><span class='Modifier'>`</span><span class='Composition'>⌾</span><span class='Function'>⌽</span><span class='Value'>𝕨</span><span class='Function'>∾<</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code></td> </tr>
-<tr><td> <code><span class='Value'>⌹</span></code> </td><td colspan=2><code><span class='Function'>+</span><span class='Modifier'>´</span><span class='Composition'>∘</span><span class='Function'>×</span><span class='Composition'>⎉</span><span class='Number'>1</span><span class='Ligature'>‿</span><span class='Number'>∞</span><span class='Modifier'>⁼</span></code> I guess</td>                      </tr>
+<tr><td> <code><span class='Value'>⊥</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Function'>+</span><span class='Modifier2'>⟜</span><span class='Paren'>(</span><span class='Value'>𝕨</span><span class='Modifier2'>⊸</span><span class='Function'>×</span><span class='Paren'>)</span><span class='Modifier'>´</span><span class='Function'>⌽</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code>    </td> </tr>
+<tr><td> <code><span class='Value'>⊤</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Value'>𝕨</span><span class='Function'>|</span><span class='Number'>1</span><span class='Function'>↓⌊</span><span class='Modifier2'>∘</span><span class='Function'>÷</span><span class='Modifier'>`</span><span class='Modifier2'>⌾</span><span class='Function'>⌽</span><span class='Value'>𝕨</span><span class='Function'>∾<</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code></td> </tr>
+<tr><td> <code><span class='Value'>⌹</span></code> </td><td colspan=2><code><span class='Function'>+</span><span class='Modifier'>´</span><span class='Modifier2'>∘</span><span class='Function'>×</span><span class='Modifier2'>⎉</span><span class='Number'>1</span><span class='Ligature'>‿</span><span class='Number'>∞</span><span class='Modifier'>⁼</span></code> I guess</td>                      </tr>
 <tr><td> <code><span class='Value'>⌷</span></code> </td><td> N/A                          </td><td> <code><span class='Function'>⊏</span></code></td>        </tr>
 </table>
 
@@ -185,18 +185,18 @@
 <tr><td> <code><span class='Value'>⍀</span></code>   </td><td colspan=2> <code><span class='Function'>↑</span></code> or <code><span class='Modifier'>`</span></code>       </td></tr>
 <tr><td> <code><span class='Modifier'>¨</span></code>   </td><td colspan=2> <code><span class='Modifier'>¨</span></code>                         </td></tr>
 <tr><td> <code><span class='Value'>⍨</span></code>   </td><td colspan=2> <code><span class='Modifier'>˜</span></code>                         </td></tr>
-<tr><td> <code><span class='Value'>⍣</span></code>   </td><td colspan=2> <code><span class='Composition'>⍟</span></code>                         </td></tr>
-<tr><td> <code><span class='Value'>f.g</span></code> </td><td>                  </td><td> <code><span class='Value'>f</span><span class='Modifier'>´</span><span class='Composition'>∘</span><span class='Value'>g</span><span class='Composition'>⍟</span><span class='Number'>1</span><span class='Ligature'>‿</span><span class='Number'>∞</span></code> </td></tr>
-<tr><td> <code><span class='Composition'>∘</span><span class='Number'>.f</span></code> </td><td>                  </td><td> <code><span class='Value'>f</span><span class='Modifier'>⌜</span></code>       </td></tr>
-<tr><td> <code><span class='Function'>A</span><span class='Composition'>∘</span><span class='Value'>g</span></code> </td><td> <code><span class='Function'>A</span><span class='Composition'>⊸</span><span class='Value'>g</span></code> </td><td>                       </td></tr>
-<tr><td> <code><span class='Value'>f</span><span class='Composition'>∘</span><span class='Function'>B</span></code> </td><td> <code><span class='Value'>f</span><span class='Composition'>⟜</span><span class='Function'>B</span></code> </td><td>                       </td></tr>
-<tr><td> <code><span class='Value'>f</span><span class='Composition'>∘</span><span class='Value'>g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Composition'>⟜</span><span class='Value'>g</span></code>                       </td></tr>
-<tr><td> <code><span class='Value'>f⍤</span><span class='Function'>B</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Composition'>⎉</span><span class='Function'>B</span></code>                       </td></tr>
-<tr><td> <code><span class='Value'>f⍤g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Composition'>∘</span><span class='Value'>g</span></code>                       </td></tr>
-<tr><td> <code><span class='Value'>f⍥g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Composition'>○</span><span class='Value'>g</span></code>                       </td></tr>
-<tr><td> <code><span class='Value'>f@v</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Composition'>⌾</span><span class='Paren'>(</span><span class='Value'>v</span><span class='Composition'>⊸</span><span class='Function'>⊏</span><span class='Paren'>)</span></code>                   </td></tr>
+<tr><td> <code><span class='Value'>⍣</span></code>   </td><td colspan=2> <code><span class='Modifier2'>⍟</span></code>                         </td></tr>
+<tr><td> <code><span class='Value'>f.g</span></code> </td><td>                  </td><td> <code><span class='Value'>f</span><span class='Modifier'>´</span><span class='Modifier2'>∘</span><span class='Value'>g</span><span class='Modifier2'>⍟</span><span class='Number'>1</span><span class='Ligature'>‿</span><span class='Number'>∞</span></code> </td></tr>
+<tr><td> <code><span class='Modifier2'>∘</span><span class='Number'>.f</span></code> </td><td>                  </td><td> <code><span class='Value'>f</span><span class='Modifier'>⌜</span></code>       </td></tr>
+<tr><td> <code><span class='Function'>A</span><span class='Modifier2'>∘</span><span class='Value'>g</span></code> </td><td> <code><span class='Function'>A</span><span class='Modifier2'>⊸</span><span class='Value'>g</span></code> </td><td>                       </td></tr>
+<tr><td> <code><span class='Value'>f</span><span class='Modifier2'>∘</span><span class='Function'>B</span></code> </td><td> <code><span class='Value'>f</span><span class='Modifier2'>⟜</span><span class='Function'>B</span></code> </td><td>                       </td></tr>
+<tr><td> <code><span class='Value'>f</span><span class='Modifier2'>∘</span><span class='Value'>g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Modifier2'>⟜</span><span class='Value'>g</span></code>                       </td></tr>
+<tr><td> <code><span class='Value'>f⍤</span><span class='Function'>B</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Modifier2'>⎉</span><span class='Function'>B</span></code>                       </td></tr>
+<tr><td> <code><span class='Value'>f⍤g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Modifier2'>∘</span><span class='Value'>g</span></code>                       </td></tr>
+<tr><td> <code><span class='Value'>f⍥g</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Modifier2'>○</span><span class='Value'>g</span></code>                       </td></tr>
+<tr><td> <code><span class='Value'>f@v</span></code> </td><td colspan=2> <code><span class='Value'>f</span><span class='Modifier2'>⌾</span><span class='Paren'>(</span><span class='Value'>v</span><span class='Modifier2'>⊸</span><span class='Function'>⊏</span><span class='Paren'>)</span></code>                   </td></tr>
 <tr><td> <code><span class='Value'>f⍠</span><span class='Function'>B</span></code> </td><td colspan=2> Uh                                     </td></tr>
-<tr><td> <code><span class='Value'>f⌸</span></code>  </td><td><code><span class='Function'>⍷</span><span class='Composition'>⊸</span><span class='Function'>⊐⊔↕</span><span class='Composition'>∘</span><span class='Function'>≠</span></code></td><td><code><span class='Function'>⍷</span><span class='Composition'>⊸</span><span class='Function'>⊐</span><span class='Composition'>⊸</span><span class='Function'>⊔</span></code>   </td></tr>
+<tr><td> <code><span class='Value'>f⌸</span></code>  </td><td><code><span class='Function'>⍷</span><span class='Modifier2'>⊸</span><span class='Function'>⊐⊔↕</span><span class='Modifier2'>∘</span><span class='Function'>≠</span></code></td><td><code><span class='Function'>⍷</span><span class='Modifier2'>⊸</span><span class='Function'>⊐</span><span class='Modifier2'>⊸</span><span class='Function'>⊔</span></code>   </td></tr>
 <tr><td> <code><span class='Value'>f⌺</span><span class='Function'>B</span></code> </td><td colspan=2> <code><span class='Function'>↕</span></code>                         </td></tr>
 <tr><td> <code><span class='Function'>A</span><span class='Value'>⌶</span></code>  </td><td colspan=2> <code><span class='Value'>•</span></code>                         </td></tr>
 <tr><td> <code><span class='Value'>f&</span></code>  </td><td colspan=2> Nothing yet                            </td></tr>