X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fproofs.xsl;h=f82d7769084f248b3431f933a7f5897d2dc6f9ca;hb=e390ca66e2d7db49828ed68abbb25f7115a13c68;hp=6c3375d97c873b42d3ed4612f5677bbe9f5837ab;hpb=07fa5c704b876f1e84af3013de37a9fa269c1d86;p=helm.git

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 6c3375d97..f82d77690 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -26,7 +26,7 @@
 
 <!--******************************************************************--> 
 <!-- Basic Logic                                                      -->
-<!-- First draft: April 3 2000                                        -->
+<!-- (completely) Revisited: february 2001, Andrea Asperti            -->
 <!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                 -->
 <!--******************************************************************-->
 
@@ -34,12 +34,6 @@
                               xmlns:m="http://www.w3.org/1998/Math/MathML"
                               xmlns:helm="http://www.cs.unibo.it/helm">
 
-<!--******************************************************************-->
-<!-- Variable containing the absolute path of the CIC file            -->
-<!--******************************************************************-->
-
-<xsl:variable name="absPath">http://localhost:8081/getciconly?uri=</xsl:variable>
-
 <!-- ************************* LOGIC *********************************-->
 
 <!-- Proof objects -->
@@ -51,13 +45,19 @@
 <xsl:apply-templates select="." mode="pure"/>
 </xsl:template>
 
+<!-- ALL ELEMENTS WITH A TYPE ARE TRANSLATED AS A PROOF-ELEMENT -->
+
 <!-- LAMBDA has inner type only if it is not nested inside another lambda -->
 <xsl:template match="LAMBDA" mode="noannot">
  <xsl:variable name="id" select="@id"/>
  <xsl:choose>
-  <xsl:when test="//InnerTypes and @sort='Prop' and name(../..) != 'LAMBDA'">
-  <!-- <xsl:when test="@sort='Prop' and //InnerTypes/TYPE[@of=$id]"> -->
-   <xsl:call-template name="has_inner_type"/>
+  <xsl:when test="$naturalLanguage='yes' and @sort='Prop' and name(../..) != 'LAMBDA'">
+   <m:apply helm:xref="{@id}">
+    <m:csymbol>proof</m:csymbol>
+    <xsl:apply-templates mode="proof_transform" select="."/>
+    <!-- <xsl:apply-templates mode="try_inductive" select="."/> -->
+    <xsl:apply-templates mode="pure" select="$InnerTypes/InnerTypes/TYPE[@of=$id]/*"/>
+   </m:apply>
   </xsl:when>
   <xsl:otherwise>
    <xsl:apply-templates select="." mode="pure"/>
@@ -65,239 +65,457 @@
  </xsl:choose>
 </xsl:template>
 
-<!-- ALL this elements have inner type -->
+<!-- ALL these elements have inner type -->
 <xsl:template match="CAST|APPLY|MUTCASE|FIX|COFIX" mode="noannot">
+ <xsl:variable name="id" select="@id"/>
  <xsl:choose>
-  <!-- <xsl:when test="//InnerTypes and key('typeid',@id)"> -->
-  <!-- <xsl:when test="//InnerTypes/TYPE[@of=$id]"> -->
-  <xsl:when test="//InnerTypes and @sort='Prop'">
-   <xsl:call-template name="has_inner_type"/>
+  <xsl:when test="$naturalLanguage='yes' and @sort='Prop'">
+   <m:apply helm:xref="{@id}">
+    <m:csymbol>proof</m:csymbol>
+    <xsl:apply-templates mode="proof_transform" select="."/>
+    <!-- <xsl:apply-templates mode="try_inductive" select="."/> -->
+    <xsl:apply-templates mode="pure" select="$InnerTypes/InnerTypes/TYPE[@of=$id]/*"/>
+   </m:apply>
   </xsl:when>
   <xsl:otherwise>
-   <xsl:apply-templates select="." mode="pure"/>
+   <xsl:choose>
+    <xsl:when test="name()='APPLY'">
+     <xsl:apply-templates select="." mode="letin"/>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:apply-templates select="." mode="pure"/>
+    </xsl:otherwise>
+   </xsl:choose>
   </xsl:otherwise>
  </xsl:choose>
 </xsl:template>
 
