From: Francis Daly <francis@daoine.org>
Date: Sun, 5 Mar 2006 23:13:36 +0000 (+0000)
Subject: Tweak asciidoc output to work with broken docbook-xsl
X-Git-Tag: v1.3.0-rc1~45^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e920b56;p=git.git

Tweak asciidoc output to work with broken docbook-xsl

docbook-xsl v1.68 incorrectly converts "<screen>" from docbook to
manpage by not rendering it verbatim. v1.69 handles it correctly, but
not many current popular distributions ship with it.

asciidoc by default converts "listingblock" to "<screen>". This change
causes asciidoc in git to convert "listingblock" to "<literallayout>", which
both old and new docbook-xsl handle correctly.

The difference can be seen in any manpage which includes a multi-line
example, such as git-branch.

[jc: the original patch was an disaster for html backends, so I made
 it apply only to docbook backends. ]

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index fa0877d48..7ce71510d 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -18,6 +18,16 @@ ifdef::backend-docbook[]
 {0#</citerefentry>}
 endif::backend-docbook[]
 
+ifdef::backend-docbook[]
+# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
+[listingblock]
+<example><title>{title}</title>
+<literallayout>
+|
+</literallayout>
+{title#}</example>
+endif::backend-docbook[]
+
 ifdef::backend-xhtml11[]
 [gitlink-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>