Update to V7 after V6-2 tag creationg

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

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 88af829f8eadf6c14521fd64947e512503cd0bef..1d7945dc26208c0d44c01cf991ad84d92a8b1882 100644 (file)
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -14,28 +14,28 @@
 <!-- Variable containing the absolute path of the CIC file            -->
 <!--******************************************************************-->
 
-<xsl:variable name="absPath">http://localhost:8081/get?url=</xsl:variable>
+<xsl:variable name="absPath">http://localhost:8081/getciconly?uri=</xsl:variable>
 
 <!-- ************************* LOGIC *********************************-->
 
 <!-- Proof objects -->
 
-<!-- <xsl:key name="typeid" use="@id" match="TYPE"/> -->
+<!-- <xsl:key name="typeid" use="@of" match="TYPE"/> -->
 
 <xsl:template match="LAMBDA|PROD|CAST|REL|SORT|APPLY|VAR|META|CONST|MUTIND|MUTCONSTRUCT|MUTCASE|FIX|COFIX" mode="noannot">
   <xsl:choose> 
    <xsl:when test="@id">
     <xsl:variable name="id" select="@id"/>
     <xsl:choose>
-     <!-- <xsl:when test="//ALLTYPES and key('typeid',@id)"> -->
-     <xsl:when test="//ALLTYPES/TYPE[@id=$id]">
+     <!-- <xsl:when test="//InnerTypes and key('typeid',@id)"> -->
+     <xsl:when test="//InnerTypes/TYPE[@of=$id]">
      <xsl:choose>
       <xsl:when test="name()= 'APPLY' and CONST[
- attribute::uri='cic:/coq/INIT/Logic_Type/eqT_ind.con' or
- attribute::uri='cic:/coq/ZARITH/auxiliary/eqT_ind_r.con'] and count(child::*) = 7">
+ attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
+ attribute::uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con'] and count(child::*) = 7">
        <m:apply helm:xref="{@id}">
         <m:csymbol>thread</m:csymbol>
-        <xsl:apply-templates mode="pure" select="//ALLTYPES/TYPE[@id=$id]"/>
+        <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]"/>
         <m:apply>
          <m:csymbol>rw_step</m:csymbol>
          <xsl:apply-templates mode="pure" select="*[3]"/>
@@ -45,48 +45,48 @@
         <xsl:apply-templates mode="thread" select="*[5]"/>
        </m:apply>
       </xsl:when>
-      <xsl:when test="count(*[@id = //ALLTYPES/TYPE/@id]) = 1">
-       <m:apply helm:xref="{@id}">
-        <m:csymbol>thread</m:csymbol>
-        <xsl:apply-templates mode="pure" select="//ALLTYPES/TYPE[@id=$id]"/>
-        <m:apply>
-         <m:csymbol>app</m:csymbol>
-         <xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
-        </m:apply>
-        <xsl:apply-templates mode="thread" select="*[@id = //ALLTYPES/TYPE/@id]"/>
-       </m:apply>
-      </xsl:when>
       <!-- aggiungere la verifica dell'esistenza dei lambda per and_ind -->
       <xsl:when test="name()= 'APPLY' and CONST[
- attribute::uri='cic:/coq/INIT/Logic/Conjunction/and_ind.con'] 
+ attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con'] 
  and count(child::*) = 6">
        <m:apply helm:xref="{@id}">
         <m:csymbol>and_ind</m:csymbol>
         <xsl:apply-templates mode="noannot" select="*[6]"/>
-        <m:ci><xsl:value-of select="*[5]/target/@binder"/></m:ci>
+        <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="*[5]/target/@binder"/></xsl:with-param></xsl:call-template></m:ci>
         <xsl:apply-templates mode="pure" select="*[5]/source/*"/>
-        <m:ci><xsl:value-of select="*[5]/target/LAMBDA/target/@binder"/></m:ci>
+        <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="*[5]/target/LAMBDA/target/@binder"/></xsl:with-param></xsl:call-template></m:ci>
         <xsl:apply-templates mode="pure" select="*[5]/target/LAMBDA/source/*"/>
         <xsl:apply-templates mode="noannot" select="*[5]/target/LAMBDA/target/*"/>
        </m:apply>
       </xsl:when>
       <xsl:when test="name()= 'APPLY' and CONST[
- attribute::uri='cic:/coq/INIT/Logic/Disjunction/or_ind.con'] 
+ attribute::uri='cic:/Coq/Init/Logic/Disjunction/or_ind.con'] 
  and count(child::*) = 7">
        <m:apply helm:xref="{@id}">
         <m:csymbol>or_ind</m:csymbol>
         <xsl:apply-templates mode="noannot" select="*[7]"/>
-        <xsl:apply-templates mode="pure" select="//ALLTYPES/TYPE[@id=$id]"/>
+        <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]"/>
         <xsl:apply-templates mode="pure" select="*[5]"/>
         <xsl:apply-templates mode="pure" select="*[6]"/>
        </m:apply>
       </xsl:when>
+      <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1">
+       <m:apply helm:xref="{@id}">
+        <m:csymbol>thread</m:csymbol>
+        <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]"/>
+        <m:apply>
+         <m:csymbol>app</m:csymbol>
+         <xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
+        </m:apply>
+        <xsl:apply-templates mode="thread" select="*[@id = //InnerTypes/TYPE/@of]"/>
+       </m:apply>
+      </xsl:when>
       <xsl:otherwise>
        <m:apply helm:xref="{@id}">
         <m:csymbol>proof</m:csymbol>
         <xsl:apply-templates select="." mode="pure"/>
         <!-- <xsl:apply-templates select="key('typeid',@id)" mode="pure"/> -->
