Skip to content

Commit 564297b

Browse files
ndwndw
authored
Merge pull request #537 from ndw/iss-563-imports
Resolve the import precedence problems
2 parents b7c105c + fa11cf4 commit 564297b

File tree

14 files changed

+93
-68
lines changed

14 files changed

+93
-68
lines changed

‎properties.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
ext {
33
xslTNGtitle = 'DocBook xslTNG'
44
xslTNGbaseName = 'docbook-xslTNG'
5-
xslTNGversion = '2.3.0'
6-
guideVersion = '2.3.0'
5+
xslTNGversion = '2.3.1'
6+
guideVersion = '2.3.1'
77
guidePrerelease = false
88

99
docbookVersion = '5.2'

‎src/guide/xml/changelog.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,36 @@ be of interest to users of the stylesheets. See the commits and pull requests on
1010
<link xlink:href="https://github.com/docbook/xslTNG/">the repository</link> for
1111
finer detail.</para>
1212

13+
<section xml:id="r231">
14+
<info>
15+
<title>Changes in version 2.3.1</title>
16+
<productnumber>2.3.1</productnumber>
17+
<date>2024-10-24</date>
18+
</info>
19+
<itemizedlist>
20+
<listitem>
21+
<para>Reworked the <filename>main.xsl</filename> module to resolve import precedence issues;
22+
fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/536">#536</link>. This change
23+
has two visible consequences:</para>
24+
<orderedlist>
25+
<listitem>
26+
<para>The formatting of <tag>command</tag> in <tag>cmdsynopsis</tag> uses
27+
<tag namespace="http://www.w3.org/1999/xhtml">span</tag> instead of
28+
<tag namespace="http://www.w3.org/1999/xhtml">code</tag>. This was always the intent;
29+
a <tag>cmdsynopsis</tag> is already monospaced.</para>
30+
</listitem>
31+
<listitem>
32+
<para>The formatting of <tag>task</tag> elements no longer suppresses the title.
33+
I don’t imagine that was intentional, but if you use <tag>task</tag> elements with
34+
titles, make sure you’re getting the results you expect!</para>
35+
</listitem>
36+
</orderedlist>
37+
<para>It’s also <emphasis>possible</emphasis> that it will have consequences in customization
38+
layers, but I don’t think that’s the case.</para>
39+
</listitem>
40+
</itemizedlist>
41+
</section>
42+
1343
<section xml:id="r230">
1444
<info>
1545
<title>Changes in version 2.3.0</title>

‎src/guide/xsl/common.xsl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@
2424
<!-- Load the whole stylesheet; well, down to one level of nesting -->
2525
<xsl:variable name="main.xsl"
2626
select="resolve-uri('../../../build/xslt/docbook.xsl', static-base-uri())"/>
27-
<xsl:variable name="standalone.xsl"
28-
select="resolve-uri('../../../build/xslt/standalone-functions.xsl', static-base-uri())"/>
2927
<xsl:variable name="param_xsl">
3028
<main xmlns="">
3129
<xsl:apply-templates select="doc($main.xsl)/*" mode="mg:collect-imports"/>
32-
<xsl:apply-templates select="doc($standalone.xsl)/*" mode="mg:collect-imports"/>
3330
</main>
3431
</xsl:variable>
3532

@@ -1093,7 +1090,7 @@
10931090
<xsl:template match="*" mode="mg:collect-imports">
10941091
<xsl:sequence select="xsl:param"/>
10951092
<xsl:sequence select="xsl:variable"/>
1096-
<xsl:for-each select="xsl:import">
1093+
<xsl:for-each select="xsl:import|xsl:include">
10971094
<xsl:variable name="xsl" select="doc(resolve-uri(@href, base-uri(.)))"/>
10981095
<import href="{@href}">
10991096
<xsl:apply-templates select="$xsl/*" mode="mg:collect-imports"/>

‎src/main/xslt/main.xsl

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,49 @@
1717
version="3.0">
1818

1919
<xsl:import href="param.xsl"/>
20-
<xsl:import href="VERSION.xsl"/>
21-
<xsl:import href="modules/variable.xsl"/>
22-
<xsl:import href="modules/space.xsl"/>
23-
<xsl:import href="modules/unhandled.xsl"/>
24-
<xsl:import href="modules/errors.xsl"/>
25-
<xsl:import href="modules/head.xsl"/>
26-
<xsl:import href="modules/titles.xsl"/>
27-
<xsl:import href="modules/numbers.xsl"/>
28-
<xsl:import href="modules/units.xsl"/>
29-
<xsl:import href="modules/gentext.xsl"/>
30-
<xsl:import href="modules/l10n.xsl"/>
31-
<xsl:import href="modules/functions.xsl"/>
32-
<xsl:import href="modules/toc.xsl"/>
33-
<xsl:import href="modules/divisions.xsl"/>
34-
<xsl:import href="modules/components.xsl"/>
35-
<xsl:import href="modules/refentry.xsl"/>
36-
<xsl:import href="modules/bibliography.xsl"/>
37-
<xsl:import href="modules/biblio690.xsl"/>
38-
<xsl:import href="modules/glossary.xsl"/>
39-
<xsl:import href="modules/index.xsl"/>
40-
<xsl:import href="modules/sections.xsl"/>
41-
<xsl:import href="modules/templates.xsl"/>
42-
<xsl:import href="modules/titlepage.xsl"/>
43-
<xsl:import href="modules/info.xsl"/>
44-
<xsl:import href="modules/lists.xsl"/>
45-
<xsl:import href="modules/blocks.xsl"/>
46-
<xsl:import href="modules/admonitions.xsl"/>
47-
<xsl:import href="modules/programming.xsl"/>
48-
<xsl:import href="modules/msgset.xsl"/>
49-
<xsl:import href="modules/objects.xsl"/>
50-
<xsl:import href="modules/footnotes.xsl"/>
51-
<xsl:import href="modules/verbatim.xsl"/>
52-
<xsl:import href="modules/tablecals.xsl"/>
53-
<xsl:import href="modules/tablehtml.xsl"/>
54-
<xsl:import href="modules/inlines.xsl"/>
55-
<xsl:import href="modules/xlink.xsl"/>
56-
<xsl:import href="modules/links.xsl"/>
57-
<xsl:import href="modules/xref.xsl"/>
58-
<xsl:import href="modules/attributes.xsl"/>
59-
<xsl:import href="modules/publishers.xsl"/>
60-
<xsl:import href="modules/annotations.xsl"/>
20+
21+
<xsl:include href="VERSION.xsl"/>
22+
<xsl:include href="modules/variable.xsl"/>
23+
<xsl:include href="modules/space.xsl"/>
24+
<xsl:include href="modules/unhandled.xsl"/>
25+
<xsl:include href="modules/errors.xsl"/>
26+
<xsl:include href="modules/head.xsl"/>
27+
<xsl:include href="modules/titles.xsl"/>
28+
<xsl:include href="modules/numbers.xsl"/>
29+
<xsl:include href="modules/units.xsl"/>
30+
<xsl:include href="modules/gentext.xsl"/>
31+
<xsl:include href="modules/l10n.xsl"/>
32+
<xsl:include href="modules/functions.xsl"/>
33+
<xsl:include href="modules/toc.xsl"/>
34+
<xsl:include href="modules/divisions.xsl"/>
35+
<xsl:include href="modules/components.xsl"/>
36+
<xsl:include href="modules/refentry.xsl"/>
37+
<xsl:include href="modules/bibliography.xsl"/>
38+
<xsl:include href="modules/biblio690.xsl"/>
39+
<xsl:include href="modules/glossary.xsl"/>
40+
<xsl:include href="modules/index.xsl"/>
41+
<xsl:include href="modules/sections.xsl"/>
42+
<xsl:include href="modules/templates.xsl"/>
43+
<xsl:include href="modules/titlepage.xsl"/>
44+
<xsl:include href="modules/info.xsl"/>
45+
<xsl:include href="modules/lists.xsl"/>
46+
<xsl:include href="modules/blocks.xsl"/>
47+
<xsl:include href="modules/admonitions.xsl"/>
48+
<xsl:include href="modules/programming.xsl"/>
49+
<xsl:include href="modules/msgset.xsl"/>
50+
<xsl:include href="modules/objects.xsl"/>
51+
<xsl:include href="modules/footnotes.xsl"/>
52+
<xsl:include href="modules/verbatim.xsl"/>
53+
<xsl:include href="modules/tablecals.xsl"/>
54+
<xsl:include href="modules/tablehtml.xsl"/>
55+
<xsl:include href="modules/inlines.xsl"/>
56+
<xsl:include href="modules/xlink.xsl"/>
57+
<xsl:include href="modules/links.xsl"/>
58+
<xsl:include href="modules/xref.xsl"/>
59+
<xsl:include href="modules/attributes.xsl"/>
60+
<xsl:include href="modules/publishers.xsl"/>
61+
<xsl:include href="modules/annotations.xsl"/>
62+
6163
<xsl:import href="modules/chunk.xsl"/>
6264
<xsl:import href="modules/chunk-cleanup.xsl"/>
6365
<xsl:import href="modules/chunk-output.xsl"/>

‎src/main/xslt/modules/bibliography.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
</span>
240240
</xsl:template>
241241

242-
<xsl:template match="db:biblioid|db:orgname|db:orgdiv|db:bibliosource
242+
<xsl:template match="db:biblioid|db:orgdiv|db:bibliosource
243243
|db:bibliomisc|db:subtitle">
244244
<xsl:call-template name="t:inline"/>
245245
</xsl:template>

‎src/main/xslt/modules/info.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
</xsl:if>
363363
</xsl:template>
364364

365-
<xsl:template match="db:city|db:country|db:email|db:fax|db:phone
365+
<xsl:template match="db:city|db:country|db:fax|db:phone
366366
|db:pob|db:postcode|db:state|db:street|db:otheraddr">
367367
<xsl:call-template name="t:inline"/>
368368
</xsl:template>

‎src/main/xslt/modules/inlines.xsl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,6 @@
690690
</xsl:call-template>
691691
</xsl:template>
692692

693-
<xsl:template match="db:task">
694-
<xsl:call-template name="t:inline"/>
695-
</xsl:template>
696-
697693
<xsl:template match="db:templateid">
698694
<xsl:call-template name="t:inline"/>
699695
</xsl:template>

‎src/main/xslt/modules/programming.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,8 +1005,8 @@
10051005
</xsl:if>
10061006
<span>
10071007
<xsl:apply-templates select="." mode="m:attributes"/>
1008+
<xsl:apply-templates/>
10081009
</span>
1009-
<xsl:text> </xsl:text>
10101010
</xsl:template>
10111011

10121012
<xsl:template match="db:group|db:arg" name="tp:group-or-arg">

‎src/test/resources/expected/cmdsynopsis.001.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: cmdsynopsis.001</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: cmdsynopsis.001</h1></header><section id="minimal" class="component refentry"><div id="minimal_refnamediv1" class="refnamediv"><header><h2>Name</h2></header><p><span class="refname">cccp</span><span class="refname-sep">, </span><span class="refname">zzzzzzp</span><span class="refpurpose"><span class="refpurpose-sep"> — </span><span class="refpurpose-text">The C++/ZZZ++ preprocessors</span><span class="refpurpose-punc">.</span></span></p></div><section id="minimal_refsynopsisdiv1" class="refsynopsisdiv"><header><h2>Synopsis</h2></header><div class="cmdsynopsis"><code class="command">cccp</code> <span class="arg">
1+
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: cmdsynopsis.001</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: cmdsynopsis.001</h1></header><section id="minimal" class="component refentry"><div id="minimal_refnamediv1" class="refnamediv"><header><h2>Name</h2></header><p><span class="refname">cccp</span><span class="refname-sep">, </span><span class="refname">zzzzzzp</span><span class="refpurpose"><span class="refpurpose-sep"> — </span><span class="refpurpose-text">The C++/ZZZ++ preprocessors</span><span class="refpurpose-punc">.</span></span></p></div><section id="minimal_refsynopsisdiv1" class="refsynopsisdiv"><header><h2>Synopsis</h2></header><div class="cmdsynopsis"><span class="command">cccp</span> <span class="arg">
22
<code class="option">--path "<em class="option replaceable">PATHS</em>"</code>
33
</span> <span class="cmdpunct">[</span><span class="arg">-$</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-C</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-D<em class="replaceable">name</em>
44
<span class="cmdpunct">[</span><span class="arg">=<em class="replaceable">definition</em>
@@ -13,7 +13,7 @@
1313
<em class="replaceable">infile</em>
1414
</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-</span><span class="cmdpunct">]</span></span><span class="cmdpunct">}</span> <span class="cmdpunct">{</span><span class="group"><span class="cmdpunct">[</span><span class="arg">
1515
<em class="replaceable">outfile</em>
16-
</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-</span><span class="cmdpunct">]</span></span><span class="cmdpunct">}</span><div id="langs" class="synopfragment"><span class="synopfragmentref-number">①</span> <span class="group"><span class="cmdpunct">[</span><span class="arg">-lang-c</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-lang-c++</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-lang-objc</span><span class="cmdpunct">]</span></span></div><div id="warn" class="synopfragment"><span class="synopfragmentref-number">②</span> <span class="cmdpunct">[</span><span class="arg">-Wtrigraphs</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wcomment</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wall</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wtraditional</span><span class="cmdpunct">]</span></div></div><div class="cmdsynopsis"><code class="command">zzzzzzp</code> <span class="cmdpunct">[</span><span class="arg">-$</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-C</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-D<em class="replaceable">name</em>
16+
</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-</span><span class="cmdpunct">]</span></span><span class="cmdpunct">}</span><div id="langs" class="synopfragment"><span class="synopfragmentref-number">①</span> <span class="group"><span class="cmdpunct">[</span><span class="arg">-lang-c</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-lang-c++</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-lang-objc</span><span class="cmdpunct">]</span></span></div><div id="warn" class="synopfragment"><span class="synopfragmentref-number">②</span> <span class="cmdpunct">[</span><span class="arg">-Wtrigraphs</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wcomment</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wall</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-Wtraditional</span><span class="cmdpunct">]</span></div></div><div class="cmdsynopsis"><span class="command">zzzzzzp</span> <span class="cmdpunct">[</span><span class="arg">-$</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-C</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-D<em class="replaceable">name</em>
1717
<span class="cmdpunct">[</span><span class="arg">=<em class="replaceable">definition</em>
1818
</span><span class="cmdpunct">]</span>
1919
</span><span class="cmdpunct">…</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-dD</span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="arg">-dM</span><span class="cmdpunct">]</span><br/> <span class="cmdpunct">[</span><span class="arg">-I <em class="replaceable">directory</em>

‎src/test/resources/expected/cmdsynopsis.002.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit Test: cmdsynopsis.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit Test: cmdsynopsis.002</h1><div class="author"><h3><span class="first-last personname"><span class="firstname">Adam</span> <span class="surname">Di Carlo</span></span></h3></div></header><p>
22
Lets refer to <a href="#foo" class="xref xref-refentry"><span class="label">testing</span></a>.
33
</p><section id="foo" class="component refentry"><div id="foo_refnamediv1" class="refnamediv"><header><h2>Name</h2></header><p><span class="refname">testing</span><span class="refpurpose"><span class="refpurpose-sep"> — </span><span class="refpurpose-text">Testing more cmdsynopsis stuff, esp. permutations of grouped
4-
arguments</span><span class="refpurpose-punc">.</span></span></p></div><section id="foo_refsynopsisdiv1" class="refsynopsisdiv"><header><h2>Synopsis</h2></header><div class="cmdsynopsis"><code class="command">foo</code> <span class="cmdpunct">[</span><span class="group"><span class="cmdpunct">[</span><span class="arg">-foo</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-bar</span><span class="cmdpunct">]</span></span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="group"><span class="cmdpunct">[</span><span class="arg">-re</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-peat</span><span class="cmdpunct">]</span></span><span class="cmdpunct">…</span><span class="cmdpunct">]</span></div></section><section id="foo_rs1_1" class="refsect1"><header><h2>Description</h2></header><p>This is a dummy description.</p></section></section></article></main><nav class="bottom"></nav></body></html>
4+
arguments</span><span class="refpurpose-punc">.</span></span></p></div><section id="foo_refsynopsisdiv1" class="refsynopsisdiv"><header><h2>Synopsis</h2></header><div class="cmdsynopsis"><span class="command">foo</span> <span class="cmdpunct">[</span><span class="group"><span class="cmdpunct">[</span><span class="arg">-foo</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-bar</span><span class="cmdpunct">]</span></span><span class="cmdpunct">]</span> <span class="cmdpunct">[</span><span class="group"><span class="cmdpunct">[</span><span class="arg">-re</span><span class="cmdpunct">]</span><span class="cmdpunct"> | </span> <span class="cmdpunct">[</span><span class="arg">-peat</span><span class="cmdpunct">]</span></span><span class="cmdpunct">…</span><span class="cmdpunct">]</span></div></section><section id="foo_rs1_1" class="refsect1"><header><h2>Description</h2></header><p>This is a dummy description.</p></section></section></article></main><nav class="bottom"></nav></body></html>

0 commit comments

Comments
 (0)