X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fmmlextension.xsl;h=eb928b41f183b9f8685525b2898a883ed642a766;hb=e4ea08104e12e2d9e546f37e2d4fbb4febe75d29;hp=a22dc0dd332d56fcc2c4fcf3ee480792d3017c03;hpb=7ab23379f84c1b1b999a359830d333fc2925bb58;p=helm.git

diff --git a/helm/style/mmlextension.xsl b/helm/style/mmlextension.xsl
index a22dc0dd3..eb928b41f 100644
--- a/helm/style/mmlextension.xsl
+++ b/helm/style/mmlextension.xsl
@@ -32,11 +32,19 @@
 <!-- Revised: March 21 2000, Irene Schena                                  -->
 <!--***********************************************************************--> 
 
+<!-- NOTE: the namespace declaration has to be done in the stylesheets 
+which generates the toplevel element (see for instance xlink) -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                               xmlns:m="http://www.w3.org/1998/Math/MathML"
-                              xmlns:helm="http://www.cs.unibo.it/helm">
+                              xmlns:helm="http://www.cs.unibo.it/helm"
+                              xmlns:xlink="http://www.w3.org/1999/xlink">
 
-<xsl:import href="mml2mmlv1_0.xsl"/>
+<!-- OLD: <xsl:import href="mml2mmlv1_0.xsl"/> -->
+<xsl:import href="mmlctop.xsl-0.14"/>
+
+<xsl:import href="mmltheoryextension.xsl"/>
+
+<xsl:param name="explodeall" select="false()"/>
 
 <!--***********************************************************************-->
 <!-- Parameter affecting line-breaking                                     -->
@@ -56,9 +64,19 @@
 <!--        OBJECTS       -->
 <!--**********************-->
 
+<xsl:param name="type" select="'standalone'"/>
+
 <xsl:template match="/">
- <xsl:processing-instruction name="cocoon-format">type="text/xhtml"</xsl:processing-instruction>
- <xsl:apply-templates select="*"/>
+ <xsl:choose>
+  <xsl:when test="$type = 'standalone'">
+   <xsl:apply-templates select="*"/>
+  </xsl:when>
+  <xsl:otherwise>
+   <to_be_embedded>
+    <xsl:apply-templates select="*"/>
+   </to_be_embedded>
+  </xsl:otherwise> 
+ </xsl:choose>
 </xsl:template>
 
 <!-- DEFINITION -->
@@ -355,21 +373,27 @@
      <m:mtable align="baseline 1" equalrows="false" columnalign="left">
       <m:mtr>
        <m:mtd>
-        <xsl:apply-templates select="m:ci"/>
-        <m:mo>:</m:mo>
+        <m:mrow>
+         <xsl:apply-templates select="m:ci"/>
+         <m:mo>:</m:mo>
+        </m:mrow>
        </m:mtd>
       </m:mtr>
       <m:mtr>
        <m:mtd>
+        <m:mrow>
          <xsl:apply-templates select="m:type"/>
+        </m:mrow>
        </m:mtd>
       </m:mtr>
      </m:mtable>
     </xsl:when>
     <xsl:otherwise>
-     <xsl:apply-templates select="m:ci"/>
-     <m:mo>:</m:mo>
-     <xsl:apply-templates select="m:type"/>
+     <m:mrow>
+      <xsl:apply-templates select="m:ci"/>
+      <m:mo>:</m:mo>
+      <xsl:apply-templates select="m:type"/>
+     </m:mrow>
     </xsl:otherwise>
    </xsl:choose>
   </xsl:when>
@@ -383,21 +407,26 @@
 <!-- CSYMBOL -->
 
 <xsl:template match="m:apply[m:csymbol]">
+<xsl:param name="nopar" select="0"/>
     <xsl:variable name="name"><xsl:value-of select="m:csymbol"/></xsl:variable>
     <xsl:variable name="charlength"><xsl:apply-templates select="m:csymbol" mode="charcount"/></xsl:variable>
     <m:mrow>
-     <xsl:if test="@helm:xref">
-      <xsl:attribute name="helm:xref"><xsl:value-of select="@helm:xref"/></xsl:attribute>
+     <xsl:if test="@id">
+      <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
      </xsl:if>
+     <xsl:variable name="id" select="m:csymbol/@id"/>
      <xsl:choose>
+      <!-- FORALL -->
       <xsl:when test="$name='forall'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
           <m:mtd>
-            <m:mo mathcolor="Blue"><m:mchar name="ForAll"/></m:mo>
+           <m:mrow>
+            <m:mo mathcolor="Blue">&#8704;</m:mo>
             <xsl:apply-templates select="m:bvar"/>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
@@ -411,7 +440,7 @@
         </m:mtable>
        </xsl:when>
        <xsl:otherwise>
-        <m:mo mathcolor="Blue"><m:mchar name="ForAll"/></m:mo>
+        <m:mo mathcolor="Blue">&#8704;</m:mo>
         <xsl:apply-templates select="m:bvar/m:ci"/>
         <m:mo>:</m:mo>
         <xsl:apply-templates select="m:bvar/m:type"/>
@@ -420,15 +449,18 @@
        </xsl:otherwise>
        </xsl:choose> 
       </xsl:when>
+      <!-- LET-IN -->
       <xsl:when test="$name='let_in'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
           <m:mtd>
+           <m:mrow>
             <m:mo>LET</m:mo>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
             <xsl:apply-templates select="m:bvar"/>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
@@ -463,14 +495,17 @@
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when> 
+      <!-- PROD -->
       <xsl:when test="$name='prod'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
           <m:mtd>
