makeURL() and related variables and parameters moved to links_library.xsl

prop.* now passed on as param.*

diff --git a/helm/style/expandobj.xsl b/helm/style/expandobj.xsl
index 6f667ed79eb07a6e42ec0441a2bc7645ed06bb43..081c225ce99b45743c64afdf8989ff30cac4e328 100644 (file)
--- a/helm/style/expandobj.xsl
+++ b/helm/style/expandobj.xsl
@@ -34,23 +34,8 @@
 <!--******************************************************************-->
 <!-- Parameters containing the absolute path of the CIC file          -->
 <!--******************************************************************-->
-<xsl:param name="getterURL" select="'http://localhost:8081/'"/>
-<xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
-<!-- 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 
-step for expanding objects --> 
-<xsl:param name="thkeys" select="'TC1,HC2,L'"/>
-<xsl:param name="naturalLanguage" select="'yes'"/>
-<xsl:param name="annotations" select="'no'"/>
-<xsl:param name="media-type" select="'text/html'"/>
-<xsl:param name="doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
-<xsl:param name="encoding" select="iso-8859-1"/>
-
-<xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
-
-<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$thkeys"/>&#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;prop.doctype-public=<xsl:value-of select="$doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
 
+<xsl:import href="links_library.xsl"/>
 
 <xsl:output 
        method="xml"
@@ -59,20 +44,11 @@ step for expanding objects -->
        doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
        doctype-system="DTD/xhtml1-transitional.dtd" />
 
-<!-- Generates an url from an uri -->
-<!-- DUPLICATO in content_to_html!! -->
-
-<xsl:template name="makeURL">
-<xsl:param name="type" select="0"/>
-<xsl:param name="uri" select="''"/>
-  <xsl:value-of select="concat(string($header),string($uri),'&#x26;param.CICURI=',string($uri),'&#x26;param.type=',string($type))"/>
-</xsl:template>
-
 <!-- 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:call-template></xsl:variable>
+<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:copy>
     <xsl:copy-of select="@*"/>
 <!--<xsl:variable name="doc" select="document(string($url))"/>
@@ -82,7 +58,7 @@ step for expanding objects -->
 </xsl:template>
 
 <xsl:template match="AXIOM|DEFINITION|VARIABLE">
-<xsl:variable name="url"><xsl:call-template name="makeURL"><xsl:with-param name="type" select="0"/><xsl:with-param name="uri" select="@uri"/></xsl:call-template></xsl: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:copy>
     <xsl:copy-of select="@*"/>
     <xsl:copy-of select="document(string($url))"/>
@@ -92,7 +68,7 @@ step for expanding objects -->
 <!-- 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:call-template></xsl:variable>
+<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:template>
 
@@ -106,11 +82,3 @@ step for expanding objects -->
 </xsl:template>
 
 </xsl:stylesheet>
-
-
-
-
-
-
-
-

diff --git a/helm/style/link.xsl b/helm/style/link.xsl
index ad974012bc4fa09a51d48ab044b8ebcf84a9b6e4..3e3dc8c2009a00e54d0021a78d2033ec36af343b 100644 (file)
--- a/helm/style/link.xsl
+++ b/helm/style/link.xsl
@@ -34,23 +34,7 @@
 <!-- First draft: March 16 2001, Irene Schena                              -->
 <!--***********************************************************************--> 
 
-<xsl:param name="getterURL" select="'http://localhost:8081/'"/>
-<xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
-<xsl:param name="keys" select="'C1,HC2'"/>
-<xsl:param name="naturalLanguage" select="'yes'"/>
-<xsl:param name="annotations" select="'no'"/>
-<xsl:param name="media-type" select="'text/html'"/>
-<xsl:param name="doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
-<xsl:param name="encoding" select="iso-8859-1"/>
-
-<xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
-
-<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$keys"/>&#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;prop.doctype-public=<xsl:value-of select="$doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
-
-<xsl:template name="makeURL">
-<xsl:param name="uri" select="''"/>
-    <xsl:value-of select="concat(string($header),string($uri),'&#x26;param.CICURI=',string($uri))"/>
-</xsl:template>
+<xsl:import href="links_library.xsl"/>
 
 <xsl:template match="*[@xlink:href]">
  <xsl:copy>
