X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fbasic.xsl;h=7d45d23dd0f7dbc7a947436a0da0b15db8710984;hb=b0f879da074adb838681869bf401c97d0a860c6b;hp=3e385b68032e8dd144a917573d1bd417d5fe387d;hpb=c539f832ce69f7488e79e80d78c2c5003674dc50;p=helm.git

diff --git a/helm/style/basic.xsl b/helm/style/basic.xsl
index 3e385b680..7d45d23dd 100644
--- a/helm/style/basic.xsl
+++ b/helm/style/basic.xsl
@@ -27,7 +27,7 @@
 <!--******************************************************************--> 
 <!-- Basic Logic                                                      -->
 <!-- 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"
@@ -39,9 +39,9 @@
 
 <!-- AND -->
 
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Conjunction/and.ind'] and (count(child::*) = 3)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/and.ind'] and (count(child::*) = 3)]" mode="pure">
     <m:apply helm:xref="{@id}">
-    <m:and definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
+     <m:and definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
      <xsl:apply-templates select="*[2]" mode="noannot"/>
      <xsl:apply-templates select="*[3]" mode="noannot"/>
     </m:apply>
@@ -49,7 +49,7 @@
 
 <!-- OR -->
 
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Disjunction/or.ind'] and (count(child::*) = 3)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/or.ind'] and (count(child::*) = 3)]" mode="pure">
     <m:apply helm:xref="{@id}">
     <m:or definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
      <xsl:apply-templates select="*[2]" mode="noannot"/>
@@ -67,7 +67,7 @@
 </xsl:template>
 
 <!-- IFF -->
-<!--
+<!-- 
 <xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Logic/Equivalence/iff.ind'] and (count(child::*) = 3)]" mode="pure">
     <m:apply helm:xref="{@id}">
     <m:iff definitionURL="{CONST/@uri}" helm:xref="{CONST/@id}"/>
@@ -79,20 +79,27 @@
 
 <!-- EXISTS -->
 
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/First_order_quantifiers/ex.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT.ind'] and (count(child::*) = 3)]" mode="pure">
+
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/ex.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT.ind'] and (count(child::*) = 3)]" mode="pure">
     <m:apply helm:xref="{@id}">
      <m:exists definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
      <xsl:choose>
       <xsl:when test="name(*[3]) = 'LAMBDA'">
        <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="*[3]/*[1]/@binder"/></xsl:with-param></xsl:call-template></m:ci>
        </m:bvar>
+       <m:condition>
+        <xsl:apply-templates select="*[2]" mode="pure"/>
+       </m:condition>
        <xsl:apply-templates select="LAMBDA/target" mode="noannot"/>
       </xsl:when>
       <xsl:otherwise>
        <m:bvar>
         <m:ci>$x</m:ci>
        </m:bvar>
+       <m:condition>
+        <xsl:apply-templates select="*[2]" mode="pure"/>
+       </m:condition>
        <m:apply>
         <m:csymbol>app</m:csymbol>
         <xsl:apply-templates select="*[3]" mode="noannot"/>
@@ -103,12 +110,12 @@
     </m:apply>
 </xsl:template>
 
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/First_order_quantifiers/ex2.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT2.ind'] and (count(child::*) = 4)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/ex2.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT2.ind'] and (count(child::*) = 4)]" mode="pure">
     <m:apply helm:xref="{@id}">
     <m:exists definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
      <xsl:choose>
       <xsl:when test="name(*[3]) = 'LAMBDA'">
-       <xsl:variable name="bvarname" select="*[3]/target/@binder"/>
+       <xsl:variable name="bvarname" select="*[3]/*[1]/@binder"/>
        <m:bvar>
         <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="$bvarname"/></xsl:with-param></xsl:call-template></m:ci>
        </m:bvar>
@@ -117,7 +124,7 @@
        </m:condition>
        <xsl:choose>
         <xsl:when test="(name(*[4]) = 'LAMBDA') and 
-           ($bvarname = *[4]/target/@binder)">
+           ($bvarname = *[4]/*[1]/@binder)">
          <xsl:apply-templates select="LAMBDA[2]/target" mode="noannot"/>
         </xsl:when>
         <xsl:otherwise>
@@ -132,7 +139,7 @@
       <xsl:otherwise>
        <xsl:choose>
         <xsl:when test="name(*[4]) = 'LAMBDA'">
-         <xsl:variable name="bvarname" select="*[4]/target/@binder"/>
+         <xsl:variable name="bvarname" select="*[4]/*[1]/@binder"/>
          <m:bvar>
           <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="$bvarname"/></xsl:with-param></xsl:call-template></m:ci>
          </m:bvar>
@@ -168,31 +175,29 @@
     </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>
-</xsl:template>
+<!-- EQUALITY and TYPE EQUALITY -->
 
+<xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Logic/eq.ind']" mode="pure">
+   <xsl:call-template name="mk-mml-op-noannot">
+      <xsl:with-param name="hide" select="1"/>
+      <xsl:with-param name="c-tag" select="MUTIND"/>
+      <xsl:with-param name="m-tag" select="'eq'"/>
+   </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="hide" select="1"/>
+      <xsl:with-param name="c-tag" select="MUTIND"/>
+      <xsl:with-param name="m-tag" select="'eq'"/>
+   </xsl:call-template>
 </xsl:template>
 
 <!-- NOT-EQ -->
 <!-- NOT and EQ have no parameters -->
 <xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Logic/not.con']
-and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Equality/eq.ind']]]" mode="pure">
+and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/eq.ind']]]" mode="pure">
     <xsl:choose>
      <xsl:when test="count(APPLY/child::*) = 4">
       <m:apply helm:xref="{@id}">
@@ -228,45 +233,8 @@ and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic_T
 
 <!-- no datatypes in MathML content -->
 
+<!-- ************************** PEANO ********************************* -->
 
-<!-- *************************** PEANO ********************************* -->
-
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Peano/le.ind'] and (count(child::*) = 3)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:leq definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
-     <xsl:apply-templates select="*[2]" mode="noannot"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-    </m:apply>
-</xsl:template>
-
-<xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Peano/lt.con'] and (count(child::*) = 3)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:lt definitionURL="{CONST/@uri}" helm:xref="{CONST/@id}"/>
-     <xsl:apply-templates select="*[2]" mode="noannot"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-    </m:apply>
-</xsl:template>
-
-<xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Peano/ge.con'] and (count(child::*) = 3)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:geq definitionURL="{CONST/@uri}" helm:xref="{CONST/@id}"/>
-     <xsl:apply-templates select="*[2]" mode="noannot"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-    </m:apply>
-</xsl:template>
-
-<xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Peano/gt.con'] and (count(child::*) = 3)]" mode="pure">
-    <m:apply helm:xref="{@id}">
-    <m:gt definitionURL="{CONST/@uri}" helm:xref="{CONST/@id}"/>
-     <xsl:apply-templates select="*[2]" mode="noannot"/>
-     <xsl:apply-templates select="*[3]" mode="noannot"/>
-    </m:apply>
-</xsl:template>
+<!-- see arith.xsl --> <!-- FG -->
 
 </xsl:stylesheet>
-
-
-
-
-
-