X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Farith.xsl;h=8ec9c6a3ee3d78aa90c9770d2797399746ba5208;hb=cc1698821a40a29b02d7f5c5f60ab63542511d32;hp=e436df28c5cc6a72c62b40a765a803f88a19df8f;hpb=5b20300cc03102ef30de65eda421c22727244475;p=helm.git

diff --git a/helm/style/arith.xsl b/helm/style/arith.xsl
index e436df28c..8ec9c6a3e 100644
--- a/helm/style/arith.xsl
+++ b/helm/style/arith.xsl
@@ -36,6 +36,39 @@
 
 <!-- ************************** ARITHMETICS ****************************** -->
 
+<!-- S and O -->
+<xsl:template match="APPLY[*[position()=1 and name()='MUTCONSTRUCT' and @uri='cic:/Coq/Init/Datatypes/nat.ind' and @noConstr='2'] and count(*)=2]" mode="pure">
+   <xsl:apply-templates select="*[2]" mode="succ">
+    <xsl:with-param name="n" select="1"/>
+    <xsl:with-param name="iden" select="@id"/>
+   </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="*" mode="succ">
+ <xsl:param name="n" select="0"/>
+ <xsl:param name="iden" select="''"/>
+ <xsl:choose>
+  <xsl:when test="name()='APPLY' and *[position()=1 and name()='MUTCONSTRUCT'
+and @uri='cic:/Coq/Init/Datatypes/nat.ind' and @noConstr='2']">
+   <xsl:apply-templates select="*[2]" mode="succ">
+    <xsl:with-param name="n" select="$n +1"/>
+    <xsl:with-param name="iden" select="$iden"/>
+   </xsl:apply-templates>
+  </xsl:when>
+  <xsl:when test="name()='MUTCONSTRUCT' and @uri='cic:/Coq/Init/Datatypes/nat.ind' and @noConstr='1'">
+   <m:cn helm:xref="{$iden}"><xsl:value-of select="$n"/></m:cn>
+  </xsl:when>
+  <xsl:otherwise>
+   <m:apply helm:xref="{$iden}">
+    <m:plus/>
+    <m:cn><xsl:value-of select="$n"/></m:cn>
+    <xsl:apply-templates select="." mode="pure"/>
+   </m:apply>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
 <xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Peano/le.ind']" mode="pure">
    <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
@@ -135,7 +168,7 @@
    </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/fast_integers/Zplus.con']" mode="pure">
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/Zplus.con']" mode="pure">
    <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
@@ -151,7 +184,7 @@
    </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/fast_integers/Zopp.con']" mode="pure">
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/Zopp.con']" mode="pure">
    <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="1"/>
       <xsl:with-param name="c-tag" select="CONST"/>
@@ -159,7 +192,7 @@
    </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/fast_integers/Zmult.con']" mode="pure">
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/ZArith/fast_integer/Zmult.con']" mode="pure">
    <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
@@ -185,7 +218,7 @@
 
 <!-- POS, NEG e ZERO -->
 
-<xsl:template match="APPLY[MUTCONSTRUCT[position()=1 and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/Z.ind' and @noConstr='2'] and count(*)=2]" mode="pure">
+<xsl:template match="APPLY[*[position()=1 and name()='MUTCONSTRUCT' and @uri='cic:/Coq/ZArith/fast_integer/Z.ind' and @noConstr='2'] and count(*)=2]" mode="pure">
    <xsl:apply-templates select="*[2]" mode="Zpositive">
     <xsl:with-param name="base" select="0"/>
     <xsl:with-param name="exp" select="1"/>
@@ -193,7 +226,7 @@
    </xsl:apply-templates>
 </xsl:template>
  
-<xsl:template match="APPLY[MUTCONSTRUCT[position()=1 and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/Z.ind' and @noConstr='3'] and count(*)=2]" mode="pure">
+<xsl:template match="APPLY[*[position()=1 and name()='MUTCONSTRUCT' and @uri='cic:/Coq/ZArith/fast_integer/Z.ind' and @noConstr='3'] and count(*)=2]" mode="pure">
    <m:apply helm:xref="{@id}">
     <m:minus definitionURL="{*[1]/@uri}" helm:xref="{*[1]/@id}"/>
     <xsl:apply-templates select="*[2]" mode="Zpositive">
