Big bug: & was not quoted in the URL for xmluri (that actually always had

one)

diff --git a/helm/style/links_library.xsl b/helm/style/links_library.xsl
index 5a6a1ba4fb1897c524ab488be93f4bf1d98a5723..825a06ee058abe5396b397b44f2222aafaca0d17 100644 (file)
--- a/helm/style/links_library.xsl
+++ b/helm/style/links_library.xsl
@@ -45,9 +45,6 @@ step for expanding objects -->
 <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="''"/>
@@ -68,6 +65,12 @@ step for expanding objects -->
       <xsl:with-param name="news" select="concat($news,'%26')"/>
      </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,'%3F')"/>
+     </xsl:call-template>
+    </xsl:when>
     <xsl:otherwise>
      <xsl:call-template name="quote">
       <xsl:with-param name="s" select="substring($s,2)"/>
@@ -79,6 +82,12 @@ step for expanding objects -->
  </xsl:choose>
 </xsl:template>
 
+<xsl:variable name="absPath">
+ <xsl:call-template name="quote">
+  <xsl:with-param name="s"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:with-param>
+ </xsl:call-template>
+</xsl:variable>
+
 <xsl:variable name="escaped-doctype-public">
  <xsl:call-template name="quote">
   <xsl:with-param name="s" select="$doctype-public"/>