+           <m:mrow>
             <m:mo mathcolor="Blue">&#x03a0;</m:mo>
             <xsl:apply-templates select="m:bvar"/>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
@@ -493,6 +528,7 @@
        </xsl:otherwise>
        </xsl:choose> 
       </xsl:when>
+      <!-- ARROW -->
       <xsl:when test="$name='arrow'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -500,7 +536,9 @@
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mo stretchy="false">(</m:mo>
+            <xsl:if test="$nopar=0">
+             <m:mo stretchy="false">(</m:mo>
+            </xsl:if>
             <xsl:apply-templates select="*[position()=2]"/>
            </m:mrow>
           </m:mtd>
@@ -509,10 +547,26 @@
           <m:mtd>
            <m:mrow>
             <m:mo mathmathcolor="Blue">&#x2192;</m:mo>
-            <xsl:apply-templates select="*[position()=3]"/>
+            <xsl:choose>
+            <xsl:when test="*[position()=3]/m:csymbol">
+             <xsl:variable name="nextp"><xsl:value-of select="*[position()=3]/m:csymbol"/></xsl:variable>
+             <xsl:choose>
+             <xsl:when test="$nextp='arrow'">
+              <xsl:apply-templates select="*[position()=3]"><xsl:with-param name="nopar" select="1"/></xsl:apply-templates>
+             </xsl:when>
+             <xsl:otherwise>
+              <xsl:apply-templates select="*[position()=3]"/>
+             </xsl:otherwise>
+             </xsl:choose>
+            </xsl:when>
+            <xsl:otherwise>
+             <xsl:apply-templates select="*[position()=3]"/>
+            </xsl:otherwise>
+            </xsl:choose>
            </m:mrow>
           </m:mtd>
          </m:mtr>
+         <xsl:if test="$nopar=0">
          <m:mtr>
           <m:mtd>
            <m:mrow>
@@ -520,17 +574,38 @@
            </m:mrow>
           </m:mtd>
          </m:mtr>
+         </xsl:if>
         </m:mtable>
        </xsl:when>
        <xsl:otherwise>
-        <m:mo stretchy="false">(</m:mo>
+        <xsl:if test="$nopar=0">
+         <m:mo stretchy="false">(</m:mo>
+        </xsl:if>
         <xsl:apply-templates select="*[position()=2]"/>
         <m:mo mathcolor="Blue">&#x2192;</m:mo>
-        <xsl:apply-templates select="*[position()=3]"/>
-        <m:mo stretchy="false">)</m:mo>
+        <xsl:choose>
+        <xsl:when test="*[position()=3]/m:csymbol">
+         <xsl:variable name="nextp"><xsl:value-of select="*[position()=3]/m:csymbol"/></xsl:variable>
+         <xsl:choose>
+         <xsl:when test="$nextp='arrow'">
+          <xsl:apply-templates select="*[position()=3]"><xsl:with-param name="nopar" select="1"/></xsl:apply-templates>
+         </xsl:when>
+         <xsl:otherwise>
+          <xsl:apply-templates select="*[position()=3]"/>
+         </xsl:otherwise>
+         </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+         <xsl:apply-templates select="*[position()=3]"/>
+        </xsl:otherwise>
+        </xsl:choose>
+        <xsl:if test="$nopar=0">
+         <m:mo stretchy="false">)</m:mo>
+        </xsl:if>
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
+      <!-- APP -->
       <xsl:when test="$name='app'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -573,6 +648,7 @@
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
+      <!-- CAST -->
       <xsl:when test="$name='cast'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -611,15 +687,19 @@
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
+      <!-- PROP -->
       <xsl:when test="$name='Prop'">
        <m:mo>Prop</m:mo>
       </xsl:when>
+      <!-- SET -->
       <xsl:when test="$name='Set'">
        <m:mo>Set</m:mo>
       </xsl:when>
+      <!-- TYPE -->
       <xsl:when test="$name='Type'">
        <m:mo>Type</m:mo>
       </xsl:when>
+      <!-- MUTCASE -->
       <xsl:when test="$name='mutcase'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -658,8 +738,8 @@
            </m:mrow>
           </m:mtd>
          </m:mtr>
-         <xsl:for-each select="*[position() mod 2 = 0 and position()>3]">
-         <xsl:variable name="charlength"><xsl:apply-templates select="." mode="charcount"><xsl:with-param name="nosibling" select="1"/></xsl:apply-templates></xsl:variable>
+         <xsl:for-each select="piecewise/piece">
+         <xsl:variable name="charlength"><xsl:apply-templates select="./*[2]" mode="charcount"><xsl:with-param name="nosibling" select="1"/></xsl:apply-templates></xsl:variable>
          <m:mtr>
           <m:mtd>
            <m:mrow>
@@ -672,10 +752,10 @@
             </xsl:otherwise>
             </xsl:choose>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="."/>
+            <xsl:apply-templates select="./*[2]"/>
             <xsl:if test="$framewidth > $charlength">
              <m:mo mathcolor="Green">&#x21d2;</m:mo>
-             <xsl:apply-templates select="following-sibling::*[position()= 1]"/>
+             <xsl:apply-templates select="./*[1]"/>
             </xsl:if>
            </m:mrow>
           </m:mtd>
@@ -686,7 +766,7 @@
            <m:mrow>
             <m:mphantom><m:mtext>|_</m:mtext></m:mphantom>  
             <m:mo mathcolor="Green">&#x21d2;</m:mo>
-            <xsl:apply-templates select="following-sibling::*[position()= 1]"/>
+            <xsl:apply-templates select="./*[1]"/>
            </m:mrow>
           </m:mtd>
          </m:mtr>
@@ -708,21 +788,22 @@
         <xsl:apply-templates select="*[position()=3]"/>
         <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
         <m:mo>OF</m:mo>
-        <xsl:for-each select="*[position() mod 2 = 0 and position()>3]">
+        <xsl:for-each select="piecewise/piece">
          <xsl:choose>
          <xsl:when test="position() != 1">
           <m:mo stretchy="false">|</m:mo>
          </xsl:when> 
          </xsl:choose>
-         <xsl:apply-templates select="."/>
+         <xsl:apply-templates select="./*[2]"/>
          <m:mo mathcolor="Green">&#x21d2;</m:mo>
-         <xsl:apply-templates select="following-sibling::*[position()= 1]"/>
+         <xsl:apply-templates select="./*[1]"/>
         </xsl:for-each>
         <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
         <m:mo>END</m:mo>
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
+      <!-- FIX -->
       <xsl:when test="$name='fix'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -812,6 +893,7 @@
        </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
+      <!-- COFIX -->
       <xsl:when test="$name='cofix'">
        <xsl:choose>
        <xsl:when test="$charlength >= $framewidth">
@@ -904,7 +986,33 @@
       <!-- ***************************************** -->
       <!-- *********** PROOF ELEMENTS ************** -->
       <!-- ***************************************** -->
+      <!-- PROOF -->
       <xsl:when test="$name='proof'">
+       <m:maction actiontype="toggle">
+        <!-- CSC: $explodeall until the annotationHelper can handle mactions -->
+        <xsl:variable name="test" select="(not($explodeall)) and
+	   (not(preceding-sibling::*[1]/text()='letin1')) and
+	   (not(preceding-sibling::*[1]/text()='rw_step')) and
+	   (not(name(..)='m:lambda'))"/>
+        <xsl:if test="$test">
+         <!-- Details hided (default) -->
+         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+          <m:mtr>
+           <m:mtd>
+            <m:mrow>
+             <m:mtext mathcolor="Maroon">We&#x00a0;can&#x00a0;prove</m:mtext>
+             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+             <xsl:apply-templates select="*[position()=3]"/>
+             <m:mrow>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+              <m:mtext mathcolor="Green">(explain)</m:mtext>
+             </m:mrow>
+            </m:mrow>
+           </m:mtd>
+          </m:mtr>
+         </m:mtable>
+        </xsl:if>
+        <!-- Show details -->
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
           <m:mtd>
@@ -916,14 +1024,176 @@
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mtext mathcolor="Maroon">we proved </m:mtext>
+            <m:mtext mathcolor="Maroon">we&#x00a0;proved</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
             <xsl:apply-templates select="*[position()=3]"/>
+            <m:mrow>
+             <m:mphantom>
+              <m:mtext>_</m:mtext>
+             </m:mphantom>
+             <xsl:if test="$test">
+              <m:mtext mathcolor="Green">(hide&#x00a0;details)</m:mtext>
+             </xsl:if>
+            </m:mrow>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+        </m:mtable>
+       </m:maction>
+      </xsl:when>
+      <!-- LETIN1 -->
+      <xsl:when test="$name='letin1'">
+        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:apply-templates select="*[2]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:apply-templates select="*[3]"/>
            </m:mrow>
           </m:mtd>
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <xsl:when test="$name='by_induction'">
+       <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mtext mathcolor="red">We&#x00a0;prove</m:mtext>
+           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+           <xsl:apply-templates select="../*[3]"/>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mtext mathcolor="red">by&#x00a0;induction&#x00a0;on</m:mtext>
+           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+           <xsl:apply-templates 
+            select="*[position()=last()]/*[position()=last()]"/>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+            <xsl:for-each select="*[position()>3 and not(position()=last())]">
+             <m:mtr>
+              <m:mtd>
+               <m:mrow>
+                <xsl:apply-templates select="."/>
+               </m:mrow>
+              </m:mtd>
+             </m:mtr>
+            </xsl:for-each>
+           </m:mtable>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+       </m:mtable>
+      </xsl:when>
+      <!-- inductive_case -->
+      <xsl:when test="$name='inductive_case'">
+       <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mtext mathcolor="red">Case</m:mtext>
+           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+           <xsl:apply-templates select="*[2]"/>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+           <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+            <xsl:if test="*[3]/*[position()>1]">
+             <m:mtr>
+              <m:mtd>
+               <m:mrow>
+                <m:mtext mathcolor="red">By&#x00a0;induction&#x00a0;hypothesis,&#x00a0;we&#x00a0;have:</m:mtext>
+               </m:mrow>
+              </m:mtd>
+             </m:mtr>
+             <m:mtr>
+              <m:mtd>
+               <m:mrow>
+                <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+                <xsl:for-each select="*[3]/*[position()>1]">
+                 <m:mo stretchy="false">(</m:mo>
+                 <xsl:apply-templates select="m:ci"/>
+                 <m:mo stretchy="false">) </m:mo>
+                 <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+                 <xsl:apply-templates select="m:type"/>
+                </xsl:for-each>
+               </m:mrow>
+              </m:mtd>
+             </m:mtr>
+            </xsl:if>
+            <m:mtr>
+             <m:mtd>
+              <m:mrow>
+               <xsl:apply-templates select="*[4]"/>
+              </m:mrow>
+             </m:mtd>
+            </m:mtr>
+           </m:mtable>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+       </m:mtable>
+      </xsl:when>
+      <!-- case_lhs  -->
+      <xsl:when test="$name='case_lhs'">
+       <m:mrow>
+        <xsl:choose>
+         <xsl:when test="count(*)=2">
+          <xsl:apply-templates select="*[2]"/>
+         </xsl:when>
+         <xsl:otherwise>
+          <m:mo stretchy="false">(</m:mo>
+          <xsl:apply-templates select="*[2]"/>
+          <xsl:for-each select="m:bvar">
+           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+           <xsl:apply-templates select="*[1]"/>
+           <m:mtext>:</m:mtext>
+           <xsl:apply-templates select="m:type/*[1]"/>
+          </xsl:for-each>
+          <m:mo stretchy="false">)</m:mo>
+         </xsl:otherwise>
+        </xsl:choose>
+       </m:mrow>
+      </xsl:when>
+      <!-- false_ind  -->
+      <xsl:when test="$name='false_ind'">
+       <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <xsl:apply-templates select="*[3]"/>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+        <m:mtr>
+         <m:mtd>
+          <m:mrow>
+           <m:mtext mathcolor="Red">Contradiction.</m:mtext>
+          </m:mrow>
+         </m:mtd>
+        </m:mtr>
+       </m:mtable>
+      </xsl:when>
+      <!-- LET-IN -->
       <xsl:when test="$name='letin'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <!-- <xsl:for-each select="APPLY[m:csymbol and (string(m:csymbol)='let')]"> -->
@@ -945,61 +1215,96 @@
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <!-- LET -->
       <xsl:when test="$name='let'">
        <m:mtext>(</m:mtext>
        <xsl:apply-templates select="m:ci"/>
        <m:mtext>) </m:mtext>
        <xsl:apply-templates select="*[3]"/>
       </xsl:when>
-      <xsl:when test="$name='thread'">
+      <!-- RW_STEP -->
+      <xsl:when test="$name='rw_step'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
           <m:mtd>
            <m:mrow>
             <xsl:choose>
-             <xsl:when test="name(*[last()])='m:apply'">
-              <xsl:apply-templates select="*[last()]"/>
+             <xsl:when test="name(*[2])='m:apply'">
+              <xsl:apply-templates select="*[2]"/>
              </xsl:when>
              <xsl:otherwise>
-              <m:mtext>Consider </m:mtext>
-              <xsl:apply-templates select="*[last()]"/>
+              <m:mtext>Consider</m:mtext>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+              <xsl:apply-templates select="*[2]"/>
              </xsl:otherwise>
             </xsl:choose>
            </m:mrow>
           </m:mtd>
          </m:mtr>
-	 <xsl:apply-templates mode="thread" select="*[(last()-2)]"/> 
-        </m:mtable>
-      </xsl:when> 
-      <xsl:when test="$name='rewrite_and_apply'">
-        <m:mtable>
          <m:mtr>
           <m:mtd>
            <m:mrow>
             <m:mtext>Rewrite</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="*[2]/*[2]"/>
+            <xsl:apply-templates select="*[3]"/>
 	    <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
 	    <m:mtext>with</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="*[2]/*[3]"/>
+            <xsl:apply-templates select="*[4]"/>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
             <m:mtext>by</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="*[2]/*[4]"/>
-            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <m:mtext>in</m:mtext>
-            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="*[3]"/>
-            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <m:mtext>and apply to</m:mtext>
+            <xsl:apply-templates select="*[5]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+        </m:mtable>
+      </xsl:when>
+      <!-- not existing any more
+      <xsl:when test="$name='thread'">
+        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:choose>
+             <xsl:when test="name(*[last()])='m:apply'">
+              <xsl:apply-templates select="*[last()]"/>
+             </xsl:when>
+             <xsl:otherwise>
+              <m:mtext>Consider</m:mtext>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+              <xsl:apply-templates select="*[last()]"/>
+             </xsl:otherwise>
+            </xsl:choose>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+	 <xsl:apply-templates mode="thread" select="*[(last()-2)]"/> 
+        </m:mtable>
+      </xsl:when>
+      --> 
+      <!-- REWRITE_AND_APPLY -->
+      <xsl:when test="$name='rewrite_and_apply'">
+        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:apply-templates select="*[2]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>Then&#x00a0;apply&#x00a0;it&#x00a0;to</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-            <xsl:apply-templates select="*[position()>3]"/>
+            <xsl:apply-templates select="*[position()>2]"/>
            </m:mrow>
           </m:mtd>
          </m:mtr>
        </m:mtable>
-      </xsl:when> 
+      </xsl:when>
+      <!-- AND_IND -->
       <xsl:when test="$name='and_ind'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
@@ -1010,7 +1315,8 @@
               <xsl:apply-templates select="*[2]"/>
              </xsl:when>
              <xsl:otherwise>
-              <m:mtext>Consider </m:mtext>
+              <m:mtext>Consider</m:mtext>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
               <xsl:apply-templates select="*[2]"/>
              </xsl:otherwise>
             </xsl:choose>
@@ -1019,7 +1325,9 @@
          </m:mtr>
          <m:mtr>
           <m:mtd>
-           <m:mtext>In particular, we have</m:mtext>
+           <m:mrow>
+            <m:mtext>In&#x00a0;particular,&#x00a0;we&#x00a0;have</m:mtext>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
@@ -1053,6 +1361,78 @@
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <!-- full_or_ind -->
+      <xsl:when test="$name='full_or_ind'">
+        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:choose>
+             <xsl:when test="name(*[2])='m:apply'">
+              <xsl:apply-templates select="*[2]"/>
+             </xsl:when>
+             <xsl:otherwise>
+              <m:mtext>Consider</m:mtext>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+              <xsl:apply-templates select="*[2]"/>
+             </xsl:otherwise>
+            </xsl:choose>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>We&#x00a0;proceed&#x00a0;by&#x00a0;cases&#x00a0;to&#x00a0;prove</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[3]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>Left:&#x00a0;suppose</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <m:mo stretchy="false">(</m:mo>
+            <xsl:apply-templates select="*[4]/m:bvar/m:ci"/>
+            <m:mo stretchy="false">)</m:mo>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[4]/m:bvar/m:type/*[1]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[4]/*[3]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>Right:&#x00a0;suppose</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <m:mo stretchy="false">(</m:mo>
+            <xsl:apply-templates select="*[5]/m:bvar/m:ci"/>
+            <m:mo stretchy="false">)</m:mo>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[5]/m:bvar/m:type/*[1]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <xsl:apply-templates select="*[5]/*[3]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+        </m:mtable>
+      </xsl:when>
+      <!-- OR_IND -->
       <xsl:when test="$name='or_ind'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
@@ -1073,17 +1453,19 @@
          </m:mtr>
          <m:mtr>
           <m:mtd>
-           <m:mtext>We prove</m:mtext>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <xsl:apply-templates select="*[3]"/>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <m:mtext>by cases:</m:mtext>
+           <m:mrow>
+            <m:mtext>We&#x00a0;prove</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[3]"/>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <m:mtext>by&#x00a0;cases:</m:mtext>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mtext>*</m:mtext>
+            <m:mtext>Left</m:mtext>
             <xsl:apply-templates select="*[4]"/>
            </m:mrow>
           </m:mtd>
@@ -1091,13 +1473,14 @@
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mtext>*</m:mtext>
+            <m:mtext>Right</m:mtext>
             <xsl:apply-templates select="*[5]"/>
            </m:mrow>
           </m:mtd>
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <!-- EX_IND -->
       <xsl:when test="$name='ex_ind'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
@@ -1108,7 +1491,8 @@
               <xsl:apply-templates select="*[2]"/>
              </xsl:when>
              <xsl:otherwise>
-              <m:mtext>Consider </m:mtext>
+              <m:mtext>Consider</m:mtext>
+              <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
               <xsl:apply-templates select="*[2]"/>
              </xsl:otherwise>
             </xsl:choose>
@@ -1117,19 +1501,21 @@
          </m:mtr>
          <m:mtr>
           <m:mtd>
-           <m:mtext>Let</m:mtext>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <xsl:apply-templates select="*[3]"/>
-           <m:mtext>:</m:mtext>
-           <xsl:apply-templates select="*[4]"/>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <m:mtext>such that</m:mtext>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <m:mtext>(</m:mtext>
-            <xsl:apply-templates select="*[5]"/>
-           <m:mtext>)</m:mtext>
-           <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
-           <xsl:apply-templates select="*[6]"/>
+           <m:mrow>
+            <m:mtext>Let</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[3]"/>
+            <m:mtext>:</m:mtext>
+            <xsl:apply-templates select="*[4]"/>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <m:mtext>such&#x00a0;that</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <m:mtext>(</m:mtext>
+             <xsl:apply-templates select="*[5]"/>
+            <m:mtext>)</m:mtext>
+            <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
+            <xsl:apply-templates select="*[6]"/>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
          <m:mtr>
@@ -1141,13 +1527,140 @@
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <!-- ***************************************** -->
+      <!-- *********** NOTATIONS ******************* -->
+      <!-- ***************************************** -->
+      <!-- subst -->
+      <xsl:when test="$name='subst'">
+        <xsl:apply-templates select="*[3]"/>
+<!-- no font for ApplyFunction: <m:mo>&#xe8a0;</m:mo> -->
+        <m:mo stretchy="false">[</m:mo>
+        <xsl:apply-templates select="*[4]"/>
+        <m:mo mathcolor="green">
+         <xsl:if test="$id != ''">
+          <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+         </xsl:if>&#8592;</m:mo>
+        <xsl:apply-templates select="*[2]"/>
+        <m:mo stretchy="false">]</m:mo>
+      </xsl:when>
+      <!-- lift -->
+      <xsl:when test="$name='lift'">
+        <m:msup>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8593;</m:mo>
+	 <xsl:apply-templates select="*[2]"/>
+        </m:msup>
+	<m:mrow>
+	 <m:mo stretchy="false">(</m:mo>
+         <xsl:apply-templates select="*[3]"/>
+	 <m:mo stretchy="false">)</m:mo>
+        </m:mrow>
+      </xsl:when>
+      <!-- lift_with_base -->
+      <xsl:when test="$name='lift_with_base'">
+        <m:msubsup>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8593;</m:mo>
+	 <xsl:apply-templates select="*[3]"/>
+	 <xsl:apply-templates select="*[4]"/>
+        </m:msubsup>
+	<m:mrow>
+	 <m:mo stretchy="false">(</m:mo>
+         <xsl:apply-templates select="*[2]"/>
+	 <m:mo stretchy="false">)</m:mo>
+        </m:mrow>	
+      </xsl:when>
+      <!-- beta_red1 -->
+      <xsl:when test="$name='beta_red1'">
+        <xsl:apply-templates select="*[2]"/>
+        <m:munder>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8594;</m:mo>
+          <m:mi mathcolor="green">&#946;</m:mi>
+        </m:munder>
+        <xsl:apply-templates select="*[3]"/>
+      </xsl:when>
+      <!-- beta_red -->
+      <xsl:when test="$name='beta_red'">
+        <xsl:apply-templates select="*[2]"/>
+        <m:munderover>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8594;</m:mo>
+          <m:mi mathcolor="green">&#946;</m:mi>
+          <m:mi mathcolor="green">*</m:mi>
+        </m:munderover>
+        <xsl:apply-templates select="*[3]"/>
+      </xsl:when>
+      <!-- par_beta_red1 -->
+      <xsl:when test="$name='par_beta_red1'">
+        <xsl:apply-templates select="*[2]"/>
+        <m:munder>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8658;</m:mo>
+          <m:mi mathcolor="green">&#946;</m:mi>
+        </m:munder>
+        <xsl:apply-templates select="*[3]"/>
+      </xsl:when>
+      <!-- par_beta_red -->
+      <xsl:when test="$name='par_beta_red'">
+        <xsl:apply-templates select="*[2]"/>
+        <m:munderover>
+         <m:mo mathcolor="green">
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+          </xsl:if>&#8658;</m:mo>
+          <m:mi mathcolor="green">&#946;</m:mi>
+          <m:mi mathcolor="green">*</m:mi>
+        </m:munderover>
+        <xsl:apply-templates select="*[3]"/>
+      </xsl:when>
+      <!-- forgetful -->
+      <xsl:when test="$name='forgetful'">
+       <m:mfenced open="|" close="|">
+        <xsl:if test="$id != ''">
+         <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+        </xsl:if>
+        <xsl:apply-templates select="*[2]"/>
+       </m:mfenced>
+      </xsl:when>
+      <!-- isomorphic -->
+      <xsl:when test="$name='isomorphic'">
+        <xsl:apply-templates select="*[2]"/>
+        <m:mo mathcolor="green">
+         <xsl:if test="$id != ''">
+          <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+         </xsl:if>&#8773;</m:mo>
+        <xsl:apply-templates select="*[3]"/>
+      </xsl:when>
+      <!-- interp -->
+      <xsl:when test="$name='forgetful'">
+       <m:mfenced open="[" close="]">
+        <xsl:if test="$id != ''">
+         <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
+        </xsl:if>
+        <xsl:apply-templates select="*[2]"/>
+       </m:mfenced>
+      </xsl:when> 
+
+      <!-- ERROR -->
       <xsl:otherwise>
-       <m:ci>ERROR</m:ci>
+       <m:mi>ERROR</m:mi>
       </xsl:otherwise>
      </xsl:choose>
     </m:mrow>
 </xsl:template>
 
+<!-- Il modo Thread non esiste piu' 
 <xsl:template match="*" mode="thread">
  <xsl:variable name="name"><xsl:value-of select="following-sibling::*[position()=1]/m:csymbol"/></xsl:variable>
  <xsl:choose>
@@ -1172,7 +1685,7 @@
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mtext mathcolor="Maroon">we get</m:mtext>
+            <m:mtext mathcolor="Maroon">we&#x00a0;get</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
             <xsl:apply-templates select="."/>
            </m:mrow>
@@ -1190,7 +1703,7 @@
          <m:mtr>
           <m:mtd>
            <m:mrow>
-            <m:mtext mathcolor="Maroon">we get</m:mtext>
+            <m:mtext mathcolor="Maroon">we&#x00a0;get</m:mtext>
             <m:mphantom><m:mtext>_</m:mtext></m:mphantom>
             <xsl:apply-templates select="."/>
            </m:mrow>
@@ -1200,20 +1713,27 @@
    </xsl:choose>
          <xsl:apply-templates mode="thread" select="preceding-sibling::*[position()=2]"/>
 </xsl:template>
-
+-->
 
 <!-- LAMBDA -->
 
 <xsl:template match="m:lambda">
     <xsl:variable name="charlength"><xsl:apply-templates select="*[position()=1]" mode="charcount"/></xsl:variable>
-    <m:mrow helm:xref="{@helm:xref}">
+    <m:mrow>
+     <xsl:if test="@id">
+      <xsl:attribute name="m:xref">
+       <xsl:value-of select="@id"/>
+      </xsl:attribute>
+     </xsl:if>
      <xsl:choose>
      <xsl:when test="$charlength >= $framewidth">
       <m:mtable align="baseline 1" equalrows="false" columnalign="left">
         <m:mtr>
           <m:mtd>
+           <m:mrow>
             <m:mo mathcolor="Red">&#x03bb;</m:mo>
             <xsl:apply-templates select="m:bvar"/>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
        <m:mtr>
@@ -1251,29 +1771,40 @@
  <xsl:choose>
   <xsl:when test="$charlength >= $framewidth">
    <m:mtable align="baseline 1" equalrows="false" columnalign="left">
-    <xsl:if test="@helm:xref">
-     <xsl:attribute name="helm:xref">
-      <xsl:value-of select="@helm:xref"/>
+    <xsl:if test="@id">
+     <xsl:attribute name="m:xref">
+      <xsl:value-of select="@id"/>
      </xsl:attribute>
     </xsl:if>    
     <m:mtr>
      <m:mtd>
-      <m:mo stretchy="false">(</m:mo>
-      <xsl:apply-templates select="*[position()=2]"/>
+      <m:mrow>
+       <m:mo stretchy="false">(</m:mo>
+       <xsl:apply-templates select="*[position()=2]"/>
+      </m:mrow>
      </m:mtd>
     </m:mtr>
     <xsl:for-each select = "*[position()>2]">
      <m:mtr>
       <m:mtd>
-       <m:mphantom><m:mtext>__</m:mtext></m:mphantom>
-       <m:mo helm:xref="{m:in/@helm:xref}">=</m:mo>
-       <xsl:apply-templates select="."/>
+       <m:mrow>
+        <m:mphantom><m:mtext>__</m:mtext></m:mphantom>
+        <m:mo>
+         <xsl:if test="m:in/@id">
+          <xsl:attribute name="m:xref">
+           <xsl:value-of select="m:in/@id"/>
+          </xsl:attribute>
+         </xsl:if>=</m:mo>
+        <xsl:apply-templates select="."/>
+       </m:mrow>
       </m:mtd>
      </m:mtr>
     </xsl:for-each>
     <m:mtr>
      <m:mtd>
-      <m:mo stretchy="false">)</m:mo>
+      <m:mrow>
+       <m:mo stretchy="false">)</m:mo>
+      </m:mrow>
      </m:mtd>
     </m:mtr>
    </m:mtable>
@@ -1292,43 +1823,43 @@
  <xsl:variable name="symbol">
   <xsl:choose>
    <xsl:when test="m:and[1]">
-    <xsl:value-of select="'wedge'"/>
+    <xsl:value-of select="'&#8743;'"/>
    </xsl:when>
    <xsl:when test="m:or[1]">
-    <xsl:value-of select="'vee'"/>
+    <xsl:value-of select="'&#8744;'"/>
    </xsl:when>
    <xsl:when test="m:geq[1]">
-    <xsl:value-of select="'geq'"/>
+    <xsl:value-of select="'&#8805;'"/>
    </xsl:when>
    <xsl:when test="m:leq[1]">
-    <xsl:value-of select="'leq'"/>
+    <xsl:value-of select="'&#8804;'"/>
    </xsl:when>
    <xsl:when test="m:gt[1]">
-    <xsl:value-of select="'gt'"/>
+    <xsl:value-of select="'&#62;'"/>
    </xsl:when>
    <xsl:when test="m:lt[1]">
-    <xsl:value-of select="'lt'"/>
+    <xsl:value-of select="'&#60;&#32;'"/>
    </xsl:when>
    <xsl:when test="m:eq[1]">
-    <xsl:value-of select="'Equal'"/>
+    <xsl:value-of select="'&#61;'"/>
    </xsl:when>
    <xsl:when test="m:in[1]">
-    <xsl:value-of select="'Element'"/>
+    <xsl:value-of select="'&#x02208;'"/>
    </xsl:when>
    <xsl:when test="m:subset[1]">
-    <xsl:value-of select="'SubsetEqual'"/>
+    <xsl:value-of select="'&#x02286;'"/>
    </xsl:when>
    <xsl:when test="m:prsubset[1]">
-    <xsl:value-of select="'subset'"/>
+    <xsl:value-of select="'&#x02282;'"/>
    </xsl:when>
    <xsl:when test="m:intersect[1]">
-    <xsl:value-of select="'Intersection'"/>
+    <xsl:value-of select="'&#x022C2;'"/>
    </xsl:when>
    <xsl:when test="m:union[1]">
-    <xsl:value-of select="'Union'"/>
+    <xsl:value-of select="'&#x022C3;'"/>
    </xsl:when>
    <xsl:when test="m:setdiff[1]">
-    <xsl:value-of select="'Backslash'"/>
+    <xsl:value-of select="'&#x02216;'"/>
    </xsl:when>
   </xsl:choose>
  </xsl:variable>
@@ -1338,31 +1869,40 @@
  <xsl:choose>
   <xsl:when test="$charlength >= $framewidth">
    <m:mtable align="baseline 1" equalrows="false" columnalign="left">
-    <xsl:if test="@helm:xref">
-     <xsl:attribute name="helm:xref">
-      <xsl:value-of select="@helm:xref"/>
+    <xsl:if test="@id">
+     <xsl:attribute name="m:xref">
+      <xsl:value-of select="@id"/>
      </xsl:attribute>
     </xsl:if>    
     <m:mtr>
      <m:mtd>
-      <m:mo stretchy="false">(</m:mo>
-      <xsl:apply-templates select="*[position()=2]"/>
+      <m:mrow>
+       <m:mo stretchy="false">(</m:mo>
+       <xsl:apply-templates select="*[position()=2]"/>
+      </m:mrow>
      </m:mtd>
     </m:mtr>
     <xsl:for-each select = "*[position()>2]">
      <m:mtr>
       <m:mtd>
-       <m:mphantom><m:mtext>__</m:mtext></m:mphantom>
-       <m:mo helm:xref="{*[1]/@helm:xref}"> 
-        <m:mchar name="{$symbol}"/>
-       </m:mo>
-       <xsl:apply-templates select="."/>
+       <m:mrow>
+        <m:mphantom><m:mtext>__</m:mtext></m:mphantom>
+        <m:mo>
+         <xsl:if test="*[1]/@id">
+          <xsl:attribute name="m:xref">
+           <xsl:value-of select="*[1]/@id"/>
+          </xsl:attribute>
+         </xsl:if><xsl:value-of select="$symbol"/></m:mo>
+        <xsl:apply-templates select="."/>
+       </m:mrow>
       </m:mtd>
      </m:mtr>
     </xsl:for-each>
     <m:mtr>
      <m:mtd>
-      <m:mo stretchy="false">)</m:mo>
+      <m:mrow>
+       <m:mo stretchy="false">)</m:mo>
+      </m:mrow>
      </m:mtd>
     </m:mtr>
    </m:mtable>
@@ -1376,9 +1916,12 @@
 <xsl:template match = "m:set">
  <xsl:choose>
   <xsl:when test="count(child::*) = 0">
-   <m:mi> 
-    <m:mchar name="emptyset"/>
-   </m:mi>
+   <m:mi>
+    <xsl:if test="@id">
+     <xsl:attribute name="m:xref">
+      <xsl:value-of select="@id"/>
+     </xsl:attribute>
+    </xsl:if>&#x02205;</m:mi>
   </xsl:when>
   <xsl:otherwise>
    <xsl:variable name="charlength">
@@ -1391,20 +1934,36 @@
        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
         <m:mtr>
          <m:mtd>
-          <m:mo stretchy="false">{</m:mo>
-          <xsl:apply-templates select="*[position()=1]"/>
+          <m:mrow>
+           <m:mo stretchy="false">
+            <xsl:if test="@id">
+             <xsl:attribute name="m:xref">
+              <xsl:value-of select="@id"/>
+             </xsl:attribute>
+            </xsl:if>{</m:mo>
+           <xsl:apply-templates select="*[position()=1]"/>
+          </m:mrow>
          </m:mtd>
         </m:mtr>
         <m:mtr>
          <m:mtd>
-          <m:mphantom><m:mtext>{</m:mtext></m:mphantom>
-          <m:mo stretchy="false">|</m:mo>
-          <xsl:apply-templates select="m:condition/*[1]"/>
+          <m:mrow>
+           <m:mphantom><m:mtext>{</m:mtext></m:mphantom>
+           <m:mo stretchy="false">|</m:mo>
+           <xsl:apply-templates select="m:condition/*[1]"/>
+          </m:mrow>
          </m:mtd>
         </m:mtr>
         <m:mtr>
          <m:mtd>
-          <m:mo stretchy="false">}</m:mo>
+          <m:mrow>
+           <m:mo stretchy="false">
+            <xsl:if test="@id">
+             <xsl:attribute name="m:xref">
+              <xsl:value-of select="@id"/>
+             </xsl:attribute>
+            </xsl:if>}</m:mo>
+          </m:mrow>
          </m:mtd>
         </m:mtr>
        </m:mtable>
@@ -1413,27 +1972,43 @@
        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
         <m:mtr>
          <m:mtd>
-          <m:mo stretchy="false">{</m:mo>
-          <xsl:apply-templates select="*[position()=1]"/>
-          <xsl:if test="position() != last()">
-           <mo>,</mo>
-          </xsl:if>
+          <m:mrow>
+           <m:mo stretchy="false">
+            <xsl:if test="@id">
+             <xsl:attribute name="m:xref">
+              <xsl:value-of select="@id"/>
+             </xsl:attribute>
+            </xsl:if>{</m:mo>
+           <xsl:apply-templates select="*[position()=1]"/>
+           <xsl:if test="position() != last()">
+            <mo>,</mo>
+           </xsl:if>
+          </m:mrow>
          </m:mtd>
         </m:mtr>
         <xsl:for-each select = "*[position()>2]">
          <m:mtr>
           <m:mtd>
-           <m:mphantom><m:mtext>{</m:mtext></m:mphantom>
-           <xsl:apply-templates select="."/>
-           <xsl:if test="position() != last()">
-            <mo>,</mo>
-           </xsl:if>
+           <m:mrow>
+            <m:mphantom><m:mtext>{</m:mtext></m:mphantom>
+            <xsl:apply-templates select="."/>
+            <xsl:if test="position() != last()">
+             <mo>,</mo>
+            </xsl:if>
+           </m:mrow>
           </m:mtd>
          </m:mtr>
         </xsl:for-each>
         <m:mtr>
          <m:mtd>
-          <m:mo stretchy="false">}</m:mo>
+          <m:mrow>
+           <m:mo stretchy="false">
+            <xsl:if test="@id">
+             <xsl:attribute name="m:xref">
+              <xsl:value-of select="@id"/>
+             </xsl:attribute>
+            </xsl:if>}</m:mo>
+          </m:mrow>
          </m:mtd>
         </m:mtr>
        </m:mtable>
@@ -1449,16 +2024,16 @@
 </xsl:template>      
 
 <xsl:template match = "m:apply[m:card[1]]">
- <m:mo stretchy="false">|</m:mo>
+  <m:mfenced open="|" close="|" stretchy="false">
+    <xsl:if test="($SEM_SW=$SEM_XREF or $SEM_SW=$SEM_XREF_EXT) and @id">
+      <xsl:attribute name="m:xref">
+        <xsl:value-of select="@id"/>
+      </xsl:attribute>
+    </xsl:if>
   <xsl:apply-templates select="*[2]"/>
- <m:mo stretchy="false">|</m:mo>
+  </m:mfenced>
 </xsl:template>
 
-<!-- *********************************** -->
-<!--          PROOF ELEMENTS             -->
-<!-- *********************************** -->
-
-
 
 <!--**********************-->
 <!--       COUNTING       -->
@@ -1530,7 +2105,7 @@
      <xsl:otherwise>
       <xsl:value-of select="number($siblength)"/>
      </xsl:otherwise>
-     </xsl:choose>>
+     </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
      <xsl:value-of select="number($childlength)"/>
@@ -1541,5 +2116,3 @@
 </xsl:template>
 
 </xsl:stylesheet> 
-
-