X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fmmlextension.xsl;h=6e66736a32aeb8e1fc866033a8091fc511f028f7;hb=e1d232bab1b061d9098fd666ca24bed84b38f99e;hp=f9dcfae51b6dd0ee8cb0809ad77fd7398982ea7a;hpb=a67544c0aa4c12b6b900345d16d43d0ee20eccf1;p=helm.git

diff --git a/helm/style/mmlextension.xsl b/helm/style/mmlextension.xsl
index f9dcfae51..6e66736a3 100644
--- a/helm/style/mmlextension.xsl
+++ b/helm/style/mmlextension.xsl
@@ -57,7 +57,9 @@
 <!--**********************-->
 
 <xsl:template match="/">
+ <!--
  <xsl:processing-instruction name="cocoon-format">type="text/xhtml"</xsl:processing-instruction>
+ -->
  <xsl:apply-templates select="*"/>
 </xsl:template>
 
@@ -383,7 +385,7 @@
 <!-- CSYMBOL -->
 
 <xsl:template match="m:apply[m:csymbol]">
-<xsl:param name="nopar" select="1"/>
+<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>
@@ -504,7 +506,7 @@
             <xsl:if test="$nopar=0">
              <m:mo stretchy="false">(</m:mo>
             </xsl:if>
-            <xsl:apply-templates select="*[position()=2]"><xsl:with-param name="nopar" select="0"/></xsl:apply-templates>
+            <xsl:apply-templates select="*[position()=2]"/>
            </m:mrow>
           </m:mtd>
          </m:mtr>
@@ -520,12 +522,12 @@
               <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:with-param name="nopar" select="0"/></xsl:apply-templates>
+              <xsl:apply-templates select="*[position()=3]"/>
              </xsl:otherwise>
              </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
-             <xsl:apply-templates select="*[position()=3]"><xsl:with-param name="nopar" select="0"/></xsl:apply-templates>
+             <xsl:apply-templates select="*[position()=3]"/>
             </xsl:otherwise>
             </xsl:choose>
            </m:mrow>
@@ -546,7 +548,7 @@
         <xsl:if test="$nopar=0">
          <m:mo stretchy="false">(</m:mo>
         </xsl:if>
-        <xsl:apply-templates select="*[position()=2]"><xsl:with-param name="nopar" select="0"/></xsl:apply-templates>
+        <xsl:apply-templates select="*[position()=2]"/>
         <m:mo mathcolor="Blue">&#x2192;</m:mo>
         <xsl:choose>
         <xsl:when test="*[position()=3]/m:csymbol">
@@ -556,12 +558,12 @@
           <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:with-param name="nopar" select="0"/></xsl:apply-templates>
+          <xsl:apply-templates select="*[position()=3]"/>
          </xsl:otherwise>
          </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
-         <xsl:apply-templates select="*[position()=3]"><xsl:with-param name="nopar" select="0"/></xsl:apply-templates>
+         <xsl:apply-templates select="*[position()=3]"/>
         </xsl:otherwise>
         </xsl:choose>
         <xsl:if test="$nopar=0">
@@ -963,6 +965,24 @@
          </m:mtr>
         </m:mtable>
       </xsl:when>
+      <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='letin'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <!-- <xsl:for-each select="APPLY[m:csymbol and (string(m:csymbol)='let')]"> -->
@@ -990,55 +1010,113 @@
        <m:mtext>) </m:mtext>
        <xsl:apply-templates select="*[3]"/>
       </xsl:when>
-      <xsl:when test="$name='thread'">
+      <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>
+      --> 
+      <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 apply it 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>
+      <!-- NAT_IND -->
+      <xsl:when test="$name='nat_ind'">
+        <m:mtable align="baseline 1" equalrows="false" columnalign="left">
+         <m:mtr>
+          <m:mtd>
+           <m:mtext>By induction</m:mtext>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>base case:</m:mtext>
+            <xsl:apply-templates select="*[2]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+         <m:mtr>
+          <m:mtd>
+           <m:mrow>
+            <m:mtext>inductive case:</m:mtext>
+            <xsl:apply-templates select="*[3]"/>
+           </m:mrow>
+          </m:mtd>
+         </m:mtr>
+        </m:mtable>
+      </xsl:when>
+      <!-- AND_IND -->
       <xsl:when test="$name='and_ind'">
         <m:mtable align="baseline 1" equalrows="false" columnalign="left">
          <m:mtr>
@@ -1049,7 +1127,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>
@@ -1147,7 +1226,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>
@@ -1187,6 +1267,7 @@
     </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>
@@ -1239,7 +1320,7 @@
    </xsl:choose>
          <xsl:apply-templates mode="thread" select="preceding-sibling::*[position()=2]"/>
 </xsl:template>
-
+-->
 
 <!-- LAMBDA -->