X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fproofs.xsl;h=69c8936130bcaf605a2f28956b438226c9cacec5;hb=911199dc198f34ae6a024d81ff62c78e2e97f7db;hp=b3596889174ce264678da62bc43b315c02b01599;hpb=5d9c64e007c6eff9447b2ef67d2a680c86c2775d;p=helm.git

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index b35968891..69c893613 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -34,36 +34,175 @@
                               xmlns:m="http://www.w3.org/1998/Math/MathML"
                               xmlns:helm="http://www.cs.unibo.it/helm">
 
+<xsl:include href="logic.xsl"/>
+<xsl:include href="inductive.xsl"/>
+<xsl:include href="rewrite.xsl"/>
+<xsl:include href="diseq.xsl"/>
+
 <!-- ************************* LOGIC *********************************-->
 
 <!-- Proof objects -->
 
 <!-- <xsl:key name="typeid" use="@of" match="TYPE"/> -->
+<xsl:key name="typeid" use="@of" match="TYPE"/>
 
-<!-- ALL this elements does not have inner type -->
-<xsl:template match="LETIN|PROD|REL|SORT|VAR|META|CONST|MUTIND|MUTCONSTRUCT" mode="noannot">
-<xsl:apply-templates select="." mode="pure"/>
+<!-- These elements do not have inner type -->
+<xsl:template match="PROD|SORT|MUTIND|instantiate" mode="noannot">
+ <xsl:apply-templates select="." mode="pure"/>
+</xsl:template>
+
+<!-- Atomic elements that have an inner type iff the expected type -->
+<!-- is different from the synthesized type.                       -->
+<xsl:template match="REL|VAR|META|CONST|MUTCONSTRUCT" mode="noannot">
+ <xsl:variable name="id" select="@id"/>
+ <xsl:variable name="innertype_available">
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+  <xsl:when test="$naturalLanguage='yes' and @sort='Prop' and $innertype_available='yes'">
+   <!--xsl:when test="@sort='Prop'"-->
+   <m:apply helm:xref="{@id}">
+    <m:csymbol>proof</m:csymbol>
+    <xsl:apply-templates mode="proof_transform" select="."/>
+    <xsl:for-each select="$InnerTypes">
+     <xsl:apply-templates mode="pure" select="key('typeid',$id)/*"/>
+    </xsl:for-each>
+   </m:apply>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:apply-templates select="." mode="pure"/>
+  </xsl:otherwise>
+ </xsl:choose>
 </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:choose>
+  <xsl:when test="@sort='Prop'">
+   <xsl:apply-templates select="*[1]" mode="lambda_prop"/>
+  </xsl:when>
+  <xsl:otherwise>
+   <!-- mode lambda is defined in content.xsl -->
+   <xsl:apply-templates select="*[1]" mode="lambda"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="decl" mode="lambda_prop">
  <xsl:variable name="id" select="@id"/>
+ <xsl:variable name="innertype_available">
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
  <xsl:choose>
-  <xsl:when test="$naturalLanguage='yes' and @sort='Prop' and name(../..) != 'LAMBDA'">
+  <xsl:when test="$naturalLanguage='yes' and $innertype_available='yes'">
    <m:apply helm:xref="{@id}">
     <m:csymbol>proof</m:csymbol>
-    <xsl:apply-templates mode="proof_transform" select="."/>
-    <xsl:apply-templates mode="pure" select="$InnerTypes/InnerTypes/TYPE[@of=$id]/*"/>
+    <m:lambda helm:xref="{@id}">
+     <m:bvar>
+      <m:ci>
+       <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template>
+      </m:ci>
+      <m:type>
+       <xsl:apply-templates select="*[1]" mode="noannot"/>
+      </m:type>
+     </m:bvar>
+     <xsl:apply-templates select="following-sibling::*[1]" mode="lambda_prop"/>
+    </m:lambda>
+    <xsl:for-each select="$InnerTypes">
+     <xsl:apply-templates mode="pure" select="key('typeid',$id)/*"/>
+    </xsl:for-each>
    </m:apply>
   </xsl:when>
   <xsl:otherwise>