@@ -83,4 +67,4 @@
   </xsl:copy>
 </xsl:template>
 
-</xsl:stylesheet> 
\ No newline at end of file
+</xsl:stylesheet> 

diff --git a/helm/style/links_library.xsl b/helm/style/links_library.xsl
new file mode 100644 (file)
index 0000000..d107c3d
--- /dev/null
+++ b/helm/style/links_library.xsl
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+
+<!-- Copyright (C) 2000, HELM Team                                     -->
+<!--                                                                   -->
+<!-- This file is part of HELM, an Hypertextual, Electronic            -->
+<!-- Library of Mathematics, developed at the Computer Science         -->
+<!-- Department, University of Bologna, Italy.                         -->
+<!--                                                                   -->
+<!-- HELM is free software; you can redistribute it and/or             -->
+<!-- modify it under the terms of the GNU General Public License       -->
+<!-- as published by the Free Software Foundation; either version 2    -->
+<!-- of the License, or (at your option) any later version.            -->
+<!--                                                                   -->
+<!-- HELM is distributed in the hope that it will be useful,           -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of    -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     -->
+<!-- GNU General Public License for more details.                      -->
+<!--                                                                   -->
+<!-- You should have received a copy of the GNU General Public License -->
+<!-- along with HELM; if not, write to the Free Software               -->
+<!-- Foundation, Inc., 59 Temple Place - Suite 330, Boston,            -->
+<!-- MA  02111-1307, USA.                                              -->
+<!--                                                                   -->
+<!-- For details, see the HELM World-Wide-Web page,                    -->
+<!-- http://cs.unibo.it/helm/.                                         -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                              xmlns:m="http://www.w3.org/1998/Math/MathML">
+
+<!--***********************************************************************--> 
+<!-- auxiliary functions                                                   -->
+<!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                      -->
+<!--***********************************************************************--> 
+
+<xsl:param name="getterURL" select="'http://localhost:8081/'"/>
+<xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
+<!-- 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 
+step for expanding objects --> 
+<xsl:param name="thkeys" select="'TC1,HC2,L'"/>
+<xsl:param name="naturalLanguage" select="'yes'"/>
+<xsl:param name="annotations" select="'no'"/>
+<xsl:param name="media-type" select="'text/html'"/>
+<xsl:param name="doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
+<xsl:param name="encoding" select="iso-8859-1"/>
+
+<xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
+
+<!-- quote() escapes white-spaces with %20 -->
+<xsl:template name="quote">
+ <xsl:param name="s" select="''"/>
+ <xsl:param name="news" select="''"/>
+ <xsl:choose>
+  <xsl:when test="$s = ''"><xsl:value-of select="$news"/></xsl:when>
+  <xsl:otherwise>
+   <xsl:variable name="char" select="substring($s,1,1)"/>
+   <xsl:choose>
+    <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,$char)"/>
+     </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:call-template name="quote">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,'%20')"/>
+     </xsl:call-template>
+    </xsl:otherwise>
+   </xsl:choose>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:variable name="escaped-doctype-public">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s" select="$doctype-public"/>
+ </xsl:call-template>
+</xsl:variable>
+
+<!-- makeURL() maps URIs into URLs -->
+
+<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="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
+
+<xsl:template name="makeURL">
+<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:template>
+
+</xsl:stylesheet> 

diff --git a/helm/style/params.xsl b/helm/style/params.xsl
index eebda7e8793fa0abed1e24043f9a5a45b5b7cc48..2a0a252e3bb3218beefee7596a09d9542fa48373 100644 (file)
--- a/helm/style/params.xsl
+++ b/helm/style/params.xsl
@@ -371,9 +371,3 @@
 </xsl:template>
 
 </xsl:stylesheet> 
-
-
-
-
-
-