[xml/sgml-commit] r884 - in /packages/docbook-xsl/trunk/debian: ./ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon Sep 17 12:01:29 UTC 2007
Author: dleidert-guest
Date: Mon Sep 17 12:01:28 2007
New Revision: 884
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=884
Log:
* debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch: Added.
- (x)html/chunk-common.xsl, (x)html/titlepage.xsl: Fix the filename
creation for legalnotice and revhistory output (fixes broken links).
Fixes SF.net bug 1790495.
* debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch: Added.
- fo/autoidx.xsl (reference): Removed the [&scope;] predicate from the
target variable, that caused missing index backlinks when @zone and
@type were used on indexterms with index.on.type=1. Fixes SF.net bug
1680836.
- (x)html/autoidx.xsl (reference): Ditto.
* debian/patches/12_7440_fo_normalize_space.dpatch: Added.
- fo/inline.xsl (glossterm): Use normalize-space() in glossterm
comparisons.
Added:
packages/docbook-xsl/trunk/debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch
- copied, changed from r879, packages/docbook-xsl/trunk/debian/patches/10_html_fix_legalnotice_filename_creation.dpatch
packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch (with props)
Removed:
packages/docbook-xsl/trunk/debian/patches/10_html_fix_legalnotice_filename_creation.dpatch
Modified:
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/patches/00list
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon Sep 17 12:01:28 2007
@@ -3,11 +3,19 @@
* NOT RELEASED YET
[ Daniel Leidert ]
- * debian/patches/10_html_fix_legalnotice_filename_creation.dpatch: Added.
- - html/titlepage.xsl (legalnotice[titlepage.mode]): Fix the filename
- creation part of this template to avoid broken links to legalnotice
- sites. Fixes SF.net #1790495.
- - xhtml/titlepage.xsl (legalnotice[titlepage.mode]): Ditto.
+ * debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch: Added.
+ - (x)html/chunk-common.xsl, (x)html/titlepage.xsl: Fix the filename
+ creation for legalnotice and revhistory output (fixes broken links).
+ Fixes SF.net bug 1790495.
+ * debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch: Added.
+ - fo/autoidx.xsl (reference): Removed the [&scope;] predicate from the
+ target variable, that caused missing index backlinks when @zone and
+ @type were used on indexterms with index.on.type=1. Fixes SF.net bug
+ 1680836.
+ - (x)html/autoidx.xsl (reference): Ditto.
+ * debian/patches/12_7440_fo_normalize_space.dpatch: Added.
+ - fo/inline.xsl (glossterm): Use normalize-space() in glossterm
+ comparisons.
* debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Fri, 31 Aug 2007 00:52:41 +0200
Modified: packages/docbook-xsl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/00list?rev=884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Mon Sep 17 12:01:28 2007
@@ -1,2 +1,4 @@
02_use_global_papersize_conf
10_html_fix_legalnotice_filename_creation
+11_7436_html_fo_fix_empty_index_entries
+12_7440_fo_normalize_space
Copied: packages/docbook-xsl/trunk/debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch (from r879, packages/docbook-xsl/trunk/debian/patches/10_html_fix_legalnotice_filename_creation.dpatch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch?rev=884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/10_html_fix_legalnotice_filename_creation.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/10_7441_html_fix_legalnotice_filename_creation.dpatch Mon Sep 17 12:01:28 2007
@@ -2,39 +2,312 @@
## 10_html_fix_legalnotice_filename_creation.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for sf.net nug #1790495:
+## DP: Upstream fix for sf.net bug #1790495 from revision 7441 (Mauritz Jeanson):
## DP: The created link for chunked legalnotice sites is prefixed with "ln-"
## DP: but the filename is not, because of a flaw in the legalnotice
## DP: template in titlepage.mode mode.
## DP:
## DP: <URL:http://sourceforge.net/tracker/index.php?func=detail&aid=1790495&group_id=21935&atid=373747>
+## DP: <URL:http://svn.sourceforge.net/docbook/?rev=7441&view=rev>
@DPATCH@
+diff -urNad trunk~/html/chunk-common.xsl trunk/html/chunk-common.xsl
+--- trunk~/html/chunk-common.xsl 2007-07-19 09:17:43.000000000 +0200
++++ trunk/html/chunk-common.xsl 2007-09-17 13:22:15.000000000 +0200
+@@ -1733,11 +1733,9 @@
+ <!-- * the following ID is used as part of the legalnotice filename; -->
+ <!-- * we need it in order to construct the filename for use in the -->
+ <!-- * value of the href attribute on the link -->
+- <xsl:param name="id">
+- <xsl:call-template name="object.id">
+- <xsl:with-param name="object" select="(//legalnotice)[1]"/>
+- </xsl:call-template>
+- </xsl:param>
++
++ <xsl:param name="ln-node" select="(//legalnotice)[1]"/>
++
+ <xsl:param name="linktype">
+ <xsl:choose>
+ <xsl:when test="contains($html.head.legalnotice.link.types, ' ')">
+@@ -1756,9 +1754,17 @@
+ normalize-space(
+ substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
+ <xsl:if test="not($linktype = '')">
++
++ <!-- Compute name of legalnotice file (see titlepage.xsl) -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename">
++ <xsl:with-param name="node" select="$ln-node"/>
++ </xsl:call-template>
++ </xsl:variable>
++
+ <link rel="{$linktype}">
+ <xsl:attribute name="href">
+- <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
++ <xsl:value-of select="$file"/>
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:apply-templates select="(//legalnotice)[1]"
diff -urNad trunk~/html/titlepage.xsl trunk/html/titlepage.xsl
--- trunk~/html/titlepage.xsl 2007-08-19 02:00:08.000000000 +0200
-+++ trunk/html/titlepage.xsl 2007-09-08 02:55:05.000000000 +0200
-@@ -533,7 +533,9 @@
++++ trunk/html/titlepage.xsl 2007-09-17 13:22:15.000000000 +0200
+@@ -528,12 +528,19 @@
+
+ <xsl:template match="legalnotice" mode="titlepage.mode">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
++
+ <xsl:choose>
+ <xsl:when test="$generate.legalnotice.link != 0">
++
++ <!-- Compute name of legalnotice file -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename"/>
++ </xsl:variable>
++
<xsl:variable name="filename">
<xsl:call-template name="make-relative-filename">
<xsl:with-param name="base.dir" select="$base.dir"/>
- <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-+ <xsl:with-param name="base.name">
-+ <xsl:apply-templates mode="chunk-filename" select="."/>
-+ </xsl:with-param>
++ <xsl:with-param name="base.name" select="$file"/>
</xsl:call-template>
</xsl:variable>
+@@ -541,11 +548,7 @@
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+- <xsl:variable name="href">
+- <xsl:apply-templates mode="chunk-filename" select="."/>
+- </xsl:variable>
+-
+- <a href="{$href}">
++ <a href="{$file}">
+ <xsl:copy-of select="$title"/>
+ </a>
+
+@@ -777,14 +780,22 @@
+
+ <xsl:choose>
+ <xsl:when test="$generate.revhistory.link != 0">
++
++ <!-- Compute name of revhistory file -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename">
++ <xsl:with-param name="is.ln" select="false()"/>
++ </xsl:call-template>
++ </xsl:variable>
++
+ <xsl:variable name="filename">
+ <xsl:call-template name="make-relative-filename">
+ <xsl:with-param name="base.dir" select="$base.dir"/>
+- <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
++ <xsl:with-param name="base.name" select="$file"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+- <a href="{concat($id,$html.ext)}">
++ <a href="{$file}">
+ <xsl:copy-of select="$title"/>
+ </a>
+
+@@ -971,6 +982,50 @@
+ </span>
+ </xsl:template>
+
++<!-- This template computes the filename for legalnotice and revhistory chunks -->
++<xsl:template name="ln.or.rh.filename">
++ <xsl:param name="node" select="."/>
++ <xsl:param name="is.ln" select="true()"/>
++
++ <xsl:variable name="dbhtml-filename">
++ <xsl:call-template name="pi.dbhtml_filename">
++ <xsl:with-param name="node" select="$node"/>
++ </xsl:call-template>
++ </xsl:variable>
++
++ <xsl:choose>
++ <!-- 1. If there is a dbhtml_filename PI, use that -->
++ <xsl:when test="$dbhtml-filename != ''">
++ <xsl:value-of select="$dbhtml-filename"/>
++ </xsl:when>
++ <xsl:when test="($node/@id or $node/@xml:id) and not($use.id.as.filename = 0)">
++ <!-- * 2. If this legalnotice/revhistory has an ID, then go ahead and use -->
++ <!-- * just the value of that ID as the basename for the file -->
++ <!-- * (that is, without prepending an "ln-" or "rh-" to it) -->
++ <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
++ <xsl:value-of select="$html.ext"/>
++ </xsl:when>
++ <xsl:when test="not ($node/@id or $node/@xml:id) or $use.id.as.filename = 0">
++ <!-- * 3. Otherwise, if this legalnotice/revhistory does not have an ID, or -->
++ <!-- * if $use.id.as.filename = 0 -->
++ <!-- * then we generate an ID... -->
++ <xsl:variable name="id">
++ <xsl:value-of select="generate-id($node)"/>
++ </xsl:variable>
++ <!-- * ...and then we take that generated ID, prepend a -->
++ <!-- * prefix to it, and use that as the basename for the file -->
++ <xsl:choose>
++ <xsl:when test="$is.ln">
++ <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:value-of select="concat('rh-',$id,$html.ext)"/>
++ </xsl:otherwise>
++ </xsl:choose>
++ </xsl:when>
++ </xsl:choose>
++</xsl:template>
++
+ <!-- ==================================================================== -->
+
+ </xsl:stylesheet>
+diff -urNad trunk~/xhtml/chunk-common.xsl trunk/xhtml/chunk-common.xsl
+--- trunk~/xhtml/chunk-common.xsl 2007-08-30 15:43:21.000000000 +0200
++++ trunk/xhtml/chunk-common.xsl 2007-09-17 13:22:15.000000000 +0200
+@@ -1409,11 +1409,9 @@
+ <!-- * the following ID is used as part of the legalnotice filename; -->
+ <!-- * we need it in order to construct the filename for use in the -->
+ <!-- * value of the href attribute on the link -->
+- <xsl:param name="id">
+- <xsl:call-template name="object.id">
+- <xsl:with-param name="object" select="(//legalnotice)[1]"/>
+- </xsl:call-template>
+- </xsl:param>
++
++ <xsl:param name="ln-node" select="(//legalnotice)[1]"/>
++
+ <xsl:param name="linktype">
+ <xsl:choose>
+ <xsl:when test="contains($html.head.legalnotice.link.types, ' ')">
+@@ -1426,9 +1424,17 @@
+ </xsl:param>
+ <xsl:param name="remaining.linktypes" select="concat( normalize-space( substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
+ <xsl:if test="not($linktype = '')">
++
++ <!-- Compute name of legalnotice file (see titlepage.xsl) -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename">
++ <xsl:with-param name="node" select="$ln-node"/>
++ </xsl:call-template>
++ </xsl:variable>
++
+ <link rel="{$linktype}">
+ <xsl:attribute name="href">
+- <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
++ <xsl:value-of select="$file"/>
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:apply-templates select="(//legalnotice)[1]" mode="object.title.markup.textonly"/>
diff -urNad trunk~/xhtml/titlepage.xsl trunk/xhtml/titlepage.xsl
--- trunk~/xhtml/titlepage.xsl 2007-08-30 15:43:26.000000000 +0200
-+++ trunk/xhtml/titlepage.xsl 2007-09-08 02:55:46.000000000 +0200
-@@ -516,7 +516,9 @@
++++ trunk/xhtml/titlepage.xsl 2007-09-17 13:22:15.000000000 +0200
+@@ -511,12 +511,19 @@
+
+ <xsl:template match="legalnotice" mode="titlepage.mode">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
++
+ <xsl:choose>
+ <xsl:when test="$generate.legalnotice.link != 0">
++
++ <!-- Compute name of legalnotice file -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename"/>
++ </xsl:variable>
++
<xsl:variable name="filename">
<xsl:call-template name="make-relative-filename">
<xsl:with-param name="base.dir" select="$base.dir"/>
- <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-+ <xsl:with-param name="base.name">
-+ <xsl:apply-templates mode="chunk-filename" select="."/>
-+ </xsl:with-param>
++ <xsl:with-param name="base.name" select="$file"/>
</xsl:call-template>
</xsl:variable>
+@@ -524,11 +531,7 @@
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+- <xsl:variable name="href">
+- <xsl:apply-templates mode="chunk-filename" select="."/>
+- </xsl:variable>
+-
+- <a href="{$href}">
++ <a href="{$file}">
+ <xsl:copy-of select="$title"/>
+ </a>
+
+@@ -760,14 +763,22 @@
+
+ <xsl:choose>
+ <xsl:when test="$generate.revhistory.link != 0">
++
++ <!-- Compute name of revhistory file -->
++ <xsl:variable name="file">
++ <xsl:call-template name="ln.or.rh.filename">
++ <xsl:with-param name="is.ln" select="false()"/>
++ </xsl:call-template>
++ </xsl:variable>
++
+ <xsl:variable name="filename">
+ <xsl:call-template name="make-relative-filename">
+ <xsl:with-param name="base.dir" select="$base.dir"/>
+- <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
++ <xsl:with-param name="base.name" select="$file"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+- <a href="{concat($id,$html.ext)}">
++ <a href="{$file}">
+ <xsl:copy-of select="$title"/>
+ </a>
+
+@@ -955,6 +966,50 @@
+ </span>
+ </xsl:template>
+
++<!-- This template computes the filename for legalnotice and revhistory chunks -->
++<xsl:template name="ln.or.rh.filename">
++ <xsl:param name="node" select="."/>
++ <xsl:param name="is.ln" select="true()"/>
++
++ <xsl:variable name="dbhtml-filename">
++ <xsl:call-template name="pi.dbhtml_filename">
++ <xsl:with-param name="node" select="$node"/>
++ </xsl:call-template>
++ </xsl:variable>
++
++ <xsl:choose>
++ <!-- 1. If there is a dbhtml_filename PI, use that -->
++ <xsl:when test="$dbhtml-filename != ''">
++ <xsl:value-of select="$dbhtml-filename"/>
++ </xsl:when>
++ <xsl:when test="($node/@id or $node/@xml:id) and not($use.id.as.filename = 0)">
++ <!-- * 2. If this legalnotice/revhistory has an ID, then go ahead and use -->
++ <!-- * just the value of that ID as the basename for the file -->
++ <!-- * (that is, without prepending an "ln-" or "rh-" to it) -->
++ <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
++ <xsl:value-of select="$html.ext"/>
++ </xsl:when>
++ <xsl:when test="not ($node/@id or $node/@xml:id) or $use.id.as.filename = 0">
++ <!-- * 3. Otherwise, if this legalnotice/revhistory does not have an ID, or -->
++ <!-- * if $use.id.as.filename = 0 -->
++ <!-- * then we generate an ID... -->
++ <xsl:variable name="id">
++ <xsl:value-of select="generate-id($node)"/>
++ </xsl:variable>
++ <!-- * ...and then we take that generated ID, prepend a -->
++ <!-- * prefix to it, and use that as the basename for the file -->
++ <xsl:choose>
++ <xsl:when test="$is.ln">
++ <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:value-of select="concat('rh-',$id,$html.ext)"/>
++ </xsl:otherwise>
++ </xsl:choose>
++ </xsl:when>
++ </xsl:choose>
++</xsl:template>
++
+ <!-- ==================================================================== -->
+
+ </xsl:stylesheet>
Added: packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch?rev=884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch Mon Sep 17 12:01:28 2007
@@ -1,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_7436_html_fo_fix_empty_index_entries.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix from revision 7436 (Mauritz Jeanson):
+## DP: Removed the [&scope;] predicate from the target variable in the
+## DP: template with name="reference". This filter was the cause of missing
+## DP: index backlinks when @zone and @type were used on indexterms,
+## DP: with index.on.type=1. Closes sf.net bug #1680836.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7436&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/fo/autoidx.xsl trunk/fo/autoidx.xsl
+--- trunk~/fo/autoidx.xsl 2007-06-29 01:23:31.000000000 +0200
++++ trunk/fo/autoidx.xsl 2007-09-17 13:35:55.000000000 +0200
+@@ -700,7 +700,7 @@
+ <xsl:choose>
+ <xsl:when test="contains($zones, ' ')">
+ <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
+- <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
++ <xsl:variable name="target" select="key('id', $zone)"/>
+
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id">
+@@ -725,7 +725,7 @@
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="zone" select="$zones"/>
+- <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
++ <xsl:variable name="target" select="key('id', $zone)"/>
+
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id">
+diff -urNad trunk~/html/autoidx.xsl trunk/html/autoidx.xsl
+--- trunk~/html/autoidx.xsl 2007-06-29 01:23:31.000000000 +0200
++++ trunk/html/autoidx.xsl 2007-09-17 13:35:55.000000000 +0200
+@@ -507,7 +507,7 @@
+ <xsl:choose>
+ <xsl:when test="contains($zones, ' ')">
+ <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
+- <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
++ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:apply-templates select="." mode="class.attribute"/>
+@@ -530,7 +530,7 @@
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="zone" select="$zones"/>
+- <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
++ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:apply-templates select="." mode="class.attribute"/>
+diff -urNad trunk~/xhtml/autoidx.xsl trunk/xhtml/autoidx.xsl
+--- trunk~/xhtml/autoidx.xsl 2007-08-30 15:43:20.000000000 +0200
++++ trunk/xhtml/autoidx.xsl 2007-09-17 13:35:55.000000000 +0200
+@@ -450,7 +450,7 @@
+ <xsl:choose>
+ <xsl:when test="contains($zones, ' ')">
+ <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
+- <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
++ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:apply-templates select="." mode="class.attribute"/>
+@@ -473,7 +473,7 @@
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="zone" select="$zones"/>
+- <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
++ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:apply-templates select="." mode="class.attribute"/>
Propchange: packages/docbook-xsl/trunk/debian/patches/11_7436_html_fo_fix_empty_index_entries.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch?rev=884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch Mon Sep 17 12:01:28 2007
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_7440_fo_normalize_space.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix from revision 7440 (Mauritz Jeanson):
+## DP: Use normalize-space() in glossterm comparisons.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7440&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/fo/inline.xsl trunk/fo/inline.xsl
+--- trunk~/fo/inline.xsl 2007-06-29 01:23:31.000000000 +0200
++++ trunk/fo/inline.xsl 2007-09-17 13:40:37.000000000 +0200
+@@ -824,16 +824,17 @@
+ <xsl:variable name="term">
+ <xsl:choose>
+ <xsl:when test="@baseform">
+- <xsl:value-of select="@baseform"/>
++ <xsl:value-of select="normalize-space(@baseform)"/>
+ </xsl:when>
+ <xsl:otherwise>
+- <xsl:value-of select="."/>
++ <xsl:value-of select="normalize-space(.)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="targets"
+- select="//glossentry[glossterm=$term or glossterm/@baseform=$term]"/>
++ select="//glossentry[normalize-space(glossterm)=$term
++ or normalize-space(glossterm/@baseform)=$term]"/>
+
+ <xsl:variable name="target" select="$targets[1]"/>
+
Propchange: packages/docbook-xsl/trunk/debian/patches/12_7440_fo_normalize_space.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the debian-xml-sgml-commit
mailing list