diff --git a/t/digestion/chardefs.xml b/t/digestion/chardefs.xml
index f8f09acad..af1d74d16 100644
--- a/t/digestion/chardefs.xml
+++ b/t/digestion/chardefs.xml
@@ -32,9 +32,9 @@
     </tags>
     <title><tag close=" ">2</tag>mathchardef</title>
     <para xml:id="S2.p1">
-      <p>Sum = <Math mode="inline" tex="\mathchar 4944\relax" text="∑" xml:id="S2.p1.m1">
+      <p>Sum = <Math mode="inline" tex="\mathchar 4944\relax" text="sum" xml:id="S2.p1.m1">
           <XMath>
-            <XMTok role="BIGOP">∑</XMTok>
+            <XMTok mathstyle="text" meaning="sum" name="mchara" role="SUMOP" scriptpos="post">∑</XMTok>
           </XMath>
         </Math></p>
     </para>
@@ -68,23 +68,23 @@
       <p>OMX: ].</p>
     </para>
     <para xml:id="S3.p4">
-      <p>OML: <Math mode="inline" tex="\mathchar 4944\relax" text="∑" xml:id="S3.p4.m1">
+      <p>OML: <Math mode="inline" tex="\mathchar 4944\relax" text="sum" xml:id="S3.p4.m1">
           <XMath>
-            <XMTok role="BIGOP">∑</XMTok>
+            <XMTok mathstyle="text" meaning="sum" name="mchara" role="SUMOP" scriptpos="post">∑</XMTok>
           </XMath>
         </Math>.</p>
     </para>
     <para xml:id="S3.p5">
-      <p>OMS: <Math mode="inline" tex="\mathchar 4944\relax" text="∑" xml:id="S3.p5.m1">
+      <p>OMS: <Math mode="inline" tex="\mathchar 4944\relax" text="sum" xml:id="S3.p5.m1">
           <XMath>
-            <XMTok role="BIGOP">∑</XMTok>
+            <XMTok mathstyle="text" meaning="sum" name="mchara" role="SUMOP" scriptpos="post">∑</XMTok>
           </XMath>
         </Math>.</p>
     </para>
     <para xml:id="S3.p6">
-      <p>OMX: <Math mode="inline" tex="\mathchar 4944\relax" text="∑" xml:id="S3.p6.m1">
+      <p>OMX: <Math mode="inline" tex="\mathchar 4944\relax" text="sum" xml:id="S3.p6.m1">
           <XMath>
-            <XMTok role="BIGOP">∑</XMTok>
+            <XMTok mathstyle="text" meaning="sum" name="mchara" role="SUMOP" scriptpos="post">∑</XMTok>
           </XMath>
         </Math>.</p>
     </para>
diff --git a/t/digestion/testctr.xml b/t/digestion/testctr.xml
index 84b696087..7f486f0c0 100644
--- a/t/digestion/testctr.xml
+++ b/t/digestion/testctr.xml
@@ -362,9 +362,9 @@ followed by a usage or assignment (See TeX Program §1224)</p>
         <p>@</p>
       </para>
       <para xml:id="S3.SS8.p7">
-        <p><Math mode="inline" tex="\mathchar 4944\relax" text="∑" xml:id="S3.SS8.p7.m1">
+        <p><Math mode="inline" tex="\mathchar 4944\relax" text="sum" xml:id="S3.SS8.p7.m1">
             <XMath>
-              <XMTok role="BIGOP">∑</XMTok>
+              <XMTok mathstyle="text" meaning="sum" name="mathchara" role="SUMOP" scriptpos="post">∑</XMTok>
             </XMath>
           </Math></p>
       </para>
diff --git a/t/fonts/mathaccents.xml b/t/fonts/mathaccents.xml
index d675dbe00..49a1954ff 100644
--- a/t/fonts/mathaccents.xml
+++ b/t/fonts/mathaccents.xml
@@ -9,12 +9,12 @@
       <thead>
         <tr>
           <td align="left" thead="column row">?</td>
-          <td align="left" border="r" thead="column"><Math mode="inline" tex="\mathaccent 23{u}_{s}" text="(˚@(u)) _ s" xml:id="p1.m1">
+          <td align="left" border="r" thead="column"><Math mode="inline" tex="\mathaccent 23{u}_{s}" text="(ring@(u)) _ s" xml:id="p1.m1">
               <XMath>
                 <XMApp>
                   <XMTok role="SUBSCRIPTOP" scriptpos="post1"/>
                   <XMApp>
