summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Daly <francis@daoine.org>2006-03-05 23:13:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-06 06:38:12 (GMT)
commite920b5655719bee9c98a3d7d3b05ac6e8cf9d176 (patch)
treec3e1e0f93e33a0331a44fff615a451419b9b9555
parentce5b6e711148d035478fcb18773a0abcef302d7e (diff)
downloadgit-e920b5655719bee9c98a3d7d3b05ac6e8cf9d176.zip
git-e920b5655719bee9c98a3d7d3b05ac6e8cf9d176.tar.gz
git-e920b5655719bee9c98a3d7d3b05ac6e8cf9d176.tar.bz2
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>
-rw-r--r--Documentation/asciidoc.conf10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index fa0877d..7ce7151 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>