Performance improvements and bug fixed

[helm.git] / helm / style / proofs.xsl

diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 1f9c6c8f8f6ff0b88301672432d7e2bc2284f74a..781ae3e429746c8d3f6c2c3da28812a90043d44c 100644 (file)
--- 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>
@@ -157,7 +157,7 @@
  <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>