diff options
author | Peter Eisentraut | 2024-02-08 10:37:11 +0000 |
---|---|---|
committer | Peter Eisentraut | 2024-02-08 10:38:46 +0000 |
commit | 5869aef9a15d5dc0b4de3d63d1ae360a6f34afb4 (patch) | |
tree | 3243edcfd827ea7a71d481d615ce528829874d71 /doc/src | |
parent | 254361cf1aec4570a7022160f20fa505a876ed0e (diff) |
Fix documentation build with older docbook-xsl
Commit b0f0a9432d0 backpatched some code from upstream DocBook XSL to
our customization layer. It turned out that this failed to work with
anything but the latest DocBook XSL upstream version (1.79.*), because
the backpatched code references an XSLT parameter (autolink.index.see)
that is not defined in earlier versions (because the feature it is
used for did not exist yet).
There is no way in XSLT to test whether a parameter is declared before
the stylesheet processor tries and fails to access it. So the
possibilities to fix this would be to either remove the code that uses
the parameter (and thus give up on the feature it is used for) or
declare the parameter in our customization layer. The latter seems
easier, and with a few more lines of code we can backport the entire
autolink.index.see feature, so let's do that. (If we didn't, then
with older stylesheets the parameter will appear as on, but it won't
actually do anything, because of the way the stylesheets are laid out,
so it's less confusing to just make it work.)
With this, the documentation build should work again with docbook-xsl
versions 1.77.*, 1.78.*, and 1.79.* (which already worked before).
Version 1.76.1 already didn't work before all this, so was not
considered here.
Reported-by: Peter Smith <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/[email protected]
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/sgml/stylesheet-common.xsl | 7 | ||||
-rw-r--r-- | doc/src/sgml/stylesheet-fo.xsl | 4 | ||||
-rw-r--r-- | doc/src/sgml/stylesheet-html-common.xsl | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/sgml/stylesheet-common.xsl b/doc/src/sgml/stylesheet-common.xsl index 5db44a846f3..a2e3db67a32 100644 --- a/doc/src/sgml/stylesheet-common.xsl +++ b/doc/src/sgml/stylesheet-common.xsl @@ -43,6 +43,13 @@ <xsl:param name="variablelist.term.separator"></xsl:param> <xsl:param name="xref.with.number.and.title" select="0"></xsl:param> +<!-- + This is the default setting, but putting it here makes sure the variable + exists even with older (<1.79) stylesheet versions, because it is used in + our customization layer. +--> +<xsl:param name="autolink.index.see" select="1"/> + <!-- Change display of some elements --> diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl index aff717ddbc7..3a4a88a7288 100644 --- a/doc/src/sgml/stylesheet-fo.xsl +++ b/doc/src/sgml/stylesheet-fo.xsl @@ -147,6 +147,10 @@ <!-- from fo/autoidx.xsl --> +<xsl:key name="primaryonly" + match="indexterm" + use="normalize-space(primary)"/> + <xsl:template match="indexterm" mode="index-primary"> <xsl:param name="scope" select="."/> <xsl:param name="role" select="''"/> diff --git a/doc/src/sgml/stylesheet-html-common.xsl b/doc/src/sgml/stylesheet-html-common.xsl index 7f541c09885..9dcf96c02e5 100644 --- a/doc/src/sgml/stylesheet-html-common.xsl +++ b/doc/src/sgml/stylesheet-html-common.xsl @@ -441,6 +441,10 @@ set toc,title <!-- from html/autoidx.xsl --> +<xsl:key name="primaryonly" + match="indexterm" + use="normalize-space(primary)"/> + <xsl:template match="indexterm" mode="index-primary"> <xsl:param name="scope" select="."/> <xsl:param name="role" select="''"/> |