X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmeta_style%2Fmeta_cic2mathml.xsl;h=072774b5d50bcb7c4c7dfefb93e47e76f59d8acd;hb=7e9ee837f75f38bf01240cdc03dd51c764c2665f;hp=10af6394aea5b234a578603b234f47838dcda39e;hpb=adbb8f993af86259003d7978a26de549b3aef2ae;p=helm.git

diff --git a/helm/meta_style/meta_cic2mathml.xsl b/helm/meta_style/meta_cic2mathml.xsl
index 10af6394a..072774b5d 100644
--- a/helm/meta_style/meta_cic2mathml.xsl
+++ b/helm/meta_style/meta_cic2mathml.xsl
@@ -62,17 +62,16 @@
 		</xsl:choose>
 	</xsl:variable>
 
+	<xsl:variable name="const">
+		<xsl:value-of select="@arity = 0 and @hide = 0 and @cook = 'false'"/>
+	</xsl:variable>
+
 	<xsl:choose>
-		<xsl:when test="@arity = 0 and @hide = 0 and $not = 'true'">
+		<xsl:when test="$const = 'true' and $not = 'true'">
 			<xsl:call-template name="out_comment">
 				<xsl:with-param name="name" select="concat($uri,': &quot;not&quot; cannot  be applyed to a constant operator')"/>
 			</xsl:call-template>
 		</xsl:when>
-		<xsl:when test="@arity = 0 and @hide = 0 and @cook = 'true'">
-			<xsl:call-template name="out_comment">
-				<xsl:with-param name="name" select="concat($uri,': a constant operator cannot be cooked')"/>
-			</xsl:call-template>
-		</xsl:when>
 		<xsl:otherwise>
 			<!-- All uris in uri1 list (if not empty) have CONST c-tag -->
 			<xsl:variable name="uri1">
@@ -99,6 +98,7 @@
 					<xsl:with-param name="arity" select="@arity"/>
 					<xsl:with-param name="m-tag" select="@m-tag"/>
 					<xsl:with-param name="c-tag" select="'CONST'"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 				<xsl:if test="@cook = 'true'">
 					<xsl:call-template name="out_template">
@@ -123,6 +123,7 @@
 					<xsl:with-param name="arity" select="@arity"/>
 					<xsl:with-param name="m-tag" select="@m-tag"/>
 					<xsl:with-param name="c-tag" select="'MUTIND'"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 				<xsl:if test="@cook = 'true'">
 					<xsl:call-template name="out_template">
@@ -155,15 +156,19 @@
 		</xsl:choose>
 	</xsl:variable>
 
+	<xsl:variable name="const">
+		<xsl:value-of select="*[name() = 'Case']/@arity = 0 and @hide = 0 and @cook = 'false'"/>
+	</xsl:variable>
+
 	<xsl:choose>
-		<xsl:when test="*[name() = 'Case']/@arity = 0 and @hide = 0 and $not = 'true'">
+		<xsl:when test="$const = 'true' and $not = 'true'">
 			<xsl:call-template name="out_comment">
 				<xsl:with-param name="name" select="concat($uri,': &quot;not&quot; cannot  be applyed to a constant operator')"/>
 			</xsl:call-template>
 		</xsl:when>
-		<xsl:when test="*[name() = 'Case']/@arity = 0 and @hide = 0 and @cook = 'true'">
+		<xsl:when test="$const = 'true'">
 			<xsl:call-template name="out_comment">
-				<xsl:with-param name="name" select="concat($uri,': a constant operator cannot be cooked')"/>
+				<xsl:with-param name="name" select="concat($uri,': cannot be specified a constant operator when using OpSet element')"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:otherwise>
@@ -242,16 +247,40 @@
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="m-tag"/>
 	<xsl:param name="c-tag"/>
+	<xsl:param name="const" select="'false'"/>
 	
 	<xsl:variable name="match">