-   <xsl:apply-templates select="." mode="pure"/>
+   <m:lambda helm:xref="{@id}">
+    <m:bvar>
+     <m:ci>
+      <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template> 
+     </m:ci>
+     <m:type>
+      <xsl:apply-templates select="*[1]" mode="noannot"/>
+     </m:type>
+    </m:bvar>
+    <xsl:apply-templates select="following-sibling::*[1]" mode="lambda_prop"/>
+   </m:lambda>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="target" mode="lambda_prop">
+ <xsl:apply-templates select="*[1]" mode="noannot"/>
+</xsl:template>
+
+<!-- LETIN -->
+
+<xsl:template match="LETIN" mode="noannot">
+ <xsl:choose>
+  <xsl:when test="@sort='Prop'">
+   <xsl:apply-templates select="*[1]" mode="letin_prop"/>
+  </xsl:when>
+  <xsl:otherwise>
+   <!-- mode letin is defined in content.xsl -->
+   <xsl:apply-templates select="*[1]" mode="letin_pure"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="def" mode="letin_prop">
+ <xsl:variable name="id" select="@id"/>
+ <xsl:variable name="innertype_available">
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+  <xsl:when test="$naturalLanguage='yes' and $innertype_available='yes'">
+   <m:apply helm:xref="{@id}">
+    <m:csymbol>proof</m:csymbol>
+    <m:apply helm:xref="{@id}">
+     <m:csymbol>let_in</m:csymbol>
+     <m:bvar>
+      <m:ci>
+       <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template>
+      </m:ci>
+     </m:bvar>
+     <xsl:apply-templates select="*[1]" mode="noannot"/>
+     <xsl:apply-templates select="following-sibling::*[1]" mode="letin_prop"/>
+    </m:apply>
+    <xsl:for-each select="$InnerTypes">
+     <xsl:apply-templates mode="pure" select="key('typeid',$id)/*"/>
+    </xsl:for-each>
+   </m:apply>
+  </xsl:when>
+  <xsl:otherwise>
+   <m:apply helm:xref="{@id}">
+    <m:csymbol>let_in</m:csymbol>
+    <m:bvar>
+     <m:ci>
+      <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template> 
+     </m:ci>
+    </m:bvar>
+    <xsl:apply-templates select="*[1]" mode="noannot"/>
+    <xsl:apply-templates select="following-sibling::*[1]" mode="letin_prop"/>
+   </m:apply>
   </xsl:otherwise>
  </xsl:choose>
 </xsl:template>
 
+<xsl:template match="target" mode="letin_prop">
+ <xsl:apply-templates select="*[1]" mode="noannot"/>
+</xsl:template>
+
 <!-- ALL these elements have inner type -->
 <xsl:template match="CAST|APPLY|MUTCASE|FIX|COFIX" mode="noannot">
  <xsl:variable name="id" select="@id"/>
