From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonas Fonseca Subject: [PATCH] Documentation: Fix man page breakage with DocBook XSL v1.72 Date: Wed, 14 Nov 2007 10:38:46 +0100 Message-ID: <20071114093846.GA21082@diku.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org, Junio C Hamano X-From: git-owner@vger.kernel.org Wed Nov 14 10:39:08 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IsEiA-0006PL-Vz for gcvg-git-2@gmane.org; Wed, 14 Nov 2007 10:39:07 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753846AbXKNJiu (ORCPT ); Wed, 14 Nov 2007 04:38:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753650AbXKNJiu (ORCPT ); Wed, 14 Nov 2007 04:38:50 -0500 Received: from mgw2.diku.dk ([130.225.96.92]:33995 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbXKNJit (ORCPT ); Wed, 14 Nov 2007 04:38:49 -0500 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id 4CD2419BDCE; Wed, 14 Nov 2007 10:38:48 +0100 (CET) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28670-12; Wed, 14 Nov 2007 10:38:46 +0100 (CET) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 5018219BD4A; Wed, 14 Nov 2007 10:38:46 +0100 (CET) Received: from tyr.diku.dk (tyr.diku.dk [130.225.96.226]) by nhugin.diku.dk (Postfix) with ESMTP id 029076DFED7; Wed, 14 Nov 2007 10:38:17 +0100 (CET) Received: by tyr.diku.dk (Postfix, from userid 3873) id 389C15B8001; Wed, 14 Nov 2007 10:38:46 +0100 (CET) Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Scanned: amavisd-new at diku.dk Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: >>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 --- Documentation/Makefile | 10 +++++++--- Documentation/asciidoc.conf | 3 +++ Makefile | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 39ec0ed..d886641 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -37,9 +37,6 @@ man7dir=$(mandir)/man7 ASCIIDOC=asciidoc ASCIIDOC_EXTRA = -ifdef ASCIIDOC8 -ASCIIDOC_EXTRA += -a asciidoc7compatible -endif INSTALL?=install RM ?= rm -f DOC_REF = origin/man @@ -52,6 +49,13 @@ DOCBOOK2X_TEXI=docbook2x-texi -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: diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index af5b155..99d8874 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -23,7 +23,9 @@ 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. +# v1.72 breaks with this because it replaces dots not in roff requests. [listingblock] {title} @@ -36,6 +38,7 @@ ifdef::doctype-manpage[] endif::doctype-manpage[] {title#} +endif::docbook-xsl-172[] endif::backend-docbook[] ifdef::doctype-manpage[] diff --git a/Makefile b/Makefile index cd6d469..6936f7c 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,8 @@ all:: # # 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). # -- 1.5.3.5.1661.gcbf0-dirty -- Jonas Fonseca