X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fproofs.xsl;h=081711c5311ab6b63c445dbe5537ef1982104ea5;hb=138e51f3dc9bd6a42b84e45f9bf2c681cd411393;hp=781ae3e429746c8d3f6c2c3da28812a90043d44c;hpb=8dd44f97c9c97ae32bc91288a9d08c00ef63c965;p=helm.git

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 781ae3e42..081711c53 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -1,5 +1,29 @@
 <?xml version="1.0"?>
 
+<!-- Copyright (C) 2000, HELM Team                                     -->
+<!--                                                                   -->
+<!-- This file is part of HELM, an Hypertextual, Electronic            -->
+<!-- Library of Mathematics, developed at the Computer Science         -->
+<!-- Department, University of Bologna, Italy.                         -->
+<!--                                                                   -->
+<!-- HELM is free software; you can redistribute it and/or             -->
+<!-- modify it under the terms of the GNU General Public License       -->
+<!-- as published by the Free Software Foundation; either version 2    -->
+<!-- of the License, or (at your option) any later version.            -->
+<!--                                                                   -->
+<!-- HELM is distributed in the hope that it will be useful,           -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of    -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     -->
+<!-- GNU General Public License for more details.                      -->
+<!--                                                                   -->
+<!-- You should have received a copy of the GNU General Public License -->
+<!-- along with HELM; if not, write to the Free Software               -->
+<!-- Foundation, Inc., 59 Temple Place - Suite 330, Boston,            -->
+<!-- MA  02111-1307, USA.                                              -->
+<!--                                                                   -->
+<!-- For details, see the HELM World-Wide-Web page,                    -->
+<!-- http://cs.unibo.it/helm/.                                         -->
+
 <!--******************************************************************--> 
 <!-- Basic Logic                                                      -->
 <!-- First draft: April 3 2000                                        -->
@@ -23,7 +47,7 @@
 <!-- <xsl:key name="typeid" use="@of" match="TYPE"/> -->
 
 <!-- ALL this elements does not have inner type -->
-<xsl:template match="PROD|REL|SORT|VAR|META|CONST|MUTIND|MUTCONSTRUCT" mode="noannot">
+<xsl:template match="LETIN|PROD|REL|SORT|VAR|META|CONST|MUTIND|MUTCONSTRUCT" mode="noannot">
 <xsl:apply-templates select="." mode="pure"/>
 </xsl:template>
 
@@ -63,7 +87,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]"/>
@@ -73,10 +97,13 @@
       <xsl:apply-templates mode="thread" select="*[5]"/>
      </m:apply>
     </xsl:when>
-    <!-- aggiungere la verifica dell'esistenza dei lambda per and_ind -->
+    <!-- gestire meglio il caso di and_ind quando la prova 
+         non e' della forma \x.\y.M -->
     <xsl:when test="name()= 'APPLY' and CONST[
  attribute::uri='cic:/Coq/Init/Logic/Conjunction/and_ind.con'] 
- and count(child::*) = 6">
+ 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]"/>
@@ -93,20 +120,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 +142,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 +150,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 +167,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]"/>
@@ -150,7 +179,10 @@
 <!--**** 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
+ 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)">
@@ -161,12 +193,13 @@
        <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 +220,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>