-                    <XMTok role="OVERACCENT">˚</XMTok>
+                    <XMTok name="ring" role="OVERACCENT" stretchy="false">˚</XMTok>
                     <XMTok font="italic" role="UNKNOWN">u</XMTok>
                   </XMApp>
                   <XMTok font="italic" fontsize="70%" role="UNKNOWN">s</XMTok>
@@ -34,10 +34,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28691{a}" text="´@(a)" xml:id="p1.m3">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28691{a}" text="acute@(a)" xml:id="p1.m3">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">´</XMTok>
+                  <XMTok name="acute" role="OVERACCENT" stretchy="false">´</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -65,10 +65,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28694{a}" text="¯@(a)" xml:id="p1.m6">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28694{a}" text="bar@(a)" xml:id="p1.m6">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">¯</XMTok>
+                  <XMTok name="bar" role="OVERACCENT" stretchy="false">¯</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -96,10 +96,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28693{a}" text="˘@(a)" xml:id="p1.m9">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28693{a}" text="breve@(a)" xml:id="p1.m9">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">˘</XMTok>
+                  <XMTok name="breve" role="OVERACCENT" stretchy="false">˘</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -127,10 +127,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28692{a}" text="ˇ@(a)" xml:id="p1.m12">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28692{a}" text="check@(a)" xml:id="p1.m12">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">ˇ</XMTok>
+                  <XMTok name="check" role="OVERACCENT" stretchy="false">ˇ</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -158,10 +158,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28799{a}" text="¨@(a)" xml:id="p1.m15">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28799{a}" text="ddot@(a)" xml:id="p1.m15">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">¨</XMTok>
+                  <XMTok name="ddot" role="OVERACCENT" stretchy="false">¨</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -189,10 +189,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28767{a}" text="˙@(a)" xml:id="p1.m18">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28767{a}" text="dot@(a)" xml:id="p1.m18">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">˙</XMTok>
+                  <XMTok name="dot" role="OVERACCENT" stretchy="false">˙</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -220,10 +220,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28690{a}" text="`@(a)" xml:id="p1.m21">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28690{a}" text="grave@(a)" xml:id="p1.m21">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">`</XMTok>
+                  <XMTok name="grave" role="OVERACCENT" stretchy="false">`</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -251,10 +251,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28766{a}" text="^@(a)" xml:id="p1.m24">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28766{a}" text="hat@(a)" xml:id="p1.m24">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">^</XMTok>
+                  <XMTok name="hat" role="OVERACCENT" stretchy="false">^</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -282,10 +282,10 @@
                 </XMApp>
               </XMath>
             </Math></td>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28798{a}" text="~@(a)" xml:id="p1.m27">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28798{a}" text="tilde@(a)" xml:id="p1.m27">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">~</XMTok>
+                  <XMTok name="tilde" role="OVERACCENT" stretchy="false">~</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -316,7 +316,7 @@
           <td align="left" border="r"><Math mode="inline" tex="\mathaccent 382{a}" text="→@(a)" xml:id="p1.m30">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">→</XMTok>
+                  <XMTok role="OVERACCENT" stretchy="false">→</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -337,10 +337,10 @@
         </tr>
         <tr>
           <td thead="row"/>
-          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28695{a}" text="˚@(a)" xml:id="p1.m32">
+          <td align="left" border="r"><Math mode="inline" tex="\mathaccent 28695{a}" text="ring@(a)" xml:id="p1.m32">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">˚</XMTok>
+                  <XMTok name="ring" role="OVERACCENT" stretchy="false">˚</XMTok>
                   <XMTok font="italic" role="UNKNOWN">a</XMTok>
                 </XMApp>
               </XMath>
@@ -364,7 +364,7 @@
           <td align="left" border="r"><Math mode="inline" tex="\mathaccent 869{aaa}" text="~@(a * a * a)" xml:id="p1.m34">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">~</XMTok>
+                  <XMTok role="OVERACCENT" stretchy="false">~</XMTok>
                   <XMApp>
                     <XMTok meaning="times" role="MULOP">⁢</XMTok>
                     <XMTok font="italic" role="UNKNOWN">a</XMTok>
@@ -393,7 +393,7 @@
           <td align="left" border="r"><Math mode="inline" tex="\mathaccent 866{aaa}" text="^@(a * a * a)" xml:id="p1.m36">
               <XMath>
                 <XMApp>
-                  <XMTok role="OVERACCENT">^</XMTok>
+                  <XMTok role="OVERACCENT" stretchy="false">^</XMTok>
                   <XMApp>
                     <XMTok meaning="times" role="MULOP">⁢</XMTok>
                     <XMTok font="italic" role="UNKNOWN">a</XMTok>
diff --git a/t/fonts/omencodings.xml b/t/fonts/omencodings.xml
index bcbea9ec0..d3ccf6f62 100644
--- a/t/fonts/omencodings.xml
+++ b/t/fonts/omencodings.xml
@@ -511,12 +511,12 @@
           <td align="right" border="r" thead="row">´11</td>
           <td align="center">∮</td>
           <td align="center">∮</td>
-          <td align="center">⊙</td>
-          <td align="center">⊙</td>
-          <td align="center">⊕</td>
-          <td align="center">⊕</td>
-          <td align="center">⊗</td>
-          <td align="center">⊗</td>
+          <td align="center">⨀</td>
+          <td align="center">⨀</td>
+          <td align="center">⨁</td>
+          <td align="center">⨁</td>
+          <td align="center">⨂</td>
+          <td align="center">⨂</td>
         </tr>
         <tr>
           <td align="right" border="r" thead="row">´12</td>
@@ -525,9 +525,9 @@
           <td align="center">∫</td>
           <td align="center">⋃</td>
           <td align="center">⋂</td>
-          <td align="center">⊌</td>
-          <td align="center">∧</td>
-          <td align="center">∨</td>
+          <td align="center">⨄</td>
+          <td align="center">⋀</td>
+          <td align="center">⋁</td>
         </tr>
         <tr>
           <td align="right" border="r" thead="row">´13</td>
@@ -536,9 +536,9 @@
           <td align="center">∫</td>
           <td align="center">⋃</td>
           <td align="center">⋂</td>
-          <td align="center">⊌</td>
-          <td align="center">∧</td>
-          <td align="center">∨</td>
+          <td align="center">⨄</td>
+          <td align="center">⋀</td>
+          <td align="center">⋁</td>
         </tr>
         <tr>
           <td align="right" border="r" thead="row">´14</td>
diff --git a/t/fonts/plainfonts.xml b/t/fonts/plainfonts.xml
index 1feff6752..8f68bb493 100644
--- a/t/fonts/plainfonts.xml
+++ b/t/fonts/plainfonts.xml
@@ -114,16 +114,28 @@ but compare meanings:</p>
       </Math></p>
   </para>
   <para>
-    <p>“cal:  abc123 and <Math mode="inline" tex="{\cal abc123}" text="⊣ * ⌊ * ⌋ * ∞ * ∈ * ∋">
+    <p>“cal:  abc123 and <Math mode="inline" tex="{\cal abc123}" text="absent does-not-prove list@() * infinity element-of contains">
         <XMath>
           <XMApp>
-            <XMTok meaning="times" role="MULOP">⁢</XMTok>
-            <XMTok role="UNKNOWN">⊣</XMTok>
-            <XMTok role="UNKNOWN">⌊</XMTok>
-            <XMTok role="UNKNOWN">⌋</XMTok>
-            <XMTok role="UNKNOWN">∞</XMTok>
-            <XMTok role="UNKNOWN">∈</XMTok>
-            <XMTok role="UNKNOWN">∋</XMTok>
+            <XMTok meaning="does-not-prove" role="METARELOP">⊣</XMTok>
+            <XMTok meaning="absent"/>
+            <XMApp>
+              <XMTok meaning="element-of" role="RELOP">∈</XMTok>
+              <XMApp>
+                <XMTok meaning="times" role="MULOP">⁢</XMTok>
+                <XMDual>
+                  <XMApp>
+                    <XMTok meaning="list"/>
+                  </XMApp>
+                  <XMWrap>
+                    <XMTok name="lfloor" role="OPEN" stretchy="false">⌊</XMTok>
+                    <XMTok name="rfloor" role="CLOSE" stretchy="false">⌋</XMTok>
+                  </XMWrap>
+                </XMDual>
+                <XMTok meaning="infinity" role="ID">∞</XMTok>
+              </XMApp>
+              <XMTok meaning="contains" role="RELOP">∋</XMTok>
+            </XMApp>
           </XMApp>
         </XMath>
       </Math></p>