-<xsl:template name="has_inner_type">
+<!-- si presuppone che il tipo induttivo non sia mutuamente 
+     induttivo. Bisognerebbe andare a vedere l'utlimo parametro
+     del presunto "principio di induzione", tirare fuori il tipo induttivo
+     e vedere se il suo nome coincide con il prefisso di _ind. 
+     Ad esempio nat_double_ind e' definito dall'utente. L'ultimo
+     parametro di nat_double_ind e' di tipo nat, e nat e' diverso
+     da nat_double. Per ora, verifico solo l'esistenza di nat_double,
+     ma questo, benche' non porti ad errore, non copre tutti i
+     casi per quelli mutuamente induttivi -->
+
+<xsl:template mode="try_inductive" match="APPLY">
+   <xsl:variable name="id" select="@id"/>
+   <xsl:choose>
+    <xsl:when test="CONST[1]">
+     <xsl:variable name="uri" select="CONST[1]/@uri"/>
+     <xsl:choose>
+      <xsl:when test="contains($uri,'_ind.con')">
+       <xsl:variable name="ind_uri" 
+         select="concat(substring-before($uri,'_ind.con'),'.ind')"/>
+       <xsl:variable name="inductive_def" 
+     select="document(concat(string($absPath),$ind_uri))/InductiveDefinition"/>
+       <!-- check if the corresponding inductive definition actually
+            exists -->
+       <xsl:choose>
+        <xsl:when test="$inductive_def">
+         <xsl:variable name="ind_name">
+          <xsl:call-template name="get_name">
+           <xsl:with-param name="uri" select="$uri"/>
+          </xsl:call-template>
+         </xsl:variable>
+         <xsl:variable name="no_params">
+          <xsl:call-template name="get_no_params">
+           <xsl:with-param name="first_uri" select="$CICURI"/>
+           <xsl:with-param name="second_uri" select="$uri"/>
+          </xsl:call-template>
+         </xsl:variable>
+         <xsl:apply-templates mode="inductive" select=".">
+          <xsl:with-param name="inductive_def_uri" 
+           select="$ind_uri"/>
+          <xsl:with-param name="inductive_def" 
+           select="$inductive_def"/>
+          <xsl:with-param name="section_params" select="$no_params"/>
+          <xsl:with-param name="inductive_def_index" select="1"/>
+          <xsl:with-param name="inductive_def_name" select="$ind_name"/>
+         </xsl:apply-templates>
+        </xsl:when>
+        <xsl:otherwise>
+         <xsl:apply-templates mode="letin" select="."/>
+        </xsl:otherwise>
+       </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+       <xsl:apply-templates mode="letin" select="."/>
+      </xsl:otherwise>
+     </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:apply-templates mode="letin" select="."/>
+    </xsl:otherwise>
+   </xsl:choose>
+</xsl:template>
+
+
+<xsl:template mode="proof_transform" match="*">
+ <xsl:choose>
+  <xsl:when test="name()='APPLY'">
    <xsl:variable name="id" select="@id"/>
    <xsl:choose>
