Documentation: Fix man page breakage with DocBook XSL v1.72

From version 1.72 it will replace all dots in roff requests with U+2302
("house" character), and add escaping in output for all instances of dot
that are not in roff requests. This caused the ".ft" hack forcing
monospace font in listingblocks to end up as "\&.ft" and being visible
in the resulting man page.

The fix adds a DOCBOOK_XSL_172 build variable that will disable the
hack. To allow this variable to be defined in config.mak it also moves
build variable handling below the inclusion of config.mak.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 39ec0ede0249da79be574d85e731f8a7b239d9db..d88664177da52ef92c25959ba396b4b823859225 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -37,9 +37,6 @@ man7dir=$(mandir)/man7
 
 ASCIIDOC=asciidoc
 ASCIIDOC_EXTRA =
 
 ASCIIDOC=asciidoc
 ASCIIDOC_EXTRA =

-ifdef ASCIIDOC8
-ASCIIDOC_EXTRA += -a asciidoc7compatible
-endif

 INSTALL?=install
 RM ?= rm -f
 DOC_REF = origin/man
 INSTALL?=install
 RM ?= rm -f
 DOC_REF = origin/man


@@ -52,6 +49,13 @@ DOCBOOK2X_TEXI=docbook2x-texi
 -include ../config.mak.autogen
 -include ../config.mak
 
 -include ../config.mak.autogen
 -include ../config.mak
 

+ifdef ASCIIDOC8
+ASCIIDOC_EXTRA += -a asciidoc7compatible
+endif
+ifdef DOCBOOK_XSL_172
+ASCIIDOC_EXTRA += -a docbook-xsl-172
+endif
+

 #
 # Please note that there is a minor bug in asciidoc.
 # The version after 6.0.3 _will_ include the patch found here:
 #
 # Please note that there is a minor bug in asciidoc.
 # The version after 6.0.3 _will_ include the patch found here:

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index af5b1558a63219a3eac2570e1cecc97e3008f96f..99d8874aa0a97597507cbd6864df4113c00d4cf7 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -23,7 +23,9 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]

+ifndef::docbook-xsl-172[]

 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.

+# v1.72 breaks with this because it replaces dots not in roff requests.

 [listingblock]
 <example><title>{title}</title>
 <literallayout>
 [listingblock]
 <example><title>{title}</title>
 <literallayout>


@@ -36,6 +38,7 @@ ifdef::doctype-manpage[]
 endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
 endif::doctype-manpage[]
 </literallayout>
 {title#}</example>

+endif::docbook-xsl-172[]

 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]

diff --git a/Makefile b/Makefile
index 2331e45adfb09c7327d5868f536bc5d413d8af95..41c90ad1d49c92829cd678f5f4ce8ad9f2e05985 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,8 @@ all::
 #
 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
 #
 #
 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
 #

+# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
+#

 # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
 # MakeMaker (e.g. using ActiveState under Cygwin).
 #
 # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
 # MakeMaker (e.g. using ActiveState under Cygwin).
 #