[xml/sgml-commit] r1612 - in /packages/docbook-xsl/trunk/debian: changelog patches/00list patches/8530_manpages_lists_indentation_fix.dpatch patches/portable_apostrophe_fix.dpatch
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Wed Nov 4 00:06:31 UTC 2009
Author: dleidert-guest
Date: Wed Nov 4 00:06:06 2009
New Revision: 1612
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1612
Log:
* 8530_manpages_lists_indentation_fix.dpatch: Added.
- manpages/lists.xsl: Fix two indentation issues (closes: #519438,
#527309).
* debian/patches/portable_apostrophe_fix.dpatch: Added.
- manpages/docbook.xsl, manpages/other.xsl: Add some code to portably
represent a straight apostrophe.
* debian/patches/00list: Adjusted.
Added:
packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch (with props)
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=1612&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Wed Nov 4 00:06:06 2009
@@ -1,6 +1,13 @@
docbook-xsl (1.75.2+dfsg-3) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * 8530_manpages_lists_indentation_fix.dpatch: Added.
+ - manpages/lists.xsl: Fix two indentation issues (closes: #519438,
+ #527309).
+ * debian/patches/portable_apostrophe_fix.dpatch: Added.
+ - manpages/docbook.xsl, manpages/other.xsl: Add some code to portably
+ represent a straight apostrophe.
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 01 Sep 2009 00:33:42 +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=1612&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Wed Nov 4 00:06:06 2009
@@ -1,1 +1,3 @@
514030_debianize_dbtoepub
+8530_manpages_lists_indentation_fix
+portable_apostrophe_fix
Added: packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch?rev=1612&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch Wed Nov 4 00:06:06 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 8530_manpages_lists_indentation_fix.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 8530 ( dleidert ):
+## DP: Fix two indentation issues: In the first case there is no corresponding
+## DP: .RS macro (Debian #519438, sf.net 2793873). In the second case an .RS
+## DP: instead of the probably intended .sp leads to an indentation bug
+## DP: (Debian #527309, sf.net #2642139).
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=8530&view=rev>
+## DP: <URL:http://sourceforge.net/search/?type_of_search=artifact&group_id=21935&words=2642139>
+## DP: <URL:http://bugs.debian.org/519438>
+## DP: <URL:http://bugs.debian.org/527309>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/lists.xsl trunk/manpages/lists.xsl
+--- trunk~/manpages/lists.xsl 2009-03-27 02:25:08.000000000 +0100
++++ trunk/manpages/lists.xsl 2009-11-04 00:54:35.000000000 +0100
+@@ -259,8 +259,8 @@
+ <!-- * it, within the same para, then add a blank line and move -->
+ <!-- * the left margin back to where it was -->
+ <xsl:if test="parent::para and following-sibling::node()">
+- <xsl:text>.sp </xsl:text>
+- <xsl:text>.RE </xsl:text>
++ <xsl:text>.sp</xsl:text>
++ <xsl:text> </xsl:text>
+ </xsl:if>
+ </xsl:template>
+
+@@ -280,11 +280,7 @@
+ parent::para[following-sibling::node()] or
+ parent::simpara[following-sibling::node()] or
+ parent::remark[following-sibling::node()]">
+- <xsl:text>.RS</xsl:text>
+- <xsl:if test="not($list-indent = '')">
+- <xsl:text> </xsl:text>
+- <xsl:value-of select="$list-indent"/>
+- </xsl:if>
++ <xsl:text>.sp</xsl:text>
+ <xsl:text> </xsl:text>
+ </xsl:if>
+ </xsl:template>
Propchange: packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch?rev=1612&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch Wed Nov 4 00:06:06 2009
@@ -1,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## portable_apostrophe_fix.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch tries to fix the issue mentioned in #507673. A straight apostrophe
+## DP: cannot be received with \'. The only way with GROFF is \(aq. But that's not
+## DP: portable to AT&T troff as used by e.g. Sun Solaris. The patch tries to use
+## DP: a workaround also used in Pod::Man (perl). Thanks to Anders Kaseorg.
+## DP:
+## DP: This patch has not yet been added to the docbook-xsl upstream code-base and
+## DP: is tested in Debian only.
+## DP:
+## DP: <URL:http://bugs.debian.org/507673>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html>
+## DP: <URL:https://sourceforge.net/tracker/index.php?func=detail&aid=2412738&group_id=21935&atid=373747>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/docbook.xsl trunk/manpages/docbook.xsl
+--- trunk~/manpages/docbook.xsl 2009-07-21 03:12:49.000000000 +0200
++++ trunk/manpages/docbook.xsl 2009-11-04 00:58:14.000000000 +0100
+@@ -233,6 +233,7 @@
+ <!-- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- * (re)define some macros -->
+ <!-- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
++ <xsl:call-template name="define.portability.macros"/>
+ <xsl:if test="not($man.output.better.ps.enabled = 0)">
+ <xsl:call-template name="define.macros"/>
+ </xsl:if>
+diff -urNad trunk~/manpages/other.xsl trunk/manpages/other.xsl
+--- trunk~/manpages/other.xsl 2009-02-19 19:26:36.000000000 +0100
++++ trunk/manpages/other.xsl 2009-11-04 00:58:14.000000000 +0100
+@@ -223,7 +223,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">\*(Aq</xsl:with-param>
+ </xsl:call-template>
+ </xsl:template>
+
+@@ -658,6 +658,24 @@
+
+ <!-- ============================================================== -->
+
++ <!-- There is some stuff, that is not portable between groff/troff. -->
++ <xsl:template name="define.portability.macros">
++ <xsl:text>.\" ----------------------------------------------------------------- </xsl:text>
++ <xsl:text>.\" * Define some portability stuff </xsl:text>
++ <xsl:text>.\" ----------------------------------------------------------------- </xsl:text>
++ <xsl:text>.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ </xsl:text>
++ <xsl:text>.\" http://bugs.debian.org/507673 </xsl:text>
++ <xsl:text>.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html </xsl:text>
++ <xsl:text>.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ </xsl:text>
++ <xsl:text> </xsl:text>
++ <xsl:text>.ie \n(.g .ds Aq \(aq</xsl:text>
++ <xsl:text> </xsl:text>
++ <xsl:text>.el .ds Aq '</xsl:text>
++ <xsl:text> </xsl:text>
++ </xsl:template>
++
++ <!-- ============================================================== -->
++
+ <xsl:template name="define.macros">
+ <xsl:text>.\" ----------------------------------------------------------------- </xsl:text>
+ <xsl:text>.\" * (re)Define some macros </xsl:text>
Propchange: packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the debian-xml-sgml-commit
mailing list