@@ -204,13 +237,13 @@
    </m:apply>
 </xsl:template>
 
-<xsl:template match="MUTCONSTRUCT[@uri='cic:/Coq/ZArith/fast_integer/fast_integers/Z.ind' and @noConstr='1']" mode="pure">
+<xsl:template match="MUTCONSTRUCT[@uri='cic:/Coq/ZArith/fast_integer/Z.ind' and @noConstr='1']" mode="pure">
    <m:ci definitionURL="{@uri}" helm:xref="{@id}">0</m:ci>
 </xsl:template>
 
 <!-- prova di notazione per positive -->
 
-<xsl:template match="APPLY[MUTCONSTRUCT[position()=1 and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/positive.ind']]" mode="pure">
+<xsl:template match="APPLY[*[position()=1 and name()='MUTCONSTRUCT' and @uri='cic:/Coq/ZArith/fast_integer/positive.ind']]" mode="pure">
    <xsl:apply-templates select="." mode="Zpositive">
     <xsl:with-param name="base" select="0"/>
     <xsl:with-param name="exp" select="1"/>
@@ -218,26 +251,32 @@
    </xsl:apply-templates>
 </xsl:template>
 
+<xsl:template match="MUTCONSTRUCT[@uri='cic:/Coq/ZArith/fast_integer/positive.ind' and @noConstr='3']" mode="pure">
+ <m:ci definitionURL="{@uri}" helm:xref="{@id}">1</m:ci>
+</xsl:template> 
+
 <xsl:template match="*" mode="Zpositive">
  <xsl:param name="base" select="0"/>
  <xsl:param name="exp" select="1"/>
  <xsl:param name="iden" select="''"/>
  <xsl:choose>
-  <xsl:when test="name()='APPLY' and MUTCONSTRUCT[position()=1 and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/positive.ind' and @noConstr='1']">
+  <xsl:when test="name()='APPLY' and *[position()=1 and name()='MUTCONSTRUCT'
+and @uri='cic:/Coq/ZArith/fast_integer/positive.ind' and @noConstr='1']">
    <xsl:apply-templates select="*[2]" mode="Zpositive">
     <xsl:with-param name="base" select="$base + $exp"/>
     <xsl:with-param name="exp" select="2 * $exp"/>
     <xsl:with-param name="iden" select="$iden"/>
    </xsl:apply-templates>
   </xsl:when>
-  <xsl:when test="name()='APPLY' and MUTCONSTRUCT[position()=1 and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/positive.ind' and @noConstr='2']">
+  <xsl:when test="name()='APPLY' and *[position()=1 and name()='MUTCONSTRUCT' 
+and @uri='cic:/Coq/ZArith/fast_integer/positive.ind' and @noConstr='2']">
    <xsl:apply-templates select="*[2]" mode="Zpositive">
     <xsl:with-param name="base" select="$base"/>
     <xsl:with-param name="exp" select="2 * $exp"/>
     <xsl:with-param name="iden" select="$iden"/>
    </xsl:apply-templates>
   </xsl:when>
-  <xsl:when test="name()='MUTCONSTRUCT' and @uri='cic:/Coq/ZArith/fast_integer/fast_integers/positive.ind' and @noConstr='3'">
+  <xsl:when test="name()='MUTCONSTRUCT' and @uri='cic:/Coq/ZArith/fast_integer/positive.ind' and @noConstr='3'">
    <m:ci helm:xref="{$iden}"><xsl:value-of select="$base + $exp"/></m:ci>
   </xsl:when>
   <xsl:otherwise>
@@ -245,7 +284,7 @@
     <xsl:when test="$base = 0">
      <xsl:choose>
       <xsl:when test="$exp = 1">
-       <m:ci helm:xref="{$iden}"><xsl:value-of select="$exp"/></m:ci>
+       <xsl:apply-templates select="." mode="pure"/>
       </xsl:when>
       <xsl:otherwise>
        <m:apply helm:xref="{$iden}">
@@ -262,7 +301,7 @@
       <m:ci><xsl:value-of select="$base"/></m:ci>
       <xsl:choose>
        <xsl:when test="$exp = 1">
-        <m:ci><xsl:value-of select="$exp"/></m:ci>
+        <xsl:apply-templates select="." mode="pure"/>
        </xsl:when>
        <xsl:otherwise>
         <m:apply helm:xref="{$iden}">