-		<xsl:call-template name="out_match">
-			<xsl:with-param name="not"   select="$not"/>
-			<xsl:with-param name="uri"   select="$uri"/>
-			<xsl:with-param name="cook"  select="$cook"/>
-			<xsl:with-param name="hide"  select="$hide"/>
-			<xsl:with-param name="arity" select="$arity"/>
-			<xsl:with-param name="c-tag" select="$c-tag"/>
-		</xsl:call-template>	
+		<xsl:variable name="match_op">
+			<xsl:call-template name="out_match_op">
+				<xsl:with-param name="not"   select="$not"/>
+				<xsl:with-param name="uri"   select="$uri"/>
+				<xsl:with-param name="cook"  select="$cook"/>
+				<xsl:with-param name="c-tag" select="$c-tag"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:variable name="match_child">
+			<xsl:if test="$const = 'false'">
+				<xsl:choose>
+					<!-- if the operator has been concatenated with not, the root apply node must have only two child -->
+					<xsl:when test="$not = 'true'">
+						<xsl:value-of select="concat(' and count(*) = 2 and count(*[2]/*) = ',$arity + $hide + 1)"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat(' and count(*) = ',$arity + $hide + 1)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:if>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$const = 'false'">
+				<xsl:value-of select="concat('APPLY[',$match_op,$match_child,']')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$match_op"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable>
 
 	<!--                     TEMPLATE                     -->
@@ -267,6 +296,7 @@
 			<xsl:with-param name="hide"  select="$hide"/>
 			<xsl:with-param name="arity" select="$arity"/>
 			<xsl:with-param name="not"   select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 		</xsl:call-template>
 	</oxsl:template>
 </xsl:template>
@@ -281,32 +311,33 @@
 	<xsl:param name="c-tag"/>
 
 	<xsl:variable name="match">
-		<xsl:call-template name="out_match_op">
-			<xsl:with-param name="not"   select="$not"/>
-			<xsl:with-param name="cook"  select="$cook"/>
-			<xsl:with-param name="uri"   select="$uri"/> 
-			<xsl:with-param name="c-tag" select="$c-tag"/>
-		</xsl:call-template>
+		<xsl:variable name="match_op">
+			<xsl:call-template name="out_match_op">
+				<xsl:with-param name="not"   select="$not"/>
+				<xsl:with-param name="cook"  select="$cook"/>
+				<xsl:with-param name="uri"   select="$uri"/> 
+				<xsl:with-param name="c-tag" select="$c-tag"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:variable name="match_child">
+			<xsl:if test="$not = 'true'"> and count(*) = 2</xsl:if>
+		</xsl:variable>
+
+		<xsl:value-of select="concat('APPLY[',$match_op,$match_child,']')"/>
 	</xsl:variable>
 
 	<xsl:variable name="apply_not">
 		<xsl:if test="$not = 'true'">*[2]/</xsl:if>
 	</xsl:variable>
 
-	<xsl:variable name="op_uri_attr">
-		<xsl:call-template name="op_uri_attr">
-			<xsl:with-param name="not"   select="$not"/>
-			<xsl:with-param name="c-tag" select="$c-tag"/>
-		</xsl:call-template>
-	</xsl:variable>
-
 
 	<!--                     TEMPLATE                     -->
 	<xsl:call-template name="out_comment">
 		<xsl:with-param name="name" select="$name"/>
 	</xsl:call-template>
 	
-	<oxsl:template match="{concat('APPLY[',$match,']')}" mode="pure">
+	<oxsl:template match="{$match}" mode="pure">
 		<oxsl:choose>
 			<xsl:for-each select="Case">
 				<oxsl:when test="{concat('count(',$apply_not,'*) = ',@arity + $hide + 1)}">
@@ -367,80 +398,6 @@
 	<xsl:value-of select="concat($app_not,$app_op)"/>
 </xsl:template>
 
