Control frame added to CIC window

diff --git a/helm/style/expandobj.xsl b/helm/style/expandobj.xsl
index 081c225ce99b45743c64afdf8989ff30cac4e328..a16176be5c05c2a44dbfe298a6925263ce9c280f 100644 (file)
--- a/helm/style/expandobj.xsl
+++ b/helm/style/expandobj.xsl
@@ -48,7 +48,7 @@
 <!-- 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:variable name="url"><xsl:call-template name="makeTheoryURL"><xsl:with-param name="type" select="1"/><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))"/>
@@ -58,7 +58,7 @@
 </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:param name="type" select="0"/><xsl:variable name="url"><xsl:call-template name="makeTheoryURL"><xsl:with-param name="type" select="0"/><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,7 +68,7 @@
 <!-- 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:variable name="url"><xsl:call-template name="makeTheoryURL"><xsl:with-param name="type" select="@type"/><xsl:with-param name="uri" select="@uri"/></xsl:call-template></xsl:variable>
   <xsl:copy-of select="document(string($url))"/>
 </xsl:template>
 

diff --git a/helm/style/html_reals.xsl b/helm/style/html_reals.xsl
index 3403b9dcb8c537e752d448116b87d3b35cd92142..9d49b1305edfa2287b4d9fdacf1b7515b4e29573 100644 (file)
--- a/helm/style/html_reals.xsl
+++ b/helm/style/html_reals.xsl
@@ -326,10 +326,3 @@
 </xsl:template> 
 
 </xsl:stylesheet> 
-
-
-
-
-
-
-

diff --git a/helm/style/link.xsl b/helm/style/link.xsl
index 3e3dc8c2009a00e54d0021a78d2033ec36af343b..d5af006e1d72e3b2dc5ada821b1639d0c9fb5964 100644 (file)
--- a/helm/style/link.xsl
+++ b/helm/style/link.xsl
@@ -44,10 +44,17 @@
       <xsl:with-param name="uri" select="@xlink:href"/>
      </xsl:call-template>
     </xsl:attribute>
+    <xsl:attribute name="xlink:show">other</xsl:attribute>
+    <!-- xlink:show='other' requires the exact modality to be -->
+    <!-- specified in non-xlink markup. The point is that the -->
+    <!-- element is already MathML ==> we can't add other     -->
+    <!-- markup without introducing another new namespace.    -->
+    <!-- So, for now no markup is used.                       -->
     <xsl:apply-templates/>
  </xsl:copy>
 </xsl:template>
 
+<!-- _top to refresh the whole frameset (avoids the matrioska effect ;-) -->
 <xsl:template match="a[@href]">
    <xsl:copy>
     <xsl:copy-of select="@*"/> 
@@ -56,6 +63,7 @@
       <xsl:with-param name="uri" select="@href"/>
      </xsl:call-template>
     </xsl:attribute>
+    <xsl:attribute name="target">cic</xsl:attribute>
     <xsl:apply-templates/>
    </xsl:copy>
 </xsl:template>

diff --git a/helm/style/links_library.xsl b/helm/style/links_library.xsl
index 825a06ee058abe5396b397b44f2222aafaca0d17..7befa7bac8ec33218a8966e561e40e458e908938 100644 (file)
--- a/helm/style/links_library.xsl
+++ b/helm/style/links_library.xsl
@@ -34,6 +34,7 @@
 
 <xsl:param name="getterURL" select="'http://localhost:8081/'"/>
 <xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
+<xsl:param name="interfaceURL" select="''"/>
 <!-- Keys contains the keys of the stylesheets to be applied following links-->
 <xsl:param name="keys" select="'C1,HC2,L'"/>
 <!-- Thkeys contains the keys of the stylesheets to be applied at the first 
@@ -71,6 +72,24 @@ step for expanding objects -->
       <xsl:with-param name="news" select="concat($news,'%3F')"/>
      </xsl:call-template>
     </xsl:when>
+    <xsl:when test="$char = '='">
+     <xsl:call-template name="quote">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,'%3D')"/>
+     </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$char = '%'">
+     <xsl:call-template name="quote">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,'%25')"/>
+     </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$char = ','">
+     <xsl:call-template name="quote">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,'%2C')"/>
+     </xsl:call-template>
+    </xsl:when>
     <xsl:otherwise>
      <xsl:call-template name="quote">
       <xsl:with-param name="s" select="substring($s,2)"/>
