X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fproofs.xsl;h=426e161290e850fb092c82244669671f1dddf68f;hb=ba0819c205b42e46b22ed531f0b14b2102035d58;hp=1f9c6c8f8f6ff0b88301672432d7e2bc2284f74a;hpb=b1d307740c341a6655181214983c83f4ae00e0ba;p=helm.git

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 1f9c6c8f8..426e16129 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -31,7 +31,7 @@
 <xsl:template match="LAMBDA" mode="noannot">
  <xsl:variable name="id" select="@id"/>
  <xsl:choose>
-  <xsl:when test="@sort='Prop' and name(../..) != 'LAMBDA'">
+  <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>
@@ -46,7 +46,7 @@
  <xsl:choose>
   <!-- <xsl:when test="//InnerTypes and key('typeid',@id)"> -->
   <!-- <xsl:when test="//InnerTypes/TYPE[@of=$id]"> -->
-  <xsl:when test="@sort='Prop'">
+  <xsl:when test="//InnerTypes and @sort='Prop'">
    <xsl:call-template name="has_inner_type"/>
   </xsl:when>
   <xsl:otherwise>
@@ -63,7 +63,7 @@
  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]"/>
+      <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]"/>
@@ -93,20 +93,21 @@
      <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="//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">
+    <!-- <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">
      <m:apply helm:xref="{@id}">
       <m:csymbol>thread</m:csymbol>
-      <xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$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 = //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>
@@ -114,7 +115,7 @@
       <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"/>
+      <xsl:apply-templates select="//InnerTypes/TYPE[@of=$id]/*" mode="pure"/>
      </m:apply>
     </xsl:otherwise>
    </xsl:choose>
@@ -122,7 +123,8 @@
 
 <xsl:template match="*" mode="copy-of-no-prop">
  <xsl:choose>
-  <xsl:when test="@id = //InnerTypes/TYPE/@of">
+  <!-- <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')">
    <m:ci>previous</m:ci>
   </xsl:when>
   <xsl:otherwise>
@@ -138,7 +140,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="//InnerTypes/TYPE[@of=$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]"/>
@@ -157,16 +159,17 @@
  <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: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]"/>
+        <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="*[@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>
@@ -187,8 +190,12 @@
       <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>