* patched wrong commit (perhaps...)

diff --git a/helm/style/rootcontent.xsl b/helm/style/rootcontent.xsl
index 64acead3600beb66bb1bebb8432deeafc28d96bd..addef615b34b344e6694704696f5aafa5d95e759 100644 (file)
--- a/helm/style/rootcontent.xsl
+++ b/helm/style/rootcontent.xsl
@@ -40,7 +40,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!--******************************************************************-->
-<!-- Variable containing the absolute path of the CIC file            -->
+<!-- Variablie containing the absolute path of the CIC file            -->
 <!--******************************************************************-->
 
 <xsl:import href="annotatedcont.xsl"/>
@@ -53,21 +53,42 @@
 <xsl:param name="annotations" select="'no'"/>
 <xsl:param name="CICURI" select="''"/>
 
-<xsl:variable name="InnerTypesUri"><xsl:value-of select="concat($CICURI,'.types')"/></xsl:variable>
-<xsl:variable name="AnnotationsUri"><xsl:value-of select="concat($CICURI,'.ann')"/></xsl:variable>
+<!-- CSC: Wrong: we assume that no '.body' can appear in the middle of the URI -->
+<xsl:variable name="BaseCICURI">
+ <xsl:variable name="res" select="substring-before($CICURI,'.body')"/>
+ <xsl:choose>
+  <xsl:when test="$res = ''">
+   <xsl:value-of select="$CICURI"/>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:value-of select="$res"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+
+<xsl:variable name="InnerTypesUri"><xsl:value-of select="concat($BaseCICURI,'.types')"/></xsl:variable>
+<!-- CSC: ?????????????????? -->
+<xsl:variable name="AnnotationsUri"><xsl:value-of select="concat($BaseCICURI,'.ann')"/></xsl:variable>
 
 <xsl:variable name="InnerTypesUrl"><xsl:call-template name="makeURL4InnerTypes"><xsl:with-param name="uri" select="$InnerTypesUri"/></xsl:call-template></xsl:variable>
+<xsl:variable name="ConstantTypeUrl"><xsl:call-template name="makeURL4InnerTypes"><xsl:with-param name="uri" select="$BaseCICURI"/></xsl:call-template></xsl:variable>
 <xsl:variable name="AnnotationsUrl"><xsl:call-template name="URLofURI4getter"><xsl:with-param name="uri" select="$AnnotationsUri"/></xsl:call-template></xsl:variable>
 
+
 <!-- WARNING: Using lazy evaluation: $CICURI.* may not exist, but -->
 <!-- document() is called only by need!!!                         -->
-<xsl:variable name="InnerTypes" select="document($InnerTypesUrl)"/> 
+<xsl:variable name="InnerTypes" select="document($InnerTypesUrl)"/>
 <xsl:variable name="CICAnnotations" select="document($AnnotationsUrl)"/> 
 
 <xsl:include href="headercontent.xsl"/>
 <xsl:include href="proofs.xsl"/>
-<xsl:include href="inductive.xsl"/>
-
 <xsl:variable name="showproof" select="0"/>
-
 </xsl:stylesheet>
+
+
+
+
+
+
+
+