X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fstyle%2Fexpandobj.xsl;h=ee53cf2de0cb28876dd6f4f0e726abf66c30fea3;hb=5868bef6637af919fbb48a83c24268bb85bdef6a;hp=081c225ce99b45743c64afdf8989ff30cac4e328;hpb=4947a59dbc917f8db8e5cb074418b6197c3960db;p=helm.git

diff --git a/helm/style/expandobj.xsl b/helm/style/expandobj.xsl
index 081c225ce..ee53cf2de 100644
--- a/helm/style/expandobj.xsl
+++ b/helm/style/expandobj.xsl
@@ -29,7 +29,8 @@
 <!-- First draft: March 08 2001, Irene Schena                              -->
 <!--***********************************************************************--> 
 
-<xsl:stylesheet version="0.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="0.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                              xmlns:ht="http://www.cs.unibo.it/helm/namespaces/helm-theory">
 
 <!--******************************************************************-->
 <!-- Parameters containing the absolute path of the CIC file          -->
@@ -47,18 +48,17 @@
 <!-- THEORY CONTENT ELEMENTS -->
 <!-- document cannot return HTML, transforming it into XML!!! -->
 
-<xsl:template match="THEOREM|LEMMA|COROLLARY|FACT">
-<xsl:variable name="url"><xsl:call-template name="makeURL"><xsl:with-param name="type" select="1"/><xsl:with-param name="uri" select="@uri"/><xsl:with-param name="theory" select="'yes'"/></xsl:call-template></xsl:variable>
+<xsl:template match="ht:THEOREM">
+<xsl:variable name="url"><xsl:call-template name="makeURL4embedding"><xsl:with-param name="type" select="'typeonly'"/><xsl:with-param name="uri" select="@uri"/></xsl:call-template></xsl:variable>
    <xsl:copy>
     <xsl:copy-of select="@*"/>
-<!--<xsl:variable name="doc" select="document(string($url))"/>
-<xsl:value-of select="$doc"/>-->
     <xsl:copy-of select="document(string($url))"/>
+    <xsl:value-of select="$url"/>
    </xsl:copy>
 </xsl:template>
 
-<xsl:template match="AXIOM|DEFINITION|VARIABLE">
-<xsl:param name="type" select="0"/><xsl:variable name="url"><xsl:call-template name="makeURL"><xsl:with-param name="type" select="0"/><xsl:with-param name="uri" select="@uri"/><xsl:with-param name="theory" select="'yes'"/></xsl:call-template></xsl:variable>
+<xsl:template match="ht:AXIOM|ht:DEFINITION|ht:VARIABLE">
+<xsl:variable name="url"><xsl:call-template name="makeURL4embedding"><xsl:with-param name="type" select="'embed'"/><xsl:with-param name="uri" select="@uri"/></xsl:call-template></xsl:variable>
    <xsl:copy>
     <xsl:copy-of select="@*"/>
     <xsl:copy-of select="document(string($url))"/>
@@ -68,8 +68,9 @@
 <!-- THEORY PRESENTATION ELEMENTS -->
 
 <xsl:template match="ENTITY">
-<xsl:variable name="url"><xsl:call-template name="makeURL"><xsl:with-param name="type" select="@type"/><xsl:with-param name="uri" select="@uri"/><xsl:with-param name="theory" select="'yes'"/></xsl:call-template></xsl:variable>
-  <xsl:copy-of select="document(string($url))"/>
+<xsl:variable name="url"><xsl:call-template name="makeURL4embedding"><xsl:with-param name="type" select="@type"/><xsl:with-param name="uri" select="@uri"/></xsl:call-template></xsl:variable>
+  <xsl:variable name="doc_to_embed" select="document(string($url))/to_be_embedded"/>
+  <xsl:copy-of select="$doc_to_embed/*|$doc_to_embed/text()"/>
 </xsl:template>
 
 <!-- CONTENT AND PRESENTATION THEORY AND SUBTHEORY -->