contentlib.xsl improved, now handles eq eqT

diff --git a/helm/style/arith.xsl b/helm/style/arith.xsl
index c9f3a2a1e4f684538484108bce7f0537c31c0af5..8b2ee122af006a26398e790640a8d9f8ce6b6c0e 100644 (file)
--- a/helm/style/arith.xsl
+++ b/helm/style/arith.xsl
@@ -37,7 +37,7 @@
 <!-- ************************** ARITHMETICS ****************************** -->
 
 <xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Peano/le.ind']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="MUTIND"/>
       <xsl:with-param name="m-tag" select="'leq'"/>
@@ -45,7 +45,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Init/Peano/lt.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'lt'"/>
@@ -53,7 +53,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Init/Peano/ge.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'geq'"/>
@@ -61,7 +61,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Init/Peano/gt.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'gt'"/>
@@ -69,7 +69,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Init/Peano/plus.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'plus'"/>
@@ -77,7 +77,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Arith/Minus/minus.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'minus'"/>
@@ -85,7 +85,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Init/Peano/mult.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'times'"/>
@@ -93,7 +93,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Arith/Min/min.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'min'"/>

diff --git a/helm/style/basic.xsl b/helm/style/basic.xsl
index d2441932f3cff0d79f1c8297b48fb06f95985c90..a6150ff40ede74da2a3a286b87d8cc0b443e12ef 100644 (file)
--- a/helm/style/basic.xsl
+++ b/helm/style/basic.xsl
@@ -174,25 +174,24 @@
     </m:apply>
 </xsl:template>
 
-<!-- EQUALITY -->
-
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Equality/eq.ind'] and (count(child::*) = 4)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:eq definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-     <xsl:apply-templates select="*[4]" mode="noannot"/>
-    </m:apply>
+<!-- EQUALITY and TYPE EQUALITY -->
+
+<xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Logic/Equality/eq.ind']" mode="pure">
+   <xsl:call-template name="mk-mml-op-noannot">
+      <xsl:with-param name="arity" select="3"/>
+      <xsl:with-param name="c-tag" select="MUTIND"/>
+      <xsl:with-param name="m-tag" select="'eq'"/>
+      <xsl:with-param name="rnset" select="*[position() > 2]"/>
+   </xsl:call-template>
 </xsl:template>
 
-
-<!-- TYPE EQUALITY -->
-
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic_Type/eqT.ind'] and (count(child::*) = 4)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:eq definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-     <xsl:apply-templates select="*[4]" mode="noannot"/>
-    </m:apply>
+<xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Logic_Type/eqT.ind']" mode="pure">
+   <xsl:call-template name="mk-mml-op-noannot">
+      <xsl:with-param name="arity" select="3"/>
+      <xsl:with-param name="c-tag" select="MUTIND"/>
+      <xsl:with-param name="m-tag" select="'eq'"/>
+      <xsl:with-param name="rnset" select="*[position() > 2]"/>
+   </xsl:call-template>
 </xsl:template>
 
 <!-- NOT-EQ -->

diff --git a/helm/style/contentlib.xsl b/helm/style/contentlib.xsl
index 6efe8d6c993476cca6bdbb24a660cf5f9424bda8..e923aa1c8309ba7af124a1bf8f0340d2f1154faa 100644 (file)
--- a/helm/style/contentlib.xsl
+++ b/helm/style/contentlib.xsl
@@ -34,10 +34,11 @@
                               xmlns:helm="http://www.cs.unibo.it/helm"
                               xmlns:xlink="http://www.w3.org/1999/xlink">
 
-<xsl:template name="mkmml-op-noannot"> <!-- make MML node for operators (noannot mode) --> 
-   <xsl:param name="arity"/>           <!-- operator arity        -->
-   <xsl:param name="c-tag"/>           <!-- CIC    tag            -->
-   <xsl:param name="m-tag"/>           <!-- MathML tag            -->
+<xsl:template name="out-mml-op"> <!-- outputs MML nodes for operators -->
+   <xsl:param name="arity"/>     <!-- operator arity                  -->
+   <xsl:param name="c-tag"/>     <!-- CIC    tag                      -->
+   <xsl:param name="m-tag"/>     <!-- MathML tag                      -->
+   <xsl:param name="mbody"/>     <!-- other sons of m:apply           -->
    <xsl:choose>
       <xsl:when test="count(child::*) = $arity + 1">
          <m:apply helm:xref="{@id}">
