X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fproofs.xsl;h=86ad8292e7536239fc5ab7756e7f508b4c974017;hb=97361ee59354e573e5df31bba78e8e6cda67906d;hp=82f2fd317787309b26928f498af9472ad83148d3;hpb=b72beb68cf0c34cb0785ad7e2a4c426494e29e6a;p=helm.git

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 82f2fd317..86ad8292e 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -42,7 +42,7 @@
 <xsl:key name="typeid" use="@of" match="TYPE"/>
 
 <!-- These elements do not have inner type -->
-<xsl:template match="PROD|SORT|MUTIND" mode="noannot">
+<xsl:template match="PROD|SORT|MUTIND|instantiate" mode="noannot">
  <xsl:apply-templates select="." mode="pure"/>
 </xsl:template>
 
@@ -203,7 +203,7 @@
    <xsl:variable name="id" select="@id"/>
    <xsl:choose>
     <!-- ricordarsi di trattare il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/CSetoids/CSetoid_basics/eq_transitive_unfolded.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/CSetoids/eq_transitive_unfolded.con'] and count(child::*) = 7">
      <!-- <m:ci>eccomi-3</m:ci> -->
      <xsl:apply-templates mode="eq_transitive" select="*[6]"/>
      <xsl:apply-templates mode="noannot" select="*[4]"/>
@@ -233,7 +233,7 @@
       <xsl:variable name="id" select="@id"/>
    <xsl:choose>
     <!-- ricordarsi di trattare il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_transitive.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_transitive.con'] and count(child::*) = 7">
        <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
@@ -242,7 +242,7 @@
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
     </xsl:when> 
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_wdl.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_wdl.con'] and count(child::*) = 7">
        <m:eq/>
        <!-- <m:ci><xsl:value-of select="'eq'"/></m:ci> -->
        <xsl:call-template name="generate_side_proof">
@@ -254,7 +254,7 @@
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
     </xsl:when> 
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_less_trans.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algerba/COrdFields/leEq_less_trans.con'] and count(child::*) = 7">
        <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
@@ -263,7 +263,7 @@
         <xsl:with-param name="rel" select="'lt'"/>
        </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/less_leEq_trans.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_leEq_trans.con'] and count(child::*) = 7">
        <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'lt'"/>
        </xsl:apply-templates>
@@ -272,7 +272,7 @@
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
     </xsl:when>  
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_wdr.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_wdr.con'] and count(child::*) = 7">
        <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'leq'"/>
        </xsl:apply-templates>
@@ -281,7 +281,7 @@
         <xsl:with-param name="rel" select="'eq'"/>
        </xsl:apply-templates>
     </xsl:when>  
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_transitive_unfolded.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_transitive_unfolded.con'] and count(child::*) = 7">
       <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'lt'"/>
        </xsl:apply-templates>
@@ -290,7 +290,7 @@
         <xsl:with-param name="rel" select="'lt'"/>
        </xsl:apply-templates>
      </xsl:when> 
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_wdr.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_wdr.con'] and count(child::*) = 7">
        <xsl:apply-templates mode="diseq" select="*[6]">
         <xsl:with-param name="rel" select="'lt'"/>
        </xsl:apply-templates>
@@ -299,7 +299,7 @@
         <xsl:with-param name="rel" select="'eq'"/>
        </xsl:apply-templates>
      </xsl:when>
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_wdl.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_wdl.con'] and count(child::*) = 7">
        <m:eq/>
        <!-- <m:ci><xsl:value-of select="'eq'"/></m:ci> -->
        <xsl:call-template name="generate_side_proof">
@@ -349,7 +349,7 @@
     <!-- Algebra equality (eq_transitive_unfolded) -->
     <!-- It requires a special mode "eq_transitive"-->
     <!-- togliere il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/CSetoids/CSetoid_basics/eq_transitive_unfolded.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/CSetoids/eq_transitive_unfolded.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>eq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -362,7 +362,7 @@
     <!-- Algebra disequalities -->
     <!-- It requires a special mode "diseq"-->
     <!-- togliere il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_transitive.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_transitive.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -376,7 +376,7 @@
        <xsl:apply-templates mode="noannot" select="*[5]"/>
      </m:apply>
     </xsl:when> 
-     <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_wdl.con'] and count(child::*) = 7">
+     <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_wdl.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[5]"/>
@@ -393,7 +393,7 @@
        <xsl:apply-templates mode="noannot" select="*[4]"/>
      </m:apply>
     </xsl:when>
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_less_trans.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_less_trans.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -407,7 +407,7 @@
        <xsl:apply-templates mode="noannot" select="*[5]"/>
      </m:apply>
     </xsl:when> 
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/less_leEq_trans.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_leEq_trans.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -421,7 +421,7 @@
        <xsl:apply-templates mode="noannot" select="*[5]"/>
      </m:apply>
     </xsl:when>  
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/Basic_Properties_of_leEq/leEq_wdr.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/leEq_wdr.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -435,7 +435,7 @@
        <xsl:apply-templates mode="noannot" select="*[5]"/>
      </m:apply>
     </xsl:when>  
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_transitive_unfolded.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_transitive_unfolded.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -450,7 +450,7 @@
      </m:apply>
     </xsl:when>  
     <!-- togliere il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_wdr.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_wdr.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[3]"/>
