{"thread":{"id":"10864","subject":"[PATCH] Documentation: Fix man page breakage with DocBook XSL v1.72","startedAt":"2007-11-14T09:38:46Z","lastAt":"2007-11-14T09:47:56Z","messageCount":3,"participants":["Jonas Fonseca","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"59833","messageId":"20071114093846.GA21082@diku.dk","threadId":"10864","inReplyTo":null,"subject":"[PATCH] Documentation: Fix man page breakage with DocBook XSL v1.72","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2007-11-14T09:38:46Z","receivedAt":"2007-11-14T09:38:46Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":">From version 1.72 it will replace all dots in roff requests with U+2302\n(\"house\" character), and add escaping in output for all instances of dot\nthat are not in roff requests. This caused the \".ft\" hack forcing\nmonospace font in listingblocks to end up as \"\\&.ft\" and being visible\nin the resulting man page.\n\nThe fix adds a DOCBOOK_XSL_172 build variable that will disable the\nhack. To allow this variable to be defined in config.mak it also moves\nbuild variable handling below the inclusion of config.mak.\n\nSigned-off-by: Jonas Fonseca <fonseca@diku.dk>\n---\n Documentation/Makefile      |   10 +++++++---\n Documentation/asciidoc.conf |    3 +++\n Makefile                    |    2 ++\n 3 files changed, 12 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 39ec0ed..d886641 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -37,9 +37,6 @@ man7dir=$(mandir)/man7\n \n ASCIIDOC=asciidoc\n ASCIIDOC_EXTRA =\n-ifdef ASCIIDOC8\n-ASCIIDOC_EXTRA += -a asciidoc7compatible\n-endif\n INSTALL?=install\n RM ?= rm -f\n DOC_REF = origin/man\n@@ -52,6 +49,13 @@ DOCBOOK2X_TEXI=docbook2x-texi\n -include ../config.mak.autogen\n -include ../config.mak\n \n+ifdef ASCIIDOC8\n+ASCIIDOC_EXTRA += -a asciidoc7compatible\n+endif\n+ifdef DOCBOOK_XSL_172\n+ASCIIDOC_EXTRA += -a docbook-xsl-172\n+endif\n+\n #\n # Please note that there is a minor bug in asciidoc.\n # The version after 6.0.3 _will_ include the patch found here:\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex af5b155..99d8874 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -23,7 +23,9 @@ ifdef::backend-docbook[]\n endif::backend-docbook[]\n \n ifdef::backend-docbook[]\n+ifndef::docbook-xsl-172[]\n # \"unbreak\" docbook-xsl v1.68 for manpages. v1.69 works with or without this.\n+# v1.72 breaks with this because it replaces dots not in roff requests.\n [listingblock]\n <example><title>{title}</title>\n <literallayout>\n@@ -36,6 +38,7 @@ ifdef::doctype-manpage[]\n endif::doctype-manpage[]\n </literallayout>\n {title#}</example>\n+endif::docbook-xsl-172[]\n endif::backend-docbook[]\n \n ifdef::doctype-manpage[]\ndiff --git a/Makefile b/Makefile\nindex cd6d469..6936f7c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -115,6 +115,8 @@ all::\n #\n # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8\n #\n+# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.\n+#\n # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's\n # MakeMaker (e.g. using ActiveState under Cygwin).\n #\n-- \n1.5.3.5.1661.gcbf0-dirty\n\n-- \nJonas Fonseca\n"},{"id":"59836","messageId":"7vbq9xjh0y.fsf@gitster.siamese.dyndns.org","threadId":"10864","inReplyTo":"20071114093846.GA21082@diku.dk","subject":"Re: [PATCH] Documentation: Fix man page breakage with DocBook XSL v1.72","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-14T09:46:53Z","receivedAt":"2007-11-14T09:46:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonas Fonseca <fonseca@diku.dk> writes:\n\n> From version 1.72 it will replace all dots in roff requests with U+2302\n> (\"house\" character), and add escaping in output for all instances of dot\n> that are not in roff requests.\n\nWasn't this \"house\" thing brought up on the list earlier?  I may\nwell be recalling things incorrectly, but I somehow thought that\nDocBook people realized this was a mistake and the \"house\" trick\nwas retracted in later snapshots, or something.\n"},{"id":"59837","messageId":"7v7ikljgz7.fsf@gitster.siamese.dyndns.org","threadId":"10864","inReplyTo":"20071114093846.GA21082@diku.dk","subject":"Re: [PATCH] Documentation: Fix man page breakage with DocBook XSL v1.72","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-14T09:47:56Z","receivedAt":"2007-11-14T09:47:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonas Fonseca <fonseca@diku.dk> writes:\n\n> The fix adds a DOCBOOK_XSL_172 build variable that will disable the\n> hack. To allow this variable to be defined in config.mak it also moves\n> build variable handling below the inclusion of config.mak.\n\nAh, I misread the patch.  Thanks.\n"}]}