@@ -49,7 +50,7 @@
                   <xsl:value-of select="$c-tag/@id"/>
                </xsl:attribute>
             </xsl:element>
-            <xsl:apply-templates select="*[position() > 1]" mode="noannot"/>
+            <xsl:copy-of select="$mbody"/>
          </m:apply>
       </xsl:when>
       <xsl:otherwise>
@@ -58,6 +59,27 @@
    </xsl:choose>
 </xsl:template>
 
+<!-- noannot -->
+
+<xsl:template name="mk-mml-op-noannot">    <!-- makes MML nodes for operators (noannot mode) --> 
+   <xsl:param name="arity"/>               <!-- operator arity        -->
+   <xsl:param name="c-tag"/>               <!-- CIC    tag            -->
+   <xsl:param name="m-tag"/>               <!-- MathML tag            -->
+   <xsl:param name="rnset" 
+              select="*[position() > 1]"/> <!-- nodes for recursion   -->
+   <xsl:variable name="mbody">
+      <xsl:apply-templates select="$rnset" mode="noannot"/>
+   </xsl:variable>
+   <xsl:call-template name="out-mml-op">
+      <xsl:with-param name="arity" select="$arity"/>
+      <xsl:with-param name="c-tag" select="$c-tag"/>
+      <xsl:with-param name="m-tag" select="$m-tag"/>
+      <xsl:with-param name="mbody" select="$mbody"/>
+   </xsl:call-template>
+</xsl:template>
+
+<!-- interp -->
+
 <xsl:template name="start-interp"> <!-- interp mode starter -->
    <xsl:param name="rtree"/>
    <xsl:param name="atree"/>   
@@ -69,31 +91,22 @@
    </m:apply>
 </xsl:template>
 
-<xsl:template name="mkmml-op-interp"> <!-- make MML node for operators (interp mode) --> 
-   <xsl:param name="arity"/>          <!-- operator arity        -->
-   <xsl:param name="c-tag"/>          <!-- CIC    tag            -->
-   <xsl:param name="m-tag"/>          <!-- MathML tag            -->
-   <xsl:param name="atree"/>          <!-- abstract tree pointer -->
-   <xsl:choose>
-      <xsl:when test="count(child::*) = $arity + 1">
-         <m:apply helm:xref="{@id}">
-            <xsl:element name="{concat('m:',$m-tag)}">
-               <xsl:attribute name="definitionURL">
-                  <xsl:value-of select="$c-tag/@uri"/> 
-               </xsl:attribute>
-               <xsl:attribute name="helm:xref">
-                  <xsl:value-of select="$c-tag/@id"/>
-               </xsl:attribute>
-            </xsl:element>
-            <xsl:apply-templates select="*[position() > 1]" mode="interp">
-              <xsl:with-param name="atree" select="$atree"/>
-           </xsl:apply-templates>
-         </m:apply>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:apply-imports/>
-      </xsl:otherwise>
-   </xsl:choose>
+<xsl:template name="mk-mml-op-interp"> <!-- make MML node for operators (interp mode) --> 
+   <xsl:param name="arity"/>           <!-- operator arity        -->
+   <xsl:param name="c-tag"/>           <!-- CIC    tag            -->
+   <xsl:param name="m-tag"/>           <!-- MathML tag            -->
+   <xsl:param name="atree"/>           <!-- abstract tree pointer -->
+   <xsl:variable name="mbody">
+      <xsl:apply-templates select="*[position() > 1]" mode="interp">
+         <xsl:with-param name="atree" select="$atree"/>
+      </xsl:apply-templates>
+   </xsl:variable>
+   <xsl:call-template name="out-mml-op">
+      <xsl:with-param name="arity" select="$arity"/>
+      <xsl:with-param name="c-tag" select="$c-tag"/>
+      <xsl:with-param name="m-tag" select="$m-tag"/>
+      <xsl:with-param name="mbody" select="$mbody"/>
+   </xsl:call-template>
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/helm/style/reals.xsl b/helm/style/reals.xsl
index 5f111875a028c4b76a96f04a3f00b73222b7fb43..1dab2f0b5c034253673454ef89392e653ee5e1c5 100644 (file)
--- a/helm/style/reals.xsl
+++ b/helm/style/reals.xsl
@@ -58,80 +58,68 @@
 
 <!-- Unary Operations and power -->
 