@@ -465,7 +465,7 @@
      </m:apply>
     </xsl:when>
     <!-- togliere il parametro -->
-    <xsl:when test="CONST[attribute::uri='cic:/Algebra/COrdFields/COrdField_axioms/less_wdl.con'] and count(child::*) = 7">
+    <xsl:when test="CONST[attribute::uri='cic:/Algebra/algebra/COrdFields/less_wdl.con'] and count(child::*) = 7">
      <m:apply>
        <m:csymbol>diseq_chain</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[5]"/>
@@ -484,8 +484,8 @@
     </xsl:when> 
     <!-- EQUALITY -->
     <xsl:when test="CONST[
- attribute::uri='cic:/Coq/Init/Logic/Equality/eq_ind.con' or
- attribute::uri='cic:/Coq/Init/Logic/Logic_lemmas/eq_ind_r.con' or
+ attribute::uri='cic:/Coq/Init/Logic/eq_ind.con' or
+ attribute::uri='cic:/Coq/Init/Logic/eq_ind_r.con' or
  attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
  attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind_r.con' or
  attribute::uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con'] and count(child::*) = 7">
@@ -502,8 +502,8 @@
     </xsl:when>
     <!-- EQUALITY with extra-parameters -->
     <xsl:when test="CONST[
- attribute::uri='cic:/Coq/Init/Logic/Equality/eq_ind.con' or
- attribute::uri='cic:/Coq/Init/Logic/Logic_lemmas/eq_ind_r.con' or
+ attribute::uri='cic:/Coq/Init/Logic/eq_ind.con' or
+ attribute::uri='cic:/Coq/Init/Logic/eq_ind_r.con' or
  attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
  attribute::uri='cic:/Coq/Init/Logic_Type/eqT_ind_r.con' or
  attribute::uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con'] and count(child::*) > 7">
@@ -642,10 +642,10 @@
           <m:csymbol>left_case</m:csymbol>
           <m:bvar>
            <m:ci>
-            <xsl:value-of select="*[5]/target/@binder"/>
+            <xsl:value-of select="*[5]/*[1]/@binder"/>
            </m:ci>
            <m:type>
-            <xsl:apply-templates mode="pure" select="*[5]/source/*[1]"/>
+            <xsl:apply-templates mode="pure" select="*[5]/*[1]/*[1]"/>
            </m:type>
           </m:bvar>
           <xsl:apply-templates mode="noannot" select="*[5]/target/*[1]"/>
@@ -654,10 +654,10 @@
           <m:csymbol>right_case</m:csymbol>
           <m:bvar>
            <m:ci>
-            <xsl:apply-templates mode="pure" select="*[6]/target/@binder"/>
+            <xsl:apply-templates mode="pure" select="*[6]/*[1]/@binder"/>
            </m:ci>
            <m:type>
-            <xsl:apply-templates mode="pure" select="*[6]/source/*[1]"/>
+            <xsl:apply-templates mode="pure" select="*[6]/*[1]/*[1]"/>
            </m:type>
           </m:bvar>
           <xsl:apply-templates mode="noannot" select="*[6]/target/*[1]"/>
@@ -679,18 +679,18 @@
     </xsl:when>
     <!-- ex_ind, exT_ind -->
       <xsl:when test="(CONST[attribute::uri='cic:/Coq/Init/Logic_Type/exT_ind.con'] or
-      CONST[attribute::uri='cic:/Coq/Init/Logic/First_order_quantifiers/ex_ind.con'])  
+      CONST[attribute::uri='cic:/Coq/Init/Logic/ex_ind.con'])  
  and count(child::*) = 6 
  and name(*[5])='LAMBDA' 
- and name(*[5]/target/*[1])='LAMBDA'"> 
+ and name(*[5]/*[2])='decl'"> 
       <m:apply helm:xref="{@id}">
        <m:csymbol>ex_ind</m:csymbol>
        <xsl:apply-templates mode="noannot" select="*[6]"/>
-       <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: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="proof_transform" select="*[5]/target/LAMBDA/target/*"/>
+       <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="*[5]/*[1]/@binder"/></xsl:with-param></xsl:call-template></m:ci>
+       <xsl:apply-templates mode="pure" select="*[5]/*[1]/*"/>
+       <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="*[5]/*[2]/@binder"/></xsl:with-param></xsl:call-template></m:ci>
+       <xsl:apply-templates mode="pure" select="*[5]/*[2]/*"/>
+       <xsl:apply-templates mode="proof_transform" select="*[5]/target/*"/>
       </m:apply>
     </xsl:when>
     <xsl:when test="name(*[1])='CONST'">
@@ -706,7 +706,7 @@
        <m:ci>
         <xsl:call-template name="insert_subscript">
          <xsl:with-param name="node_value">
-          <xsl:value-of select="*[1]/target/@binder"/>
+          <xsl:value-of select="*[1]/*[1]/@binder"/>
          </xsl:with-param>
         </xsl:call-template>
        </m:ci>