[xml/sgml-commit] r1062 - in /packages/docbook-xsl/trunk/debian: ./ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Sun Mar 30 19:33:52 UTC 2008
Author: dleidert-guest
Date: Sun Mar 30 19:33:52 2008
New Revision: 1062
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1062
Log:
* debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Small
fix (adds startquote).
* debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Added.
- Fixed to make colsep in entrytbl working.
* debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Added.
- Fixed to make rowsep apply to the last row of thead in entrytbl.
* debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Added.
- Fixed a regression in the handling of dots. Prepend them with a zero
width character.
* debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
Added.
- Replace any spaces in the refname(s) with underscores for man-page name
to be compliant with lexgrog and other tools not able to handle spaces
in filenames.
* debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Added.
- Fixed a regression in the conversion of non-breaking spaces (closes:
#473244).
* debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Added.
- Fixed non-working inline.or.block template for indexterm wrappers.
* debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Added.
- Add exslt namespace to (x)html/docbook.xsl. Otherwise there seems to be
a problem using the profiled version of the stylesheet.
* debian/patches/00list: Adjusted.
Added:
packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch (with props)
Modified:
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/patches/00list
packages/docbook-xsl/trunk/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1062&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Sun Mar 30 19:33:52 2008
@@ -5,6 +5,29 @@
version 0.8.10 of the doc-base manual.
* debian/docbook-xsl-doc-pdf.doc-base (Section): Ditto.
* debian/docbook-xsl-doc-text.doc-base (Section): Ditto.
+ * debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Small
+ fix (adds startquote).
+ * debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Added.
+ - Fixed to make colsep in entrytbl working.
+ * debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Added.
+ - Fixed to make rowsep apply to the last row of thead in entrytbl.
+ * debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Added.
+ - Fixed a regression in the handling of dots. Prepend them with a zero
+ width character.
+ * debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
+ Added.
+ - Replace any spaces in the refname(s) with underscores for man-page name
+ to be compliant with lexgrog and other tools not able to handle spaces
+ in filenames.
+ * debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Added.
+ - Fixed a regression in the conversion of non-breaking spaces (closes:
+ #473244).
+ * debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Added.
+ - Fixed non-working inline.or.block template for indexterm wrappers.
+ * debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Added.
+ - Add exslt namespace to (x)html/docbook.xsl. Otherwise there seems to be
+ a problem using the profiled version of the stylesheet.
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 04 Mar 2008 01:24:23 +0100
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=1062&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Sun Mar 30 19:33:52 2008
@@ -9,3 +9,10 @@
7656_html_component_title_in_info_elements
7668_locale_update_and_fix_norwegian_bokmal
7674_man_fix_unescaped_dash_in_whatis_entry
+7681_fo_fix_colsep_in_entrytbl
+7698_html_fix_rowsep_in_entrytbl
+7731_man_prepend_dots_with_zero_width_char
+7740_man_replace_spaces_in_refname_with_underscores
+7806_man_fix_non_breaking_space_output
+7901_fo_fix_inline_or_block_template
+7939_html_add_exslt_ns_for_pi
Modified: packages/docbook-xsl/trunk/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch?rev=1062&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch Sun Mar 30 19:33:52 2008
@@ -15,7 +15,7 @@
@DPATCH@
diff -urNad trunk~/common/l10n.xml trunk/common/l10n.xml
--- trunk~/common/l10n.xml 2007-07-22 17:05:56.000000000 +0200
-+++ trunk/common/l10n.xml 2008-02-17 00:04:10.000000000 +0100
++++ trunk/common/l10n.xml 2008-03-30 19:35:12.000000000 +0200
@@ -36,6 +36,7 @@
<!ENTITY lit SYSTEM "lt.xml">
<!ENTITY lv SYSTEM "lv.xml">
@@ -34,7 +34,7 @@
&no;
diff -urNad trunk~/common/nb.xml trunk/common/nb.xml
--- trunk~/common/nb.xml 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/common/nb.xml 2008-02-17 00:06:27.000000000 +0100
++++ trunk/common/nb.xml 2008-03-30 19:36:04.000000000 +0200
@@ -0,0 +1,1223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nb" english-language-name="Norwegian Bokmål">
@@ -241,7 +241,7 @@
+<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÃ
"/>
+<l:gentext key="normalize.sort.input" text="AaÀà ÃáÂâÃãÄäÃ
åĀÄĂăĄÄ
ÇÇŽÇžÇŸÇ Ç¡ÇºÇ»È€ÈȂȃȦȧḀá¸áºšáº ạẢảẤấẦầẨẩẪẫẬáºáº®áº¯áº°áº±áº²áº³áº´áºµáº¶áº·BbÆ€ÆɓƂƃḂḃḄá¸
ḆḇCcÇçĆćĈĉĊċČÄƇƈɕḈḉDdÄŽÄÄÄ‘ÆŠÉ—Æ‹ÆŒÇ
DzȡɖḊḋḌá¸á¸Žá¸á¸á¸‘ḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄÈ
ȆȇȨȩḔḕḖḗḘḙḚḛḜá¸áº¸áº¹áººáº»áº¼áº½áº¾áº¿á»€á»á»‚ểỄá»
ỆệFfƑƒḞḟGgÄœÄÄžÄŸÄ Ä¡Ä¢Ä£Æ“É Ç¤Ç¥Ç¦Ç§Ç´Çµá¸ á¸¡HhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÃÃÎîÃïĨĩĪīĬÄĮįİƗɨÇÇȈȉȊȋḬá¸á¸®á¸¯á»ˆá»‰á»Šá»‹JjĴĵǰÊKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀÅłƚLjȴɫɬÉḶḷḸḹḺḻḼḽMmɱḾḿṀá¹á¹‚ṃNnÑñŃńÅ
ņŇňÆÉ²ÆžÈ Ç‹Ç¸Ç¹ÈµÉ³á¹„á¹
ṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌÅÅŽÅÅÅ‘ÆŸÆ Æ¡Ç‘Ç’ÇªÇ«Ç¬ÇǾǿȌÈÈŽÈȪȫȬÈȮȯȰȱṌá¹á¹Žá¹á¹á¹‘ṒṓỌá»á»Žá»á»á»‘ỒồỔổỖỗỘộỚớỜá»á»žá»Ÿá» ỡỢợPpƤƥṔṕṖṗQqÊ RrŔŕŖŗŘřÈȑȒȓɼɽɾṘṙṚṛṜá¹á¹žá¹ŸSsŚśŜÅŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬÆƮʈȚțȶṪṫṬá¹á¹®á¹¯á¹°á¹±áº—UuÙùÚúÛûÜüŨũŪūŬÅŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬá»á»®á»¯á»°á»±VvƲʋṼṽṾṿWwŴŵẀáºáº‚ẃẄáº
ẆẇẈẉẘXxẊẋẌáºYyÃýÿŸŶŷƳƴȲȳẎáºáº™á»²á»³á»´á»µá»¶á»·á»¸á»¹ZzŹźŻżŽžƵƶȤȥÊÊ‘áºáº‘ẒẓẔẕẕ" lang="en"/>
+<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-+<l:dingbat key="startquote" text="“" lang="en"/>
++<l:dingbat key="startquote" text="“"/>
+<l:dingbat key="endquote" text="â€"/>
+<l:dingbat key="nestedstartquote" text="‘"/>
+<l:dingbat key="nestedendquote" text="’"/>
Added: packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7681_fo_fix_colsep_in_entrytbl.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 7681 ( mzjn ):
+## DP: Fixed bug #1891965 (colsep in entytbl not working).
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7681&view=rev>
+## DP: <URL:http://sourceforge.net/tracker/index.php?func=detail&aid=1891965&group_id=21935&atid=373747>
+
+ at DPATCH@
+diff -urNad trunk~/fo/table.xsl trunk/fo/table.xsl
+--- trunk~/fo/table.xsl 2007-08-19 02:00:08.000000000 +0200
++++ trunk/fo/table.xsl 2008-03-30 19:39:08.000000000 +0200
+@@ -1069,7 +1069,7 @@
+ </xsl:if>
+
+ <xsl:if test="$colsep.inherit > 0 and
+- $col < ancestor::tgroup/@cols">
++ $col < (ancestor::tgroup/@cols|ancestor::entrytbl/@cols)[last()]">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'right'"/>
+ </xsl:call-template>
Propchange: packages/docbook-xsl/trunk/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7698_html_fix_rowsep_in_entrytbl.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 7698 ( mzjn ):
+## DP: Added a fix to make rowsep apply to the last row of thead in entrytbl.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7698&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/html/table.xsl trunk/html/table.xsl
+--- trunk~/html/table.xsl 2007-07-12 02:28:40.000000000 +0200
++++ trunk/html/table.xsl 2008-03-30 20:23:13.000000000 +0200
+@@ -692,7 +692,8 @@
+ <xsl:choose>
+ <!-- If this is the last row, rowsep never applies. -->
+ <xsl:when test="ancestor::entrytbl
+- and not (ancestor-or-self::row[1]/following-sibling::row)">
++ and not (ancestor-or-self::row[1]/following-sibling::row)
++ and not (ancestor::thead)">
+ <xsl:value-of select="0"/>
+ </xsl:when>
+ <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row
+diff -urNad trunk~/xhtml/table.xsl trunk/xhtml/table.xsl
+--- trunk~/xhtml/table.xsl 2007-08-30 15:43:25.000000000 +0200
++++ trunk/xhtml/table.xsl 2008-03-30 20:24:16.000000000 +0200
+@@ -675,7 +675,7 @@
+ <xsl:variable name="rowsep">
+ <xsl:choose>
+ <!-- If this is the last row, rowsep never applies. -->
+- <xsl:when test="ancestor::entrytbl and not (ancestor-or-self::row[1]/following-sibling::row)">
++ <xsl:when test="ancestor::entrytbl and not (ancestor-or-self::row[1]/following-sibling::row) and not (ancestor::thead)">
+ <xsl:value-of select="0"/>
+ </xsl:when>
+ <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row or ancestor-or-self::thead/following-sibling::tbody or ancestor-or-self::tbody/preceding-sibling::tfoot)">
Propchange: packages/docbook-xsl/trunk/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7731_man_prepend_dots_with_zero_width_char.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 7731 ( xmldoc ):
+## DP: corrected a regression I introduced about a year ago that caused
+## DP: dots to be output just as "\." -- instead needs to be "\&." (which
+## DP: is what it will be now, after this change)
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7731&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/other.xsl trunk/manpages/other.xsl
+--- trunk~/manpages/other.xsl 2008-03-30 19:52:26.000000000 +0200
++++ trunk/manpages/other.xsl 2008-03-30 19:53:02.000000000 +0200
+@@ -230,7 +230,7 @@
+ <xsl:call-template name="string.subst">
+ <xsl:with-param name="string" select="$content"/>
+ <xsl:with-param name="target">.</xsl:with-param>
+- <xsl:with-param name="replacement">\.</xsl:with-param>
++ <xsl:with-param name="replacement">\&.</xsl:with-param>
+ </xsl:call-template>
+ </xsl:template>
+
+diff -urNad trunk~/manpages/utility.xsl trunk/manpages/utility.xsl
+--- trunk~/manpages/utility.xsl 2007-06-20 14:20:57.000000000 +0200
++++ trunk/manpages/utility.xsl 2008-03-30 19:53:02.000000000 +0200
+@@ -123,7 +123,7 @@
+ <xsl:variable name="dot-content">
+ <xsl:call-template name="string.subst">
+ <xsl:with-param name="string" select="$content"/>
+- <xsl:with-param name="target" select="'\.'"/>
++ <xsl:with-param name="target" select="'\&.'"/>
+ <xsl:with-param name="replacement" select="'.'"/>
+ </xsl:call-template>
+ </xsl:variable>
Propchange: packages/docbook-xsl/trunk/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7740_man_replace_spaces_in_refname_with_underscores.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 7740 ( xmldoc ):
+## DP: To create the name(s) for each man page, we now replace any spaces
+## DP: in the refname(s) with underscores. This ensures that tools like
+## DP: lexgrog(1) will be able to parse the name (lexgrog won't parse names
+## DP: that contain spaces).
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7740&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/refentry.xsl trunk/manpages/refentry.xsl
+--- trunk~/manpages/refentry.xsl 2008-03-30 19:56:35.000000000 +0200
++++ trunk/manpages/refentry.xsl 2008-03-30 19:56:53.000000000 +0200
+@@ -36,7 +36,15 @@
+ <xsl:if test="position()>1">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+- <xsl:value-of select="."/>
++ <xsl:call-template name="string.subst">
++ <!-- * To create the name(s) for this man page, replace any -->
++ <!-- * spaces in the refname(s) with underscores. This ensures -->
++ <!-- * that tools like lexgrog(1) will be able to parse the name -->
++ <!-- * (lexgrog won’t parse names that contain spaces). -->
++ <xsl:with-param name="string" select="."/>
++ <xsl:with-param name="target" select="' '"/>
++ <xsl:with-param name="replacement" select="'_'"/>
++ </xsl:call-template>
+ </xsl:for-each>
+ <!-- * The man(7) man pages says: -->
+ <!-- * -->
Propchange: packages/docbook-xsl/trunk/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7806_man_fix_non_breaking_space_output.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 7806 ( xmldoc ):
+## DP: convert no-break space character to groff "\ \&" (instead of
+## DP: just "\ "). the reason is that if a space occurs at the end
+## DP: of a line, our processing causes it to be eaten. a real-world
+## DP: case of this is the mysql(1) man page. appending the "&" prevents
+## DP: that
+## DP:
+## DP: Closes #473244.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7806&view=rev>
+## DP: <URL:http://bugs.debian.org/473244>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/charmap.groff.xsl trunk/manpages/charmap.groff.xsl
+--- trunk~/manpages/charmap.groff.xsl 2007-02-07 23:45:24.000000000 +0100
++++ trunk/manpages/charmap.groff.xsl 2008-03-30 20:02:27.000000000 +0200
+@@ -99,7 +99,7 @@
+ character=" "
+ u:name="NO-BREAK SPACE"
+ u:entity="nbsp"
+- string="\ "
++ string="\ \&"
+ u:block="C1 Controls And Latin-1 Supplement (Latin-1 Supplement)"
+ u:class="symbols"
+ />
+diff -urNad trunk~/manpages/other.xsl trunk/manpages/other.xsl
+--- trunk~/manpages/other.xsl 2008-03-30 20:00:58.000000000 +0200
++++ trunk/manpages/other.xsl 2008-03-30 20:02:27.000000000 +0200
+@@ -272,7 +272,11 @@
+ <!-- * Unfortunately, roff seems to do some weird things with -->
+ <!-- * long lines that only have words separated by "\~" -->
+ <!-- * spaces, so it's safer just to stick with the "\ " space -->
+- <xsl:with-param name="replacement">\ </xsl:with-param>
++ <!-- * -->
++ <!-- * We append a "\&" to handle the case of a no-break space that -->
++ <!-- * appears at the end of a line - because later processing will -->
++ <!-- * cause that space to get eaten otherwise. -->
++ <xsl:with-param name="replacement">\ \&</xsl:with-param>
+ </xsl:call-template>
+ </xsl:template>
+
Propchange: packages/docbook-xsl/trunk/debian/patches/7806_man_fix_non_breaking_space_output.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7901_fo_fix_inline_or_block_template.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 7901 ( bobstayton ):
+## DP: Fixed non-working inline.or.block template for indexterm wrappers.
+## DP: Add fop1 to list of processors using inline.or.block.
+## DP:
+## DP: Upstream fix from revision 7902 ( bobstayton ):
+## DP: FOP1 requires fo:wrapper for inline index entries, not fo:inline.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7901&view=rev>
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7902&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/fo/index.xsl trunk/fo/index.xsl
+--- trunk~/fo/index.xsl 2007-06-29 01:23:31.000000000 +0200
++++ trunk/fo/index.xsl 2008-03-30 20:13:20.000000000 +0200
+@@ -295,7 +295,7 @@
+ <!-- Temporal workaround for bug in AXF -->
+ <xsl:variable name="wrapper.name">
+ <xsl:choose>
+- <xsl:when test="$axf.extensions != 0">
++ <xsl:when test="$axf.extensions != 0 or $fop1.extensions != 0">
+ <xsl:call-template name="inline.or.block"/>
+ </xsl:when>
+ <xsl:otherwise>fo:wrapper</xsl:otherwise>
+@@ -466,12 +466,13 @@
+ <xsl:template name="inline.or.block">
+ <xsl:param name="parentnode" select=".."/>
+
+- <xsl:variable name="parent" select="local-name($parentnode)"/>
++ <xsl:variable name="parent" select="concat('|', local-name($parentnode), '|')"/>
+
+ <xsl:variable name="block.parents" select="'|answer|appendix|appendixinfo|article|articleinfo|bibliodiv|bibliography|bibliographyinfo|blockinfo|blockquote|bookinfo|callout|caution|chapter|chapterinfo|dedication|example|figure|formalpara|funcsynopsisinfo|glossary|glossaryinfo|glossdef|glossdiv|glossentry|highlights|important|index|indexinfo|info|informalexample|informalfigure|informaltable|itemizedlist|legalnotice|listitem|msgexplan|msgtext|note|objectinfo|orderedlist|partinfo|partintro|preface|prefaceinfo|procedure|qandadiv|qandaset|question|refentry|refentryinfo|referenceinfo|refmeta|refmiscinfo|refsect1|refsect1info|refsect2|refsect2info|refsect3|refsect3info|refsection|refsectioninfo|refsynopsisdiv|refsynopsisdivinfo|revdescription|screeninfo|sect1|sect1info|sect2|sect2info|sect3|sect3info|sect4|sect4info|sect5|sect5info|section|sectioninfo|setindex|setindexinfo|setinfo|sidebar|sidebarinfo|simplesect|step|table|task|taskprerequisites|taskrelated|tasksummary|tip|variablelist|warning|'"/>
+
+ <xsl:choose>
+- <xsl:when test="contains($parent, $block.parents)">fo:block</xsl:when>
++ <xsl:when test="contains($block.parents, $parent)">fo:block</xsl:when>
++ <xsl:when test="$fop1.extensions != 0">fo:wrapper</xsl:when>
+ <xsl:otherwise>fo:inline</xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
Propchange: packages/docbook-xsl/trunk/debian/patches/7901_fo_fix_inline_or_block_template.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch?rev=1062&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch Sun Mar 30 19:33:52 2008
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 7939_html_add_exslt_ns_for_pi.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 7939 ( xmldoc ):
+## DP: added "exslt" namespace binding to html/docbook.xsl file (in:
+## DP: addition to existing "exsl" binding. reason is because lack of:
+## DP: it seems to cause processing problems when using the profiled:
+## DP: version of the stylsheet
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7939&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/html/docbook.xsl trunk/html/docbook.xsl
+--- trunk~/html/docbook.xsl 2007-08-09 09:48:42.000000000 +0200
++++ trunk/html/docbook.xsl 2008-03-30 20:20:42.000000000 +0200
+@@ -3,7 +3,8 @@
+ xmlns:ng="http://docbook.org/docbook-ng"
+ xmlns:db="http://docbook.org/ns/docbook"
+ xmlns:exsl="http://exslt.org/common"
+- exclude-result-prefixes="db ng exsl"
++ xmlns:exslt="http://exslt.org/common"
++ exclude-result-prefixes="db ng exsl exslt"
+ version='1.0'>
+
+ <xsl:output method="html"
+diff -urNad trunk~/xhtml/docbook.xsl trunk/xhtml/docbook.xsl
+--- trunk~/xhtml/docbook.xsl 2007-08-30 15:43:22.000000000 +0200
++++ trunk/xhtml/docbook.xsl 2008-03-30 20:22:45.000000000 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="ASCII"?>
+ <!--This file was created automatically by html2xhtml-->
+ <!--from the HTML stylesheets.-->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="db ng exsl" version="1.0">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="db ng exsl exslt" version="1.0">
+
+ <xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
Propchange: packages/docbook-xsl/trunk/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the debian-xml-sgml-commit
mailing list