-        <xsl:apply-templates select="//ALLTYPES/TYPE[@id=$id]" mode="pure"/>
+        <xsl:apply-templates select="//InnerTypes/TYPE[@of=$id]" mode="pure"/>
        </m:apply>
       </xsl:otherwise>
      </xsl:choose>
@@ -104,8 +104,8 @@
 
 <xsl:template match="*" mode="copy-of-no-prop">
  <xsl:choose>
-  <xsl:when test="@id = //ALLTYPES/TYPE/@id">
-   <m:ci>prev</m:ci>
+  <xsl:when test="@id = //InnerTypes/TYPE/@of">
+   <m:ci>previous</m:ci>
   </xsl:when>
   <xsl:otherwise>
    <xsl:apply-templates select="." mode="pure"/>
@@ -117,10 +117,10 @@
 <xsl:template match="*" mode="thread">
   <xsl:choose>
    <xsl:when test="name()= 'APPLY' and CONST[
- attribute::uri='cic:/coq/INIT/Logic_Type/eqT_ind.con' or
- attribute::uri='cic:/coq/ZARITH/auxiliary/eqT_ind_r.con'] and count(child::*) = 7">
+ attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
+ attribute::uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con'] and count(child::*) = 7">
     <xsl:variable name="id" select="@id"/>
-     <xsl:apply-templates mode="pure" select="//ALLTYPES/TYPE[@id=$id]"/>
+     <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]"/>
      <m:apply>
       <m:csymbol>rw_step</m:csymbol>
       <xsl:apply-templates mode="pure" select="*[3]"/>
@@ -129,14 +129,26 @@
      </m:apply>
      <xsl:apply-templates mode="thread" select="*[5]"/>
    </xsl:when>
-   <xsl:when test="count(*[@id = //ALLTYPES/TYPE/@id]) = 1">
+<!--**** Patch temporanea, per il problema dei threads ***-->
+<xsl:when test="(name()= 'APPLY' and CONST[
+ attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con'] 
+ and count(child::*) = 6) or
+(name()= 'APPLY' and CONST[
+ attribute::uri='cic:/Coq/Init/Logic/Disjunction/or_ind.con'] 
+ and count(child::*) = 7)">
+ <xsl:apply-templates mode="noannot" select="."/>
+</xsl:when>
+<!--**** Fine Patch temporanea, per il problema dei threads ***-->
+   <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1">
+       <xsl:variable name="id" select="@id"/>
        <m:apply helm:xref="{@id}">
         <m:csymbol>thread</m:csymbol>
-        <xsl:apply-templates mode="pure" select="//ALLTYPES/TYPE[@id=$id]"/>
+        <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]"/>
         <m:apply>
+         <m:csymbol>app</m:csymbol>
          <xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
         </m:apply>
-        <xsl:apply-templates mode="thread" select="*[@id = //ALLTYPES/TYPE/@id]"/>
+        <xsl:apply-templates mode="thread" select="*[@id = //InnerTypes/TYPE/@of]"/>
        </m:apply>
    </xsl:when>
    <xsl:otherwise>
@@ -150,15 +162,15 @@
 
 <!-- non del tutto soddisfacente, ma .... -->
 <xsl:template match="APPLY[CONST[
- attribute::uri='cic:/coq/INIT/Logic_Type/eqT_ind.con' or
- attribute::uri='cic:/coq/ZARITH/auxiliary/eqT_ind_r.con']]" mode="appflat">
+ attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
+ attribute::uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con']]" mode="appflat">
     <xsl:choose>
      <xsl:when test="count(child::*) > 7">
       <xsl:variable name="id" select="@id"/>
       <xsl:variable name="ideqp" select="*[7]/@id"/>
       <xsl:variable name="idsubp" select="*[5]/@id"/>
-      <xsl:variable name="leteqp" select="boolean(//ALLTYPES/TYPE[@id=$ideqp])"/>
-      <xsl:variable name="letsubp" select="boolean(//ALLTYPES/TYPE[@id=$idsubp])"/>
+      <xsl:variable name="leteqp" select="boolean(//InnerTypes/TYPE[@of=$ideqp])"/>
+      <xsl:variable name="letsubp" select="boolean(//InnerTypes/TYPE[@of=$idsubp])"/>
       <m:apply helm:xref="{@id}">
        <m:csymbol>rewrite_and_apply</m:csymbol>
        <m:apply>
@@ -170,12 +182,12 @@
           <xsl:choose>
            <xsl:when test="$letsubp">
             <m:ci>
-             <xsl:value-of select="'h2'"/>
+             <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="'h2'"/></xsl:with-param></xsl:call-template>
             </m:ci>
            </xsl:when>
            <xsl:otherwise>
             <m:ci>
-             <xsl:value-of select="'h1'"/>
+             <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="'h1'"/></xsl:with-param></xsl:call-template>
             </m:ci>
            </xsl:otherwise>
           </xsl:choose>
@@ -188,7 +200,7 @@
       <xsl:choose>
        <xsl:when test="$letsubp">
         <m:ci>
-         <xsl:value-of select="'h1'"/>
+         <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="'h1'"/></xsl:with-param></xsl:call-template>
         </m:ci>
        </xsl:when>
        <xsl:otherwise>
@@ -212,7 +224,7 @@
 </xsl:template> 
 
 <xsl:template match="APPLY[CONST[
- attribute::uri='cic:/coq/INIT/Logic/Conjunction/and_ind.con']]" mode="appflat">
+ attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con']]" mode="appflat">
     <xsl:choose>
      <xsl:when test="count(child::*) > 4">
       <m:apply helm:xref="{@id}">