[PATCH] handle Docbook XSL 1.72 (incompletely)

Alexey Mahotkin· Sep 20, 2007, 21:26 UTC · lore

hi,

Fedora Core 7 has docbook-style-xsl-1.72.0-2.fc7

git-diff manpage (and couple of more, using callouts) is broken here:

EXAMPLES
       Various ways to check your working tree

               $ git diff            \fB(1)\fR
               $ git diff --cached   \fB(2)\fR
               $ git diff HEAD       \fB(3)\fR

           .sp \fB1. \fRChanges in the working tree not yet staged for
the next commit.

I have fixed this for 1.72 (and probably 1.7x in general), but it does not work under older Docbook XSL, e.g. 1.6x. I guess we could check for version number during build, but cannot provide complete patch, so here is the interim solution:

Show changes to 2 files +6 −6

Documentation/asciidoc.conf, Documentation/callouts.xsl

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index af5b155..ec9060c 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -28,11 +28,11 @@ ifdef::backend-docbook[]
 <example><title>{title}</title>
 <literallayout>
 ifdef::doctype-manpage[]
-&#10;.ft C&#10;
+&#x2302;ft C&#10;
 endif::doctype-manpage[]
 |
 ifdef::doctype-manpage[]
-&#10;.ft&#10;
+&#10;&#x2302;ft &#10;
 endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
diff --git a/Documentation/callouts.xsl b/Documentation/callouts.xsl
index 6a361a2..b1b6882 100644
--- a/Documentation/callouts.xsl
+++ b/Documentation/callouts.xsl
@@ -1,17 +1,17 @@
 <!-- callout.xsl: converts asciidoc callouts to man page format -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:template match="co">
-       <xsl:value-of select="concat('\fB(',substring-after(@id,'-'),')\fR')"/>
+       <xsl:value-of
select="concat('&#x2593;fB(',substring-after(@id,'-'),')&#x2593;fR')"/>
 </xsl:template>
 <xsl:template match="calloutlist">
-       <xsl:text>.sp&#10;</xsl:text>
+       <xsl:text>&#10;.sp&#10;</xsl:text>
        <xsl:apply-templates/>
        <xsl:text>&#10;</xsl:text>
 </xsl:template>
 <xsl:template match="callout">
-       <xsl:value-of
select="concat('\fB',substring-after(@arearefs,'-'),'. \fR')"/>
+       <xsl:value-of
select="concat('&#x2593;fB',substring-after(@arearefs,'-'),'.
&#x2593;fR')"/>
        <xsl:apply-templates/>
-       <xsl:text>.br&#10;</xsl:text>
+       <xsl:text>&#x2302;br&#10;</xsl:text>
 </xsl:template>

 <!-- sorry, this is not about callouts, but attempts to work around

Someone more knowledgeable in this area should step in :)


Thank you,

-- 
Alexey Mahotkin
http://www.versioncontrolblog.com/

Miklos Vajna· Sep 29, 2007, 12:48 UTC · re: Alexey Mahotkin · lore

Re: [PATCH] handle Docbook XSL 1.72 (incompletely)

On Fri, Sep 21, 2007 at 01:26:21AM +0400, Alexey Mahotkin <squadette@gmail.com> wrote:

Show 13 quoted lines

> Fedora Core 7 has docbook-style-xsl-1.72.0-2.fc7
> 
> git-diff manpage (and couple of more, using callouts) is broken here:
> 
> EXAMPLES
>        Various ways to check your working tree
> 
>                $ git diff            \fB(1)\fR
>                $ git diff --cached   \fB(2)\fR
>                $ git diff HEAD       \fB(3)\fR
> 
>            .sp \fB1. \fRChanges in the working tree not yet staged for
> the next commit.

this is a bug in docbook-xsl. see http://article.gmane.org/gmane.comp.version-control.git/54785

by the way, are gitlinks okay at you?

example: in the DESCRIPTION section:

"You can stage these changes by using git1[1]."

while the man branch has:

"You can stage these changes by using git-add(1)."

this is asciidoc 8.2.3 and docbook-xsl 1.73.2

thanks,
- VMiklos

patchhandle Docbook XSL 1.72 (incompletely)