-
-<!-- Returns a test on apply node children number-->
-<xsl:template name="out_match_child">
-	<xsl:param name="not"   select="'false'"/>
-	<xsl:param name="hide"  select="0"/>
-	<xsl:param name="arity" select="0"/>
-
-	<!-- Test on children number only if the operator is not constant -->
-	<xsl:if test="$arity != 0 or $hide != 0">
-		<xsl:choose>
-			<!-- if the operator has been concatenated with not, the root apply node must have only two child -->
-			<xsl:when test="$not = 'true'">
-				<xsl:value-of select="concat('count(*) = 2 and count(*[2]/*) = ',$arity + $hide + 1)"/>	
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="concat('count(*) = ',$arity + $hide + 1)"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:if>
-</xsl:template>
-
-<xsl:template name="out_match">
-	<xsl:param name="not"   select="'false'"/>
-	<xsl:param name="uri"/>
-	<xsl:param name="cook"  select="'false'"/>
-	<xsl:param name="hide"  select="0"/>
-	<xsl:param name="arity" select="0"/>
-	<xsl:param name="c-tag"/>
-	
-	<!--           TEST ON OPERATOR(S) TYPE         -->
-	<xsl:variable name="match_op">
-		<xsl:call-template name="out_match_op">
-			<xsl:with-param name="not"   select="$not"/>
-			<xsl:with-param name="uri"   select="$uri"/>
-			<xsl:with-param name="cook"  select="$cook"/>
-			<xsl:with-param name="hide"  select="$hide"/>
-			<xsl:with-param name="c-tag" select="$c-tag"/>
-		</xsl:call-template>
-	</xsl:variable>
-		
-	<!--           TEST ON CHILD(REN) NUMBER         -->
-	<xsl:variable name="match_child">
-		<xsl:call-template name="out_match_child">
-			<xsl:with-param name="not"   select="$not"/>
-			<xsl:with-param name="hide"  select="$hide"/>
-			<xsl:with-param name="arity" select="$arity"/>
-		</xsl:call-template>
-	</xsl:variable>
-
-	<xsl:choose>
-		<!-- not a constant operator -->
-		<xsl:when test="$arity != 0 or $hide != 0">
-			<xsl:choose>
-				<xsl:when test="$match_child != ''">
-					<xsl:value-of select="concat('APPLY[',$match_op,' and ',$match_child,']')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="concat('APPLY[',$match_op,']')"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:choose>
-				<xsl:when test="$match_child != ''">
-					<xsl:value-of select="concat($match_op,' and ',$match_child)"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$match_op"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
 <xsl:template name="out_params">
 	<xsl:param name="params" select="1"/>
 	<xsl:param name="hide"   select="0"/>
@@ -476,18 +433,21 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 
 	<xsl:choose>
 		<!--            SIMPLE TRANSFORMATIONS            -->
 		<xsl:when test="count(*) = 0">
-			<xsl:variable name="xref">{@id}</xsl:variable>
+			<xsl:variable name="xref">
+				<xsl:if test="$const = 'false'">{@id}</xsl:if>
+			</xsl:variable>
 
 			<xsl:variable name="definitionURL">
 				<xsl:call-template name="op_uri_attr">
 					<xsl:with-param name="not"   select="$not"/>
 					<xsl:with-param name="cook"  select="$cook"/>
 					<xsl:with-param name="c-tag" select="$c-tag"/>
-					<xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:variable>
 
@@ -496,7 +456,7 @@
 					<xsl:with-param name="not"   select="$not"/>
 					<xsl:with-param name="cook"  select="$cook"/>
 					<xsl:with-param name="c-tag" select="$c-tag"/>
-					<xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			 </xsl:variable>
 		
@@ -527,6 +487,7 @@
 				<xsl:with-param name="hide"  select="$hide"/>
 				<xsl:with-param name="arity" select="$arity"/>
 				<xsl:with-param name="not"   select="$not"/>
+				<xsl:with-param name="const" select="$const"/>
 			</xsl:apply-templates>
 		</xsl:otherwise>
 	</xsl:choose>
@@ -600,6 +561,7 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 	
 	<xsl:variable name="helm:xref">
 		<xsl:choose>
@@ -611,9 +573,12 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:when>
-			<xsl:otherwise>{@id}</xsl:otherwise>
+			<xsl:otherwise>
+				<xsl:if test="$const = 'false'">{@id}</xsl:if>
+			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
 
@@ -624,6 +589,7 @@
 			<xsl:with-param name="hide"   select="$hide"/>
 			<xsl:with-param name="arity"  select="$arity"/>
 			<xsl:with-param name="not"    select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 			<xsl:with-param name="ignore" select="'xref'"/>
 		</xsl:call-template>
 	
@@ -633,6 +599,7 @@
 			<xsl:with-param name="hide"  select="$hide"/>
 			<xsl:with-param name="arity" select="$arity"/>
 			<xsl:with-param name="not"   select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 		</xsl:apply-templates>
 	</m:apply>
 </xsl:template>
@@ -643,6 +610,7 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 
 	<!-- set definitonURL attribute -->
 	<xsl:variable name="definitionURL">
@@ -655,6 +623,7 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
@@ -662,7 +631,7 @@
 					<xsl:with-param name="not"   select="$not"/>
 					<xsl:with-param name="cook"  select="$cook"/>
 					<xsl:with-param name="c-tag" select="$c-tag"/>
