X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Freals.xsl;h=09fd63ac28a53a759e82146c82b6ded17b233116;hb=2f28bfb47f5fad6b3c5a705d9ede95700416dee8;hp=7f3deaa9251c0c7620c4609dbe4b758750de2435;hpb=f30453fc7ff18c75479f482dc230e174ab050204;p=helm.git

diff --git a/helm/style/reals.xsl b/helm/style/reals.xsl
index 7f3deaa92..09fd63ac2 100644
--- a/helm/style/reals.xsl
+++ b/helm/style/reals.xsl
@@ -32,8 +32,7 @@
 
 <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:xlink="http://www.w3.org/1999/xlink">
+                              xmlns:helm="http://www.cs.unibo.it/helm">
 
 
 <!-- ************************* LOGIC *********************************-->
@@ -58,150 +57,149 @@
 
 <!-- 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="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rlt.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rge.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rgt.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rplus.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rminus.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rmult.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rdiv.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rmin.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rmax.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rfunctions/pow.con']" mode="pure">
-   <xsl:call-template name="mk-mml-infix">
+   <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'"/>
    </xsl:call-template>
@@ -319,5 +317,3 @@
 </xsl:template>
 
 </xsl:stylesheet>
-
-