new MathQL syntax

[helm.git] / helm / style / basic.xsl

diff --git a/helm/style/basic.xsl b/helm/style/basic.xsl
index ed6681af2132096f40526a822f8a358095381671..a9d82ddac4e28bc9054d5ba68ff79c093866e415 100644 (file)
--- a/helm/style/basic.xsl
+++ b/helm/style/basic.xsl
@@ -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}"/>
@@ -85,14 +85,20 @@
      <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]/target/@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"/>
@@ -168,25 +174,22 @@
     </m:apply>
 </xsl:template>
 
-<!-- EQUALITY -->
+<!-- EQUALITY and TYPE 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 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="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 -->
@@ -233,8 +236,3 @@ and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic_T
 <!-- see arith.xsl --> <!-- FG -->
 
 </xsl:stylesheet>
-
-
-
-
-