@@ -72,14 +211,18 @@
    <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]/*"/>
+    <xsl:for-each select="$InnerTypes">
+     <xsl:apply-templates mode="pure" select="key('typeid',$id)/*"/>
+    </xsl:for-each>
    </m:apply>
   </xsl:when>
   <xsl:otherwise>
    <xsl:choose>
     <xsl:when test="name()='APPLY'">
-     <xsl:apply-templates select="." mode="letin"/>
+     <!-- This is the case of an applicative expression wich is not
+          a proof but could contains proofs...
+          MODE LETIN OR MODE PURE ??? Big question -->
+     <xsl:apply-templates select="." mode="pure"/>
     </xsl:when>
     <xsl:otherwise>
      <xsl:apply-templates select="." mode="pure"/>
@@ -89,292 +232,32 @@
  </xsl:choose>
 </xsl:template>
 
-<!-- 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>
-    <!-- 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>
-       <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="proof_transform" select="*[7]"/>
-      </m:apply>
-    </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="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="proof_transform" select="*[5]/target/LAMBDA/target/*"/> 
-      </m:apply>
-    </xsl:when>
-    <xsl:when test="CONST[
- attribute::uri='cic:/Coq/Init/Logic/Disjunction/or_ind.con'] 
- and count(child::*) = 7">
-      <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>
-    <!-- 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:when test="name(*[1])='CONST' or 
+      (name(*[1])='instantiate' and name(*[1]/*[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'">
+    <xsl:when test="name(*[1])='LAMBDA' and count(child::*)=2">
+    <!-- old
+         and *[2]/@sort='Prop'"> -->
      <m:apply helm:xref="{@id}">
-      <m:csymbol>letin</m:csymbol>
-      <m:apply>
-       <m:csymbol>let</m:csymbol>
+      <m:csymbol>let_in</m:csymbol>
+      <m:bvar>
        <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>
-       <xsl:apply-templates mode="noannot" select="*[2]"/>
-      </m:apply>
-      <xsl:apply-templates mode="proof_transform" select="*[1]/target/*[1]"/>
+      </m:bvar>
+      <xsl:apply-templates mode="noannot" select="*[2]"/>
+      <xsl:apply-templates mode="lambda_prop" select="*[1]/*[2]"/>
      </m:apply>
     </xsl:when>
     <xsl:otherwise>
@@ -382,44 +265,97 @@
     </xsl:otherwise>
    </xsl:choose>
   </xsl:when>
-  <xsl:when test="name()='LAMBDA'">
+  <xsl:otherwise>
+   <xsl:apply-templates select="." mode="pure"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="is_simple">
+ <xsl:param name="proof" select="/.."/>
+ <xsl:value-of select="(count($proof/*)=0) or ((name($proof)='APPLY') and (count($proof/*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 0))"/>
+</xsl:template>
+
+<xsl:template name="generate_side_proof">
+ <xsl:param name="proof" select="/.."/>
+ <xsl:param name="show_statement" select="1"/>
+<!-- 
+ <xsl:variable name="is_simple">
+  <xsl:call-template name="is_simple">
+   <xsl:with-param name="proof" select="$proof"/>
+  </xsl:call-template>
+ </xsl:variable> -->
+<xsl:variable name="is_simple" select="(count($proof/*)=0) or ((name($proof)='APPLY') and (count($proof/*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 0))"/>
+ <xsl:choose>
+  <xsl:when test="$is_simple">
    <xsl:choose>
-     <xsl:when test="(name(target/*[1])='APPLY'  and
-      name(target/*[1]/*[1])='CONST' and
-      (target/*[1]/*[1]/@uri='cic:/Coq/Init/Logic_Type/eqT_ind.con' or
-       target/*[1]/*[1]/@uri='cic:/Coq/Init/Logic_Type/eqT_ind_r.con' or
-       target/*[1]/*[1]/@uri='cic:/Coq/Zarith/auxiliary/eqT_ind_r.con')
-      and count(target/*[1]/*) = 8 
-      and name(target/*[1]/*[8])='REL'
-      and target/@binder = target/*[1]/*[8]/@binder )"> 
-      <m:apply>
-       <m:csymbol>rw_step</m:csymbol>
-       <xsl:apply-templates mode="noannot" select="target/*[1]/*[5]"/>
-       <xsl:apply-templates mode="pure" select="target/*[1]/*[3]"/>
-       <xsl:apply-templates mode="pure" select="target/*[1]/*[6]"/>
-       <xsl:apply-templates mode="proof_transform" select="target/*[1]/*[7]"/>
-      </m:apply>
+    <xsl:when test="name($proof)='APPLY'">
+     <xsl:apply-templates select="$proof" mode="letin"/>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:apply-templates select="$proof" mode="pure"/>
+    </xsl:otherwise>
+   </xsl:choose>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:variable name="id" select="@id"/>
+   <m:apply helm:xref="{@id}">
+    <xsl:choose>
+     <xsl:when test="$show_statement = 1">
+      <m:csymbol>proof</m:csymbol>
      </xsl:when>
      <xsl:otherwise>
-      <xsl:apply-templates mode="pure" select="."/>
+      <m:csymbol>side_proof</m:csymbol>
      </xsl:otherwise>
     </xsl:choose>
-   </xsl:when>
-  <xsl:otherwise>
-   <xsl:apply-templates select="." mode="pure"/>
+    <xsl:apply-templates mode="proof_transform" select="$proof"/>
+    <xsl:for-each select="$InnerTypes">
+     <xsl:apply-templates mode="pure" select="key('typeid',$proof/@id)/*"/>
+    </xsl:for-each>
+   </m:apply>
+   <!-- <xsl:apply-templates select="$proof" mode="noannot"/> -->
   </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')])"/>
+   <xsl:variable name="no_subproofs">
+    <xsl:variable name="stars">
+     <xsl:for-each select="*[@sort='Prop']">
+      <xsl:variable name="id" select="@id"/>
+      <xsl:variable name="innertype_available">
+       <xsl:for-each select="$InnerTypes">
+        <xsl:if test="key('typeid',$id)/*">
+         <xsl:text>yes</xsl:text>
+        </xsl:if>
+       </xsl:for-each>
+      </xsl:variable>
+      <xsl:if test="name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes')">
+       <!-- We generate one star for each subproof -->
+       <xsl:text>*</xsl:text>
+      </xsl:if>
+     </xsl:for-each>
+    </xsl:variable>
+    <xsl:value-of select="string-length($stars)"/>
+   </xsl:variable>
    <!-- <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>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')]"/>
+      <xsl:for-each select="*[@sort='Prop']">
+       <xsl:variable name="id" select="@id"/>
+       <xsl:variable name="innertype_available">
+        <xsl:for-each select="$InnerTypes">
+         <xsl:if test="key('typeid',$id)/*">
+          <xsl:text>yes</xsl:text>
+         </xsl:if>
+        </xsl:for-each>
+       </xsl:variable>
+       <xsl:if test="name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes')">
+        <xsl:apply-templates mode="noannot" select="."/>
+       </xsl:if>
+      </xsl:for-each>
       <!-- now re-process the application -->
       <m:apply helm:xref="{@id}">
        <m:csymbol>app</m:csymbol>
@@ -458,38 +394,103 @@
    </xsl:choose>
 </xsl:template>
 
+
+<xsl:template name="gen_let">
+ <xsl:param name="init_pos" select="1"/>
+ <xsl:param name="from" select="0"/>
+  <xsl:apply-templates mode="gen_let_aux" select="*[position() = ($from+1)]">
+   <xsl:with-param name="init_pos" select="$init_pos"/>
+  </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template mode="gen_let_aux" match="*">
+ <xsl:param name="init_pos" select="1"/>
+ <xsl:variable name="id" select="@id"/>
+ <xsl:variable name="innertype_available">
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+  <xsl:when test="@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes'))">
+   <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',$init_pos)"/></xsl:with-param></xsl:call-template></m:ci>
+    <xsl:apply-templates mode="noannot" select="."/>
+   </m:apply>
+   <xsl:if test="following-sibling::*[1]">
+    <xsl:apply-templates mode="gen_let_aux" select="following-sibling::*[1]">
+     <xsl:with-param name="init_pos" select="$init_pos+1"/>
+    </xsl:apply-templates>
+   </xsl:if>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:if test="following-sibling::*[1]">
+    <xsl:apply-templates mode="gen_let_aux" select="following-sibling::*[1]">
+     <xsl:with-param name="init_pos" select="$init_pos"/>
+    </xsl:apply-templates>
+   </xsl:if>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- questa vecchia versione (di Claudio??) sembra bacata come un melone.
+
 <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 select="*[position()>$from and @sort='Prop']">
+       <xsl:variable name="id" select="@id"/>
+       <xsl:variable name="innertype_available">
+        <xsl:for-each select="$InnerTypes">
+         <xsl:if test="key('typeid',$id)/*">
+          <xsl:text>yes</xsl:text>
+         </xsl:if>
+        </xsl:for-each>
+       </xsl:variable>
+       <xsl:if test="name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes')">
+        <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:if>
       </xsl:for-each>
-</xsl:template>
+</xsl:template> -->
 
 <xsl:template match="*" mode="erase">
   <xsl:choose>
-   <xsl:when test="@sort='Prop' or $naturalLanguage='no'">
+   <xsl:when test="@sort='Prop' 
+                   or name()='instantiate' or $naturalLanguage='no'">
     <xsl:apply-templates mode="pure" select="."/>
    </xsl:when>
    <xsl:otherwise>
     <m:ci>.</m:ci>
    </xsl:otherwise>
    </xsl:choose>
- <xsl:apply-templates mode="previous" select="following-sibling::*[1]"/>
+ <xsl:apply-templates mode="erase" select="following-sibling::*[1]"/>
 </xsl:template>
 
 <xsl:template match="*" mode="previous">
+ <xsl:variable name="innertype_available">
+  <xsl:variable name="id" select="@id"/>
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
  <xsl:choose>
-  <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'))">
+  <xsl:when test="@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes'))">
    <m:ci>previous</m:ci>
   </xsl:when>
   <xsl:otherwise>
+   <!-- forse bisognerebbe trattare solo l'elemento di testa -->
    <xsl:choose>
-   <xsl:when test="@sort='Prop' or $naturalLanguage='no' ">
+   <xsl:when test="@sort='Prop' 
+                   or name()='instantiate' or $naturalLanguage='no'">
     <xsl:apply-templates mode="pure" select="."/>
    </xsl:when>
    <xsl:otherwise>
@@ -505,10 +506,15 @@
 <xsl:template match="*" mode="flat">
  <xsl:param name="n" select="1"/>
  <xsl:variable name="id" select="@id"/>
+ <xsl:variable name="innertype_available">
+  <xsl:for-each select="$InnerTypes">
+   <xsl:if test="key('typeid',$id)/*">
+    <xsl:text>yes</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
  <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')">
+  <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' or ((name(.)='REL' or name(.)='VAR' or name(.)='META' or name(.)='CONST' or name(.)='MUTCONSTRUCT') and $innertype_available='yes'))">
    <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>
@@ -518,12 +524,12 @@
   </xsl:when>
   <xsl:otherwise>
    <xsl:choose>
-   <xsl:when test="@sort='Prop' or $naturalLanguage='no'">
-    <xsl:apply-templates mode="pure" select="."/>
-   </xsl:when>
-   <xsl:otherwise>
-    <m:ci>.</m:ci>
-   </xsl:otherwise>
+    <xsl:when test="name()='REL' or name()='instantiate' or @sort='Prop' or $naturalLanguage='no'">
+     <xsl:apply-templates mode="pure" select="."/>
+    </xsl:when>
+    <xsl:otherwise>
+     <m:ci>.</m:ci>
+    </xsl:otherwise>
    </xsl:choose>
    <!-- <xsl:apply-templates mode="pure" select="."/> -->
    <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
@@ -551,27 +557,5 @@
  </xsl:choose>
 </xsl:template>
 
-<!-- <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">
-      <m:apply helm:xref="{@id}">
-       <m:csymbol>app</m:csymbol>
-       <xsl:apply-templates mode="pure" select="*[1]"/>
-       <m:ci>*</m:ci>
-       <m:ci>*</m:ci>
-       <m:ci>*</m:ci>
-       <xsl:apply-templates mode="flat" select="*[5]"/>
-      </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:stylesheet>