X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fstyle%2Freals.xsl;h=c7a6b8e02dc75e96443d16f62a908713768478fb;hb=faf311442f59ccbc652c7965d23ed2945fd40906;hp=982d4ed21746de26a7c162146cb4b91a5670a415;hpb=8e1a7e55cbc7750446f0a7ab3d071190594243fb;p=helm.git

diff --git a/helm/style/reals.xsl b/helm/style/reals.xsl
index 982d4ed21..c7a6b8e02 100644
--- a/helm/style/reals.xsl
+++ b/helm/style/reals.xsl
@@ -27,19 +27,13 @@
 <!--******************************************************************--> 
 <!-- Reals                                                            -->
 <!-- First draft: April 3 2000                                        -->
-<!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                 -->
+<!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena, Guidi          -->
 <!--******************************************************************-->
 
 <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">
 
-<!--******************************************************************-->
-<!-- Variable containing the absolute path of the CIC file            -->
-<!--******************************************************************-->
-
-<xsl:variable name="absPath">http://localhost:8081/getciconly?uri=</xsl:variable>
 
 <!-- ************************* LOGIC *********************************-->
 
@@ -61,139 +55,154 @@
  <m:cn definitionURL="{@uri}" helm:xref="{@id}">1</m:cn>
 </xsl:template>
 
+<!-- Unary Operations and power -->
 
+<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>
 
-<!-- Unary Operations -->
+<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[
- 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="'root'"/>
-        </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"/>
-      </m:apply>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:apply-imports/>
-     </xsl:otherwise>
-    </xsl:choose>
+<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[
- 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>
-        </m:minus>
-        <xsl:attribute name="helm:xref">
-         <xsl:value-of select="CONST/@id"/>
-        </xsl:attribute>
-        <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/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[
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rplus.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rminus.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rmult.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rle.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rlt.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rge.con' or
- attribute::uri='cic:/Coq/Reals/Rdefinitions/Rgt.con' or
- attribute::uri='cic:/Coq/Reals/Rbasic_fun/Rmin.con' or
- attribute::uri='cic:/Coq/Reals/Rfunctions/pow.con']]" mode="pure">
-    <xsl:choose>
-     <xsl:when test="count(child::*) = 3">
-      <xsl:variable name="elem">
-       <xsl:choose>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rplus.con'">
-         <xsl:value-of select="'plus'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rminus.con'">
-         <xsl:value-of select="'minus'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rmult.con'">
-         <xsl:value-of select="'times'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rle.con'">
-         <xsl:value-of select="'leq'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rlt.con'">
-         <xsl:value-of select="'lt'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rge.con'">
-         <xsl:value-of select="'geq'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rgt.con'">
-         <xsl:value-of select="'gt'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rbasic_fun/Rmin.con'">
-         <xsl:value-of select="'min'"/>
-        </xsl:when>
-        <xsl:when test="CONST/@uri='cic:/Coq/Reals/Rfunctions/pow.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:apply-templates select="*[3]" mode="noannot"/>
-      </m:apply>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:apply-imports/>
-     </xsl:otherwise>
-    </xsl:choose>
+<xsl:template match="APPLY[CONST/@uri='cic:/Coq/Reals/Rdefinitions/Rle.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"/>
+      <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-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-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-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-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-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-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-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-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-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-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>
 </xsl:template>
 
 <!-- LIMIT -->
@@ -216,7 +225,9 @@
            </xsl:attribute>
           </m:limit>
           <m:bvar>
-           <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="LAMBDA/target/@binder"/></xsl:with-param></xsl:call-template></m:ci>
+           <m:ci>
+            <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="LAMBDA/target/@binder"/></xsl:with-param></xsl:call-template>
+           </m:ci>
           </m:bvar>
           <m:lowlimit>
            <xsl:apply-templates select="*[5]" mode="noannot"/>
@@ -226,7 +237,14 @@
         </xsl:when>
         <xsl:otherwise>
          <m:apply helm:xref="{@id}">
-          <m:limit/>
+          <m:limit>
+            <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:limit>
           <m:bvar>
            <m:ci>$x</m:ci>
           </m:bvar>
@@ -261,7 +279,7 @@
        <xsl:choose>
         <xsl:when test="name(*[2]) = 'LAMBDA'">
          <m:apply helm:xref="{@id}">
-          <m:diff >
+          <m:diff>
            <xsl:attribute name="definitionURL">
             <xsl:value-of select="CONST/@uri"/> 
            </xsl:attribute>
@@ -299,3 +317,5 @@
 </xsl:template>
 
 </xsl:stylesheet>
+
+