-					<xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -679,6 +648,7 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
@@ -686,7 +656,7 @@
 					<xsl:with-param name="not"   select="$not"/>
 					<xsl:with-param name="cook"  select="$cook"/>
 					<xsl:with-param name="c-tag" select="$c-tag"/>
-					<xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -706,6 +676,7 @@
 			<xsl:with-param name="hide"   select="$hide"/>
 			<xsl:with-param name="arity"  select="$arity"/>
 			<xsl:with-param name="not"    select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 			<xsl:with-param name="ignore" select="'xref + definitionURL + tag'"/>
 		</xsl:call-template>
 		
@@ -715,6 +686,7 @@
 			<xsl:with-param name="hide"  select="$hide"/>
 			<xsl:with-param name="arity" select="$arity"/>
 			<xsl:with-param name="not"   select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 		</xsl:apply-templates>
 	</xsl:element>
 </xsl:template>
@@ -762,6 +734,7 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 	
 	<xsl:copy>
 		<xsl:call-template name="copy_attributes">
@@ -770,6 +743,7 @@
 			<xsl:with-param name="hide"  select="$hide"/>
 			<xsl:with-param name="arity" select="$arity"/>
 			<xsl:with-param name="not"   select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 		</xsl:call-template>
 	
 		<xsl:apply-templates>
@@ -778,6 +752,7 @@
 			<xsl:with-param name="hide"  select="$hide"/>
 			<xsl:with-param name="arity" select="$arity"/>
 			<xsl:with-param name="not"   select="$not"/>
+			<xsl:with-param name="const" select="$const"/>
 		</xsl:apply-templates>
 	</xsl:copy>
 </xsl:template>
@@ -789,6 +764,7 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 
 	<xsl:variable name="binded_params">
 		<xsl:call-template name="get_binded_params">
@@ -863,6 +839,7 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:apply-templates>
 			</m:bvar>
 		</xsl:when>
@@ -877,6 +854,7 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:apply-templates>
 			</m:bvar>
 		</xsl:otherwise>
@@ -1217,6 +1195,7 @@
 	<xsl:param name="hide"   select="0"/>
 	<xsl:param name="arity"  select="0"/>
 	<xsl:param name="not"    select="'false'"/>
+	<xsl:param name="const"  select="'false'"/>
 	<xsl:param name="ignore" select="''"/>
 	
 	<xsl:variable name="test">
@@ -1227,7 +1206,16 @@
 	
 	<xsl:for-each select="@*">
 		<xsl:if test="contains($test,concat('+',name(),'+')) = false()">
-			<xsl:attribute name="{name()}">
+			<xsl:variable name="name">
+				<xsl:choose>
+					<xsl:when test="name() = 'xref'">helm:xref</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="name()"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			
+			<xsl:attribute name="{$name}">
 				<xsl:call-template name="set_attribute">
 					<xsl:with-param name="attr"  select="."/>
 					<xsl:with-param name="cook"  select="$cook"/>
@@ -1235,6 +1223,7 @@
 					<xsl:with-param name="hide"  select="$hide"/>
 					<xsl:with-param name="arity" select="$arity"/>
 					<xsl:with-param name="not"   select="$not"/>
+					<xsl:with-param name="const" select="$const"/>
 				</xsl:call-template>
 			</xsl:attribute>
 		</xsl:if>
@@ -1267,9 +1256,12 @@
 	<xsl:param name="hide"  select="0"/>
 	<xsl:param name="arity" select="0"/>
 	<xsl:param name="not"   select="'false'"/>
+	<xsl:param name="const" select="'false'"/>
 	
 	<xsl:choose>
-		<xsl:when test="$attr = '$APP-ID'">{@id}</xsl:when>
+		<xsl:when test="$attr = '$APP-ID'">
+			<xsl:if test="$const = 'false'">{@id}</xsl:if>
+		</xsl:when>
 		<xsl:when test="$attr = '$OP-ID' or $attr = '$OP-URI'">
 			<xsl:variable name="attr_type">
 				<xsl:choose>
@@ -1283,7 +1275,7 @@
 				<xsl:with-param name="not"       select="$not"/>
 				<xsl:with-param name="cook"      select="$cook"/>
 				<xsl:with-param name="c-tag"     select="$c-tag"/>
-				<xsl:with-param name="const"     select="$arity = 0 and $hide = 0"/>
+				<xsl:with-param name="const"     select="$const"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:otherwise>