<!-- 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>
<!-- 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"/>
<!-- 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="*[3]/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: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>
</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>
<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>
</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 -->
-<!-- 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>
-<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}">
<!-- see arith.xsl --> <!-- FG -->
</xsl:stylesheet>
-
-
-
-
-