-    <xsl:when test="name()= 'APPLY' and CONST[
+    <!-- NATIND 3 parametri -->
+    <xsl:when test="CONST[attribute::uri='cic:/Coq/Init/Datatypes/nat_ind.con']              and count(child::*) = 4">
+     <m:apply>
+      <m:csymbol>nat_ind</m:csymbol>
+      <xsl:apply-templates mode="noannot" select="*[3]"/>
+      <xsl:apply-templates mode="noannot" select="*[4]"/>
+     </m:apply>
+    </xsl:when>
+    <!-- NATIND 4 parametri (nuova versione) -->
+    <!-- 
+    <xsl:when test="CONST[
+ attribute::uri='cic:/Coq/Init/Datatypes/nat_ind.con'] 
+ and count(child::*) = 5
+ and name(*[4])='LAMBDA' 
+ and name(*[4]/target/*[1])='LAMBDA'"> 
+     <m:apply>
+      <m:csymbol>nat_ind_complete</m:csymbol>
+      <xsl:apply-templates mode="noannot" select="*[5]"/>
+      <xsl:apply-templates mode="noannot" select="*[3]"/>
+      <m:ci><xsl:value-of select="*[4]/target/@binder"/></m:ci>
+      <m:ci><xsl:value-of select="*[4]/target/*[1]/target/@binder"/></m:ci>
+      <xsl:apply-templates mode="noannot" select="*[4]/target/*[1]/source/*"/>
+      <xsl:apply-templates mode="noannot" select="*[4]/target/*[1]/target/*"/>
+     </m:apply>
+    </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_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">
-     <m:apply helm:xref="{@id}">
-      <m:csymbol>thread</m:csymbol>
-      <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]/*"/>
       <m:apply>
        <m:csymbol>rw_step</m:csymbol>
+       <xsl:apply-templates mode="noannot" select="*[5]"/>
        <xsl:apply-templates mode="pure" select="*[3]"/>
        <xsl:apply-templates mode="pure" select="*[6]"/>
-       <xsl:apply-templates mode="pure" select="*[7]"/>
+       <xsl:apply-templates mode="proof_transform" select="*[7]"/>
       </m:apply>
-      <xsl:apply-templates mode="thread" select="*[5]"/>
+    </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_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">
+      <xsl:variable name="no_extraproofs" select="count(*[position()>7 and @sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>      
+      <xsl:choose>
+       <xsl:when test="$no_extraproofs=0"> 
+        <m:apply>
+         <m:csymbol>rewrite_and_apply</m:csymbol>
+         <m:apply>
+          <m:csymbol>rw_step</m:csymbol>
+          <xsl:apply-templates mode="noannot" select="*[5]"/>
+          <xsl:apply-templates mode="pure" select="*[3]"/>
+          <xsl:apply-templates mode="pure" select="*[6]"/>
+          <xsl:apply-templates mode="pure" select="*[7]"/>
+         </m:apply>
+         <xsl:apply-templates mode="noannot" select="*[position()>7]"/>
+        </m:apply>
+       </xsl:when>
+       <xsl:otherwise>
+        <xsl:choose>
+         <xsl:when test="*[5]/@sort='Prop'">
+          <m:apply helm:xref="{@id}">
+           <m:csymbol>letin</m:csymbol>
+           <m:apply>
+            <m:csymbol>let</m:csymbol>
+            <m:ci>
+             <xsl:call-template name="insert_subscript">
+              <xsl:with-param name="node_value" select="'h1'"/>
+             </xsl:call-template>
+            </m:ci>
+            <xsl:apply-templates mode="noannot" select="*[5]"/>
+           </m:apply>
+           <xsl:call-template name="gen_let">
+            <xsl:with-param name="init_pos" select="1"/>
+            <xsl:with-param name="from" select="7"/>
+           </xsl:call-template>
+           <m:apply>
+            <m:csymbol>rewrite_and_apply</m:csymbol>
+            <m:apply>
+             <m:csymbol>rw_step</m:csymbol>
+             <m:ci>
+              <xsl:call-template name="insert_subscript">
+               <xsl:with-param name="node_value" select="'h1'"/>
+              </xsl:call-template>
+             </m:ci>
+             <xsl:apply-templates mode="pure" select="*[3]"/>
+             <xsl:apply-templates mode="pure" select="*[6]"/>
+             <xsl:apply-templates mode="pure" select="*[7]"/>
+            </m:apply>
+            <xsl:apply-templates mode="flat" select="*[8]">
+             <xsl:with-param name="n">
+              <xsl:value-of select="2"/>
+             </xsl:with-param>
+            </xsl:apply-templates>
+           </m:apply>
+          </m:apply>
+         </xsl:when>
+         <xsl:otherwise>
+          <m:apply helm:xref="{@id}">
+           <m:csymbol>letin</m:csymbol>
+           <xsl:call-template name="gen_let">
+            <xsl:with-param name="init_pos" select="0"/>
+            <xsl:with-param name="form" select="7"/>
+           </xsl:call-template>
+           <m:apply>
+            <m:csymbol>rewrite_and_apply</m:csymbol>
+            <m:apply>
+             <m:csymbol>rw_step</m:csymbol>
+             <xsl:apply-templates mode="pure" select="*[5]"/>
+             <xsl:apply-templates mode="pure" select="*[3]"/>
+             <xsl:apply-templates mode="pure" select="*[6]"/>
+             <xsl:apply-templates mode="pure" select="*[7]"/>
+            </m:apply>
+            <xsl:apply-templates mode="flat" select="*[8]">
+             <xsl:with-param name="n">
+              <xsl:value-of select="1"/>
+             </xsl:with-param>
+            </xsl:apply-templates>
+           </m:apply>
+          </m:apply>
+         </xsl:otherwise>
+        </xsl:choose>
+       </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <!-- False_ind -->
+    <xsl:when test="CONST[
+     attribute::uri='cic:/Coq/Init/Logic/False_ind.con'] and 
+     count(child::*) = 3">
+     <m:apply helm:xref="{@id}">
+       <m:csymbol>false_ind</m:csymbol>
+       <m:ci>cic:/Coq/Init/Logic/False_ind.con</m:ci>
+       <xsl:apply-templates mode="noannot" select="*[3]"/>
      </m:apply>
     </xsl:when>
     <!-- gestire meglio il caso di and_ind quando la prova 
          non e' della forma \x.\y.M -->
-    <xsl:when test="name()= 'APPLY' and CONST[
+    <xsl:when test="CONST[
  attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con'] 
  and count(child::*) = 6 
  and name(*[5])='LAMBDA' 
  and name(*[5]/target/*[1])='LAMBDA'"> 
-     <m:apply helm:xref="{@id}">
-      <m:csymbol>and_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="noannot" select="*[5]/target/LAMBDA/target/*"/>
-     </m:apply>
+      <m:apply helm:xref="{@id}">
+       <m:csymbol>and_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:apply>
     </xsl:when>
-    <xsl:when test="name()= 'APPLY' and CONST[
+    <xsl:when test="CONST[
  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="//InnerTypes/TYPE[@of=$id]/*"/>
-      <xsl:apply-templates mode="pure" select="*[5]"/>
-      <xsl:apply-templates mode="pure" select="*[6]"/>
-     </m:apply>
+      <xsl:choose>
+       <xsl:when test="name(*[5])='LAMBDA' 
+                 and name(*[6])='LAMBDA'">
+        <xsl:variable name="definition_url" 
+            select="'cic:/Coq/Init/Logic/Disjunction/or.ind'"/>
+        <m:apply helm:xref="{@id}">
+         <m:csymbol>full_or_ind</m:csymbol>
+         <xsl:apply-templates mode="noannot" select="*[7]"/>
+         <xsl:apply-templates mode="pure" 
+              select="$InnerTypes/InnerTypes/TYPE[@of=$id]/*"/>
+         <m:apply>
+          <m:csymbol>left_case</m:csymbol>
+          <m:bvar>
+           <m:ci>
+            <xsl:value-of select="*[5]/target/@binder"/>
+           </m:ci>
+           <m:type>
+            <xsl:apply-templates mode="pure" select="*[5]/source/*[1]"/>
+           </m:type>
+          </m:bvar>
+          <xsl:apply-templates mode="noannot" select="*[5]/target/*[1]"/>
+         </m:apply>
+         <m:apply>
+          <m:csymbol>right_case</m:csymbol>
+          <m:bvar>
+           <m:ci>
+            <xsl:apply-templates mode="pure" select="*[6]/target/@binder"/>
+           </m:ci>
+           <m:type>
+            <xsl:apply-templates mode="pure" select="*[6]/source/*[1]"/>
+           </m:type>
+          </m:bvar>
+          <xsl:apply-templates mode="noannot" select="*[6]/target/*[1]"/>
+         </m:apply>
+        </m:apply>
+       </xsl:when>
+       <xsl:otherwise>
+        <m:apply helm:xref="{@id}">
+         <m:csymbol>or_ind</m:csymbol>
+         <xsl:apply-templates mode="noannot" select="*[7]"/>
+         <xsl:apply-templates mode="pure" 
+              select="$InnerTypes/InnerTypes/TYPE[@of=$id]/*"/>
+         <xsl:apply-templates mode="pure" select="*[5]"/>
+         <xsl:apply-templates mode="pure" select="*[6]"/>
+        </m:apply>
+       </xsl:otherwise>
+      </xsl:choose>
     </xsl:when>
-    <!-- exT_ind -->
-    <xsl:when test="name()= 'APPLY' and CONST[
- attribute::uri='cic:/Coq/Init/Logic_Type/exT_ind.con'] 
+    <!-- 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'])  
  and count(child::*) = 6 
  and name(*[5])='LAMBDA' 
  and name(*[5]/target/*[1])='LAMBDA'"> 
+      <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:apply>
+    </xsl:when>
+    <xsl:when test="name(*[1])='CONST'">
+     <xsl:apply-templates mode="try_inductive" select="."/>
+    </xsl:when>
+    <!-- patch temporanea per la gestione di redex -->
+    <xsl:when test="name(*[1])='LAMBDA' and count(child::*)=2
+         and *[2]/@sort='Prop'">
      <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="noannot" select="*[5]/target/LAMBDA/target/*"/>
+      <m:csymbol>letin</m:csymbol>
+      <m:apply>
+       <m:csymbol>let</m:csymbol>
+       <m:ci>
+        <xsl:call-template name="insert_subscript">
+         <xsl:with-param name="node_value">
+          <xsl:value-of select="*[1]/target/@binder"/>
+         </xsl:with-param>
+        </xsl:call-template>
+       </m:ci>
+       <xsl:apply-templates mode="noannot" select="*[2]"/>
+      </m:apply>
+      <xsl:apply-templates mode="proof_transform" select="*[1]/target/*[1]"/>
      </m:apply>
     </xsl:when>
-    <!-- Threads -->
-    <!-- <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1"> -->
-    <xsl:when test="count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 1">
+    <xsl:otherwise>
+     <xsl:apply-templates select="." mode="letin"/>
+    </xsl:otherwise>
+   </xsl:choose>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:apply-templates select="." mode="pure"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="APPLY" mode="letin">
+   <xsl:variable name="no_subproofs" select="count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>
+   <!-- <m:cn><xsl:value-of select="$no_subproofs"/></m:cn> -->
+   <xsl:choose>
+    <xsl:when test="$naturalLanguage='yes' and ($no_subproofs = 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>letin1</m:csymbol>
+      <xsl:apply-templates mode="noannot" select="*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]"/>
+      <!-- now re-process the application -->
+      <m:apply helm:xref="{@id}">
        <m:csymbol>app</m:csymbol>
-       <xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
+       <!-- mode previous looks for siblings: 
+            call with the first child -->
+       <xsl:apply-templates mode="previous" select="*[1]"/>
       </m:apply>
-      <xsl:apply-templates mode="thread" select="*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]"/>
      </m:apply>
     </xsl:when>
-    <xsl:otherwise>
+    <xsl:when test="$naturalLanguage='yes' and ($no_subproofs > 1)">
      <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="//InnerTypes/TYPE[@of=$id]/*" mode="pure"/>
+      <m:csymbol>letin</m:csymbol>
+      <!-- first process all subproofs (let-in) -->
+      <xsl:call-template name="gen_let"/>
+      <!-- now re-process the application  -->
+      <m:apply helm:xref="{@id}">
+       <m:csymbol>app</m:csymbol>
+       <!-- mode flat looks for siblings: call with the first child -->
+       <xsl:apply-templates mode="flat" select="*[1]"/>
+      </m:apply>
      </m:apply>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:apply-templates mode="pure" select="."/>
     </xsl:otherwise>
    </xsl:choose>
 </xsl:template>
 
-<xsl:template match="*" mode="copy-of-no-prop">
+<xsl:template name="gen_let">
+ <xsl:param name="init_pos" select="0"/>
+ <xsl:param name="from" select="0"/>
+      <xsl:for-each select="*[position()>$from and @sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]">
+       <m:apply>
+        <m:csymbol>let</m:csymbol>
+        <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="concat('h',position()+$init_pos)"/></xsl:with-param></xsl:call-template></m:ci>
+        <xsl:apply-templates mode="noannot" select="."/>
+       </m:apply>
+      </xsl:for-each>
+</xsl:template>
+
+<xsl:template match="*" mode="previous">
  <xsl:choose>
-  <!-- <xsl:when test="@id = //InnerTypes/TYPE/@of"> -->
-  <xsl:when test="@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')">
+  <xsl:when test="$naturalLanguage='yes' and(@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX'))">
    <m:ci>previous</m:ci>
   </xsl:when>
   <xsl:otherwise>
    <xsl:apply-templates select="." mode="pure"/>
   </xsl:otherwise>
  </xsl:choose>
- <xsl:apply-templates mode="copy-of-no-prop" select="following-sibling::*[1]"/>
+ <xsl:apply-templates mode="previous" select="following-sibling::*[1]"/>
 </xsl:template>
 
-<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">
-    <xsl:variable name="id" select="@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]"/>
-      <xsl:apply-templates mode="pure" select="*[6]"/>
-      <xsl:apply-templates mode="pure" select="*[7]"/>
-     </m:apply>
-     <xsl:apply-templates mode="thread" select="*[5]"/>
-   </xsl:when>
-<!--**** Patch temporanea, per il problema dei threads ***-->
-<xsl:when test="(name()= 'APPLY' and 
- (CONST[attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con']
-  or
-   CONST[attribute::uri='cic:/Coq/Init/Logic_Type/exT_ind.con'])
- and count(child::*) = 6 
- and name(*[5])='LAMBDA' 
- and name(*[5]/target/*[1])='LAMBDA')
- 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="//InnerTypes and count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 1">
-       <xsl:variable name="id" select="@id"/>
-       <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]"/> -->
-        <xsl:apply-templates mode="thread" select="*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]"/>
-       </m:apply>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:apply-templates mode="noannot" select="."/>
-   </xsl:otherwise>
-  </xsl:choose>
+<xsl:template match="*" mode="flat">
+ <xsl:param name="n" select="1"/>
+ <xsl:variable name="id" select="@id"/>
+ <xsl:choose>
+  <!-- <xsl:when test="key('typeid',@id)"> -->
+  <!-- <xsl:when test="$InnerTypes/InnerTypes/TYPE[@of=$id]"> -->
+  <xsl:when test="$naturalLanguage='yes' and @sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')">
+   <m:ci>
+    <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="concat('h',$n)"/></xsl:with-param></xsl:call-template>
+   </m:ci>
+   <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
+    <xsl:with-param name="n" select="$n+1"/>
+   </xsl:apply-templates>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:apply-templates mode="pure" select="."/>
+   <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
+    <xsl:with-param name="n" select="$n"/>
+   </xsl:apply-templates>
+  </xsl:otherwise>
+ </xsl:choose>
 </xsl:template>
 
+<!-- Auxiliary functions -->
+<xsl:template name="get_name">
+ <xsl:param name="uri" select="''"/>
+ <xsl:variable name="sub_after" select="substring-after($uri,'/')"/>
+ <xsl:choose>
+  <xsl:when test="contains($sub_after,'/')">
+   <xsl:call-template name="get_name">
+    <xsl:with-param name="uri" select="$sub_after"/>
+   </xsl:call-template>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:value-of select="substring-before($sub_after,'_ind.con')"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
 
-<!-- Basic proof operators -->
-
-<!-- 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">
-    <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(//InnerTypes/TYPE[@of=$ideqp])"/>
-      <xsl:variable name="letsubp" select="boolean(//InnerTypes/TYPE[@of=$idsubp])"/>
--->
-      <xsl:variable name="leteqp" select="boolean(*[7][@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>
-      <xsl:variable name="letsubp" select="boolean(*[5][@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>
-      <m:apply helm:xref="{@id}">
-       <m:csymbol>rewrite_and_apply</m:csymbol>
-       <m:apply>
-        <m:csymbol>rw_step</m:csymbol>
-        <xsl:apply-templates mode="pure" select="*[3]"/>
-        <xsl:apply-templates mode="pure" select="*[6]"/>
-        <xsl:choose>
-         <xsl:when test="$leteqp">
-          <xsl:choose>
-           <xsl:when test="$letsubp">
-            <m:ci>
-             <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: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>
-         </xsl:when>
-         <xsl:otherwise>
-          <xsl:apply-templates mode="pure" select="*[7]"/>
-         </xsl:otherwise>
-        </xsl:choose>
-       </m:apply>
-      <xsl:choose>
-       <xsl:when test="$letsubp">
-        <m:ci>
-         <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>
-        <xsl:apply-templates mode="pure" select="*[5]"/>
-       </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates mode="flat" select="*[8]">
-       <xsl:with-param name="n">
-        <xsl:value-of select="1+$letsubp+$leteqp"/>
-       </xsl:with-param>
-      </xsl:apply-templates>
-     </m:apply>
-    </xsl:when>
-    <xsl:otherwise>
-     <m:apply helm:xref="{@id}">
-      <m:csymbol>app</m:csymbol>
-      <xsl:apply-templates mode="flat" select="*[1]"/>
-     </m:apply>
-    </xsl:otherwise>
-   </xsl:choose>
-</xsl:template> 
-
-<xsl:template match="APPLY[CONST[
+<!-- <xsl:template match="APPLY[CONST[
  attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con']]" mode="appflat">
     <xsl:choose>
      <xsl:when test="count(child::*) > 4">
@@ -317,7 +535,7 @@
       </m:apply>
      </xsl:otherwise>
     </xsl:choose>
-</xsl:template> 
+</xsl:template>  -->
 
 
 </xsl:stylesheet>