@matheusbsbs / matheus-bagliano / commits / def3ce00ae
Fork 0

Doc: drop support for docbook-xsl before 1.71.1

Drop the DOCBOOK_SUPPRESS_SP mechanism, which needs to be used with docbook-xsl versions 1.69.1 through 1.71.0. We probably broke this for Asciidoctor builds in f6461b82b9 ("Documentation: fix build with Asciidoctor 2", 2019-09-15). That is, we should/could fix this similar to 55aca515eb ("manpage-bold-literal.xsl: match for namespaced "d:literal" in template", 2019-10-31). But rather than digging out such an old version of docbook-xsl to test that, let's just use this as an excuse for dropping this decade-old workaround. DOCBOOK_SUPPRESS_SP was not needed with docbook-xsl 1.69.0 and older. Maybe such old versions still work fine on our docs, or maybe not. Let's just refer to everything before 1.71.1 as "not supported". 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 def3ce00aebc3d30df34393518a38f334875a4c3
3 files changed +2 -27
Documentation/Makefile
+1 -6
@@ -151,9 +151,7 @@ endif
151
152 #
153 # For docbook-xsl ...
154 -# -1.68.1, no extra settings are needed?
155 -# 1.69.0, set ASCIIDOC_ROFF?
156 -# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP?
154 +# -1.71.0, not supported
155 # 1.71.1, set ASCIIDOC_ROFF?
156 # 1.72.0, set DOCBOOK_XSL_172.
157 # 1.73.0-, no extra settings are needed
@@ -172,9 +170,6 @@ endif
170 ifndef NO_MAN_BOLD_LITERAL
171 XMLTO_EXTRA += -m manpage-bold-literal.xsl
172 endif
175 -ifdef DOCBOOK_SUPPRESS_SP
176 -XMLTO_EXTRA += -m manpage-suppress-sp.xsl
177 -endif
173
174 # Newer DocBook stylesheet emits warning cruft in the output when
175 # this is not set, and if set it shows an absolute link. Older
Documentation/manpage-suppress-sp.xsl deleted
-21
@@ -1,21 +0,0 @@
1 -<!-- manpage-suppress-sp.xsl:
2 - special settings for manpages rendered from asciidoc+docbook
3 - handles erroneous, inline .sp in manpage output of some
4 - versions of docbook-xsl -->
5 -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
6 - version="1.0">
7 -
8 -<!-- attempt to work around spurious .sp at the tail of the line
9 - that some versions of docbook stylesheets seem to add -->
10 -<xsl:template match="simpara">
11 - <xsl:variable name="content">
12 - <xsl:apply-templates/>
13 - </xsl:variable>
14 - <xsl:value-of select="normalize-space($content)"/>
15 - <xsl:if test="not(ancestor::authorblurb) and
16 - not(ancestor::personblurb)">
17 - <xsl:text>&#10;&#10;</xsl:text>
18 - </xsl:if>
19 -</xsl:template>
20 -
21 -</xsl:stylesheet>
INSTALL
+1
@@ -206,6 +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.
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