git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH 2/6] Doc: drop support for docbook-xsl before 1.72.0
Date: Sun, 29 Mar 2020 15:18:06 +0200	[thread overview]
Message-ID: <49ff2871beef36bfd44796f3832629dd09c5560b.1585486103.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1585486103.git.martin.agren@gmail.com>

docbook-xsl 1.72.0 is thirteen years old. Drop the ASCIIDOC_ROFF knob
which was needed to support 1.68.1 - 1.71.1. The next commit will
increase the required/assumed version further.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 Documentation/Makefile      | 10 +---------
 Documentation/asciidoc.conf | 19 -------------------
 Makefile                    |  3 ---
 INSTALL                     |  2 +-
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index c7b805d1ee..c7a8fc99cf 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -151,21 +151,13 @@ endif
 
 #
 # For docbook-xsl ...
-#	-1.71.0,	not supported
-#	1.71.1,		set ASCIIDOC_ROFF?
+#	-1.71.1,	not supported
 #	1.72.0,		set DOCBOOK_XSL_172.
 #	1.73.0-,	no extra settings are needed
 #
 
 ifdef DOCBOOK_XSL_172
-ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
 MANPAGE_XSL = manpage-1.72.xsl
-else
-	ifndef ASCIIDOC_ROFF
-	# docbook-xsl after 1.72 needs the regular XSL, but will not
-	# pass-thru raw roff codes from asciidoc.conf, so turn them off.
-	ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
-	endif
 endif
 ifndef NO_MAN_BOLD_LITERAL
 XMLTO_EXTRA += -m manpage-bold-literal.xsl
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 8fc4b67081..3e4c13971b 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -31,24 +31,6 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]
-ifndef::git-asciidoc-no-roff[]
-# "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 class="monospaced">
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
-|
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
-</literallayout>
-{title#}</example>
-endif::git-asciidoc-no-roff[]
-
-ifdef::git-asciidoc-no-roff[]
 ifdef::doctype-manpage[]
 # The following two small workarounds insert a simple paragraph after screen
 [listingblock]
@@ -67,7 +49,6 @@ ifdef::doctype-manpage[]
 {title#}</para></formalpara>
 {title%}<simpara></simpara>
 endif::doctype-manpage[]
-endif::git-asciidoc-no-roff[]
 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
diff --git a/Makefile b/Makefile
index ef1ff2228f..0e0a6badc1 100644
--- a/Makefile
+++ b/Makefile
@@ -285,9 +285,6 @@ all::
 # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
 # (not v1.73 or v1.71).
 #
-# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives
-# (versions 1.68.1 through v1.72).
-#
 # Define GNU_ROFF if your target system uses GNU groff.  This forces
 # apostrophes to be ASCII so that cut&pasting examples to the shell
 # will work.
diff --git a/INSTALL b/INSTALL
index 7647ce1320..07a283fcf2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -206,7 +206,7 @@ Issues of note:
    clone two separate git-htmldocs and git-manpages repositories next
    to the clone of git itself.
 
-   The minimum supported version of docbook-xsl is 1.71.1.
+   The minimum supported version of docbook-xsl is 1.72.
    It has been reported that docbook-xsl version 1.72 and 1.73 are
    buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
-- 
2.26.0


  parent reply	other threads:[~2020-03-29 13:18 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-29 13:18 [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74 Martin Ågren
2020-03-29 13:18 ` [PATCH 1/6] Doc: drop support for docbook-xsl before 1.71.1 Martin Ågren
2020-03-29 13:18 ` Martin Ågren [this message]
2020-03-29 13:18 ` [PATCH 3/6] Doc: drop support for docbook-xsl before 1.73.0 Martin Ågren
2020-03-29 13:18 ` [PATCH 4/6] manpage-bold-literal.xsl: stop using git.docbook.backslash Martin Ågren
2020-03-29 13:18 ` [PATCH 5/6] manpage-normal.xsl: fold in manpage-base.xsl Martin Ågren
2020-03-29 13:18 ` [PATCH 6/6] INSTALL: drop support for docbook-xsl before 1.74 Martin Ågren
2020-03-30  9:26   ` Jeff King
2020-03-29 16:27 ` [PATCH 0/6] Doc: " Junio C Hamano
2020-03-30  9:45 ` Jeff King
2020-03-31 19:26   ` Martin Ågren
2020-04-01 10:17     ` Jeff King
2020-04-01 16:59       ` Junio C Hamano
2020-04-02  0:45       ` brian m. carlson
2020-04-02 16:48         ` Junio C Hamano
2020-03-30 10:46 ` brian m. carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49ff2871beef36bfd44796f3832629dd09c5560b.1585486103.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --subject='Re: [PATCH 2/6] Doc: drop support for docbook-xsl before 1.72.0' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).