-<xsl:template match="APPLY[CONST[
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Ropp.con' or
- attribute::uri='cic:/Coq/Reals/Rbasic_fun/Rabsolu.con' or
- attribute::uri='cic:/Coq/Reals/Rfunctions/fact.con' or
- attribute::uri='cic:/Coq/Reals/Rbase/Rsqr.con']]" mode="pure">
-    <xsl:choose>
-     <xsl:when test="count(child::*) = 2">
-      <xsl:variable name="elem">
-       <xsl:choose>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Ropp.con'">
-         <xsl:value-of select="'minus'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rabsolu.con'">
-         <xsl:value-of select="'abs'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rfunctions/fact.con'">
-         <xsl:value-of select="'factorial'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rbase/Rsqr.con'">
-         <xsl:value-of select="'power'"/>
-        </xsl:when>
-       </xsl:choose>
-      </xsl:variable>
-      <m:apply helm:xref="{@id}">
-       <xsl:element name="{concat('m:',$elem)}">
-        <xsl:attribute name="definitionURL">
-         <xsl:value-of select="CONST/@uri"/> 
-        </xsl:attribute>
-        <xsl:attribute name="helm:xref">
-         <xsl:value-of select="CONST/@id"/>
-        </xsl:attribute>
-       </xsl:element>
-       <xsl:apply-templates select="*[2]" mode="noannot"/>
-       <xsl:if test="string($elem)='power'">
-        <m:cn><xsl:value-of select="*[2]/@value"/></m:cn>
-       </xsl:if>
-      </m:apply>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:apply-imports/>
-     </xsl:otherwise>
-    </xsl:choose>
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Ropp.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"/>
+      <xsl:with-param name="m-tag" select="'minus'"/>
+   </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="APPLY[CONST[
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rinv.con']]" mode="pure">
-    <xsl:choose>
-     <xsl:when test="count(child::*) = 2">
-      <m:apply helm:xref="{@id}">
-       <m:power/>
-       <xsl:apply-templates select="*[2]" mode="noannot"/>
-       <m:apply>
-        <m:minus>
-         <xsl:attribute name="definitionURL">
-          <xsl:value-of select="CONST/@uri"/> 
-         </xsl:attribute>
-         <xsl:attribute name="helm:xref">
-          <xsl:value-of select="CONST/@id"/>
-         </xsl:attribute>
-        </m:minus>
-        <m:cn>1</m:cn>
-       </m:apply>
-      </m:apply>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:apply-imports/>
-     </xsl:otherwise>
-    </xsl:choose>
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rabsolu.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"/>
+      <xsl:with-param name="m-tag" select="'abs'"/>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rfunctions/fact.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"/>
+      <xsl:with-param name="m-tag" select="'factorial'"/>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbase/Rsqr.con']" mode="pure">
+   <xsl:variable name="mbody">
+      <xsl:apply-templates select="*[2]" mode="noannot"/>
+      <m:cn>2</m:cn>
+   </xsl:variable>
+   <xsl:call-template name="out-mml-op">
+      <xsl:with-param name="arity" select="1"/>
+      <xsl:with-param name="c-tag" select="CONST"/>
+      <xsl:with-param name="m-tag" select="'power'"/>
+      <xsl:with-param name="mbody" select="$mbody"/>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rinv.con']" mode="pure">
+   <xsl:variable name="mbody1">
+      <xsl:apply-templates select="*[2]" mode="noannot"/>
+      <xsl:variable name="mbody2">
+         <m:cn>1</m:cn>
+      </xsl:variable>
+      <xsl:call-template name="out-mml-op">
+         <xsl:with-param name="arity" select="1"/>
+         <xsl:with-param name="c-tag" select="CONST"/>
+         <xsl:with-param name="m-tag" select="'minus'"/>
+         <xsl:with-param name="mbody" select="$mbody2"/>
+      </xsl:call-template>
+   </xsl:variable>
+   <xsl:call-template name="out-mml-op">
+      <xsl:with-param name="arity" select="1"/>
+      <xsl:with-param name="c-tag" select="CONST"/>
+      <xsl:with-param name="m-tag" select="'power'"/>
+      <xsl:with-param name="mbody" select="$mbody1"/>
+   </xsl:call-template>
 </xsl:template>
 
 <!-- Binary Operations and Relations -->
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rle.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'leq'"/>
@@ -139,7 +127,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rlt.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'lt'"/>
@@ -147,7 +135,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rge.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'geq'"/>
@@ -155,7 +143,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rgt.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'gt'"/>
@@ -163,7 +151,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rplus.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'plus'"/>
@@ -171,7 +159,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rminus.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'minus'"/>
@@ -179,7 +167,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rmult.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'times'"/>
@@ -187,7 +175,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rdiv.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'divide'"/>
@@ -195,7 +183,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rmin.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'min'"/>
@@ -203,7 +191,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rmax.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'max'"/>
@@ -211,7 +199,7 @@
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rfunctions/pow.con']" mode="pure">
-   <xsl:call-template name="mkmml-op-noannot">
+   <xsl:call-template name="mk-mml-op-noannot">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="CONST"/>
       <xsl:with-param name="m-tag" select="'power'"/>

diff --git a/helm/style/ring.xsl b/helm/style/ring.xsl
index 98306fcd4ccc5140bfab1f26ed29baa239bfe47a..1aab092c55c083a31cc198871c0e253515df1ca1 100644 (file)
--- a/helm/style/ring.xsl
+++ b/helm/style/ring.xsl
@@ -78,7 +78,7 @@
 <xsl:template match="APPLY[MUTCONSTRUCT[@uri='cic:/Coq/ring/Ring_abstract/abstract_rings/apolynomial.ind' 
                                     and @noConstr='4']]" mode="interp">
    <xsl:param name="atree"/>
-   <xsl:call-template name="mkmml-op-interp">
+   <xsl:call-template name="mk-mml-op-interp">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="MUTCONSTRUCT"/>
       <xsl:with-param name="m-tag" select="'plus'"/>
@@ -89,7 +89,7 @@
 <xsl:template match="APPLY[MUTCONSTRUCT[@uri='cic:/Coq/ring/Ring_abstract/abstract_rings/apolynomial.ind' 
                                     and @noConstr='5']]" mode="interp">
    <xsl:param name="atree"/>
-   <xsl:call-template name="mkmml-op-interp">
+   <xsl:call-template name="mk-mml-op-interp">
       <xsl:with-param name="arity" select="2"/>
       <xsl:with-param name="c-tag" select="MUTCONSTRUCT"/>
       <xsl:with-param name="m-tag" select="'times'"/>
@@ -100,7 +100,7 @@
 <xsl:template match="APPLY[MUTCONSTRUCT[@uri='cic:/Coq/ring/Ring_abstract/abstract_rings/apolynomial.ind' 
                                     and @noConstr='6']]" mode="interp">
    <xsl:param name="atree"/>
-   <xsl:call-template name="mkmml-op-interp">
+   <xsl:call-template name="mk-mml-op-interp">
       <xsl:with-param name="arity" select="1"/>
       <xsl:with-param name="c-tag" select="MUTCONSTRUCT"/>
       <xsl:with-param name="m-tag" select="'minus'"/>