xsl:import to cope with new xalan version

diff --git a/helm/style/objtheorycontent.xsl b/helm/style/objtheorycontent.xsl
index bc0292ff7fb7f8134846b7d201e5088744ec4b4b..62c88e078fe6d67b81fb0b8d9bcf19fb8d930dda 100644 (file)
--- a/helm/style/objtheorycontent.xsl
+++ b/helm/style/objtheorycontent.xsl
@@ -33,13 +33,13 @@
                               xmlns:m="http://www.w3.org/1998/Math/MathML"
                               xmlns:helm="http://www.cs.unibo.it/helm">
 
+<xsl:import href="objcontent.xsl"/>
+<xsl:include href="headercontent.xsl"/>
+
 <xsl:param name="type" select="'standalone'"/>
 <xsl:param name="getterURL" select="'http://localhost:8081/'"/>
 <xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
 
-<xsl:import href="objcontent.xsl"/>
-<xsl:include href="headercontent.xsl"/>
-
 <!-- CIC DEFINITION -->
 
 <xsl:template match="Definition">

diff --git a/helm/style/rootcontent.xsl b/helm/style/rootcontent.xsl
index 8f34bae075c00bfbbc734fc58c4aa4b59de8a453..140a3b57d331ff4aabe99447887363771cd2e522 100644 (file)
--- a/helm/style/rootcontent.xsl
+++ b/helm/style/rootcontent.xsl
@@ -43,6 +43,8 @@
 <!-- Variable containing the absolute path of the CIC file            -->
 <!--******************************************************************-->
 
+<xsl:import href="annotatedcont.xsl"/>
+
 <xsl:param name="getterURL" select="'http://localhost:8081/'"/>
 <xsl:param name="naturalLanguage" select="'yes'"/>
 <xsl:param name="annotations" select="'no'"/>
@@ -55,7 +57,6 @@
 <xsl:variable name="InnerTypes" select="document(concat($absPath,$CICURI,'.types'))"/>
 <xsl:variable name="CICAnnotations" select="document(concat($absPath,$CICURI,'.ann'))"/>
 
-<xsl:import href="annotatedcont.xsl"/>
 <xsl:include href="headercontent.xsl"/>
 <xsl:include href="proofs.xsl"/>
 <xsl:include href="inductive.xsl"/>