Doc: drop support for docbook-xsl before 1.72.0
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Mar 29, 2020 at 15:18 UTC
40b970078b3037c647fe8975724f55bbf63b8e9a
4 files changed
+2
-32
Documentation/Makefile
+1
-9
@@ -151,21 +151,13 @@ endif
151
152
#
153
# For docbook-xsl ...
154
-# -1.71.0, not supported
155
-# 1.71.1, set ASCIIDOC_ROFF?
154
+# -1.71.1, not supported
155
# 1.72.0, set DOCBOOK_XSL_172.
156
# 1.73.0-, no extra settings are needed
157
#
158
159
ifdef DOCBOOK_XSL_172
161
-ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
160
MANPAGE_XSL = manpage-1.72.xsl
163
-else
164
- ifndef ASCIIDOC_ROFF
165
- # docbook-xsl after 1.72 needs the regular XSL, but will not
166
- # pass-thru raw roff codes from asciidoc.conf, so turn them off.
167
- ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
168
- endif
161
endif
162
ifndef NO_MAN_BOLD_LITERAL
163
XMLTO_EXTRA += -m manpage-bold-literal.xsl
Documentation/asciidoc.conf
-19
@@ -31,24 +31,6 @@ ifdef::backend-docbook[]
31
endif::backend-docbook[]
32
33
ifdef::backend-docbook[]
34
-ifndef::git-asciidoc-no-roff[]
35
-# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
36
-# v1.72 breaks with this because it replaces dots not in roff requests.
37
-[listingblock]
38
-<example><title>{title}</title>
39
-<literallayout class="monospaced">
40
-ifdef::doctype-manpage[]
41
- .ft C
42
-endif::doctype-manpage[]
43
-|
44
-ifdef::doctype-manpage[]
45
- .ft
46
-endif::doctype-manpage[]
47
-</literallayout>
48
-{title#}</example>
49
-endif::git-asciidoc-no-roff[]
50
-
51
-ifdef::git-asciidoc-no-roff[]
34
ifdef::doctype-manpage[]
35
# The following two small workarounds insert a simple paragraph after screen
36
[listingblock]
@@ -67,7 +49,6 @@ ifdef::doctype-manpage[]
49
{title#}</para></formalpara>
50
{title%}<simpara></simpara>
51
endif::doctype-manpage[]
70
-endif::git-asciidoc-no-roff[]
52
endif::backend-docbook[]
53
54
ifdef::doctype-manpage[]
INSTALL
+1
-1
@@ -206,7 +206,7 @@ Issues of note:
206
clone two separate git-htmldocs and git-manpages repositories next
207
to the clone of git itself.
208
209
- The minimum supported version of docbook-xsl is 1.71.1.
209
+ The minimum supported version of docbook-xsl is 1.72.
210
It has been reported that docbook-xsl version 1.72 and 1.73 are
211
buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
212
the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
Makefile
-3
@@ -285,9 +285,6 @@ all::
285
# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
286
# (not v1.73 or v1.71).
287
#
288
-# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives
289
-# (versions 1.68.1 through v1.72).
290
-#
288
# Define GNU_ROFF if your target system uses GNU groff. This forces
289
# apostrophes to be ASCII so that cut&pasting examples to the shell
290
# will work.