@@ -106,22 +125,75 @@ step for expanding objects -->
  </xsl:call-template>
 </xsl:variable>
 
-<!-- makeURL() maps URIs into URLs -->
+<xsl:variable name="escaped-interfaceURL">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$interfaceURL"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="quotedthkeys">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$thkeys"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="quotedquotedthkeys">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$quotedkeys"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="quotedkeys">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$keys"/>
+ </xsl:call-template>
+</xsl:variable>
 
-<xsl:variable name="header1"><xsl:value-of select="$processorURL"/>apply?keys=</xsl:variable>
-<xsl:variable name="header2">&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;prop.media-type=<xsl:value-of select="$media-type"/>&#x26;param.media-type=<xsl:value-of select="$media-type"/>&#x26;prop.doctype-public=<xsl:value-of select="$escaped-doctype-public"/>&#x26;param.doctype-public=<xsl:value-of select="$escaped-doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$escaped-getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$escaped-processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
+<xsl:variable name="header0"><xsl:value-of select="$interfaceURL"/>?url=</xsl:variable>
+<xsl:variable name="header1"><xsl:value-of select="$escaped-processorURL"/>apply?keys=</xsl:variable>
+<xsl:variable name="header2">&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;prop.media-type=<xsl:value-of select="$media-type"/>&#x26;param.media-type=<xsl:value-of select="$media-type"/>&#x26;prop.doctype-public=<xsl:value-of select="$escaped-doctype-public"/>&#x26;param.doctype-public=<xsl:value-of select="$escaped-doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$quotedkeys"/>&#x26;param.getterURL=<xsl:value-of select="$escaped-getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$escaped-processorURL"/>&#x26;param.interfaceURL=<xsl:value-of select="$escaped-interfaceURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
 
+<xsl:variable name="quotedheader1">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$header1"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="quotedheader2">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$header2"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<!-- makeURL() maps URIs into URLs               -->
+<!-- The target of the URL is the whole frameset -->
+
+<xsl:variable name="biquotedfixedheader">
+ <xsl:value-of select="$header0"/>
+ <xsl:value-of select="$quotedheader1"/>
+ <xsl:value-of select="$quotedquotedthkeys"/>
+ <xsl:value-of select="$quotedheader2"/>
+</xsl:variable>
+
+<!-- NOTE: thkeys are propagated, but we are sure (for now!!!) that -->
+<!-- they won't never be used.                                      -->
+<!-- type, instead, is not propagated                               -->
 <xsl:template name="makeURL">
+<xsl:param name="uri" select="''"/>
+    <xsl:value-of select="$biquotedfixedheader"/>
+    <xsl:value-of select="$uri"/>%26param.CICURI%3D<xsl:value-of select="$uri"/>
+</xsl:template>
+
+<!-- makeTheoryURL() maps URIs into URLs                  -->
+<!-- The target of the URL is only the processed document -->
+
+<xsl:template name="makeTheoryURL">
 <xsl:param name="uri" select="''"/>
 <xsl:param name="type" select="0"/>
-<xsl:param name="theory" select="'no'"/>
- <xsl:variable name="mythkeys">
-  <xsl:choose>
-   <xsl:when test="$theory = 'yes'"><xsl:value-of select="$thkeys"/></xsl:when>
-   <xsl:otherwise><xsl:value-of select="$keys"/></xsl:otherwise>
-  </xsl:choose>
- </xsl:variable>
-    <xsl:value-of select="concat(string($header1),string($mythkeys),string($header2),string($uri),'&#x26;param.CICURI=',string($uri),'&#x26;param.type=',string($type))"/>
+ <xsl:value-of select="$header1"/>
+ <xsl:value-of select="$quotedthkeys"/>
+ <xsl:value-of select="$header2"/>
+ <xsl:value-of select="$uri"/>&#x26;param.CICURI=<xsl:value-of select="$uri"/>&#x26;param.type=<xsl:value-of select="$type"/>
 </xsl:template>
 
 </xsl:stylesheet>