Skip to content

Commit 9099290

Browse files
ndwndw
authored
Merge pull request #588 from ndw/iss-584
Support para or simpara in compact ordered and itemized lists
2 parents b6981be + 8cf35c3 commit 9099290

12 files changed

+96
-8
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<xsl:template match="db:itemizedlist">
1818
<xsl:variable name="compact" as="xs:boolean"
1919
select="@spacing = 'compact'
20-
and count(db:listitem/db:para) = count(db:listitem)
21-
and empty(db:listitem/*[not(self::db:para)])"/>
20+
and count(db:listitem/*) = count(db:listitem)
21+
and empty(db:listitem/*[not(self::db:para or self::db:simpara)])"/>
2222

2323
<xsl:choose>
2424
<xsl:when test="empty(db:info/*)
@@ -54,8 +54,8 @@
5454
<xsl:template match="db:orderedlist">
5555
<xsl:variable name="compact" as="xs:boolean"
5656
select="@spacing = 'compact'
57-
and count(db:listitem/db:para) = count(db:listitem)
58-
and empty(db:listitem/*[not(self::db:para)])"/>
57+
and count(db:listitem/*) = count(db:listitem)
58+
and empty(db:listitem/*[not(self::db:para or self::db:simpara)])"/>
5959

6060
<xsl:choose>
6161
<xsl:when test="empty(db:info/*)
@@ -149,8 +149,8 @@
149149
</xsl:choose>
150150
</xsl:if>
151151
<xsl:choose>
152-
<xsl:when test="$compact and count(*) = 1 and db:para">
153-
<xsl:apply-templates select="db:para/node()"/>
152+
<xsl:when test="$compact and count(*) = 1 and (db:para or db:simpara)">
153+
<xsl:apply-templates select="db:para/node(), db:simpara/node()"/>
154154
</xsl:when>
155155
<xsl:otherwise>
156156
<xsl:apply-templates/>

‎src/test/resources/expected/itemizedlist.013.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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: itemizedlist.013</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: itemizedlist.013</h1></header><div class="itemizedlist"><p>This is a preamble.</p><ul><li>First</li><li>Second</li><li>Third</li></ul></div></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/expected/itemizedlist.014.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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: itemizedlist.013</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: itemizedlist.013</h1></header><div class="itemizedlist"><p>This is a preamble.</p><ul><li>First</li><li>Second</li><li>Third</li></ul></div></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/expected/itemizedlist.015.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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: itemizedlist.013</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: itemizedlist.013</h1></header><div class="itemizedlist"><p>This is a preamble.</p><ul><li>First</li><li>Second</li><li>Third</li></ul></div></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/expected/orderedlist.003.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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: orderedlist.003.html</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: orderedlist.003.html</h1></header><p>Test list continuation. And cross-references;
22
item “2”: <a href="#i2" class="xref xref-listitem"><span class="label">2</span></a>,
33
item “4”: <a href="#i4" class="xref xref-listitem"><span class="label">D</span></a>, and
4-
item “5.3”: <a href="#i5.3" class="xref xref-listitem"><span class="label">E<span class="sep">.</span>c</span></a>.</p><ol class="orderedlist" type="1"><li><p class="simpara">First item</p></li><li id="i2"><p class="simpara">Second item</p></li><li><p class="simpara">Third item</p></li></ol><p>And then a break occurs...a break in my sanity, apparently,
4+
item “5.3”: <a href="#i5.3" class="xref xref-listitem"><span class="label">E<span class="sep">.</span>c</span></a>.</p><ol class="orderedlist" type="1"><li>First item</li><li id="i2">Second item</li><li>Third item</li></ol><p>And then a break occurs...a break in my sanity, apparently,
55
because changing the numeration style across a “continues” break seems
66
really stupid. But this a unit test, after all. Stupid is
7-
allowed.</p><ol class="orderedlist" start="4" type="A"><li id="i4"><p class="simpara">Fourth item</p></li><li><p class="simpara">Fifth item</p><ol class="orderedlist" type="a"><li><p class="simpara">Fifth/First item</p></li><li><p class="simpara">Fifth/Second item</p></li><li id="i5.3"><p class="simpara">Fifth/Third item</p></li></ol></li><li><p class="simpara">Sixth item</p></li></ol></article></main><nav class="bottom"></nav></body></html>
7+
allowed.</p><ol class="orderedlist" start="4" type="A"><li id="i4"><p class="simpara">Fourth item</p></li><li><p class="simpara">Fifth item</p><ol class="orderedlist" type="a"><li>Fifth/First item</li><li>Fifth/Second item</li><li id="i5.3">Fifth/Third item</li></ol></li><li><p class="simpara">Sixth item</p></li></ol></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/expected/orderedlist.008mix.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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: orderedlist.008</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: orderedlist.008</h1></header><ol class="orderedlist" type="1"><li>First</li><li>Second</li><li>Third</li></ol></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/expected/orderedlist.008sim.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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: orderedlist.008</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: orderedlist.008</h1></header><ol class="orderedlist" type="1"><li>First</li><li>Second</li><li>Third</li></ol></article></main><nav class="bottom"></nav></body></html>

‎src/test/resources/xml/itemizedlist.013.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<article xmlns="http://docbook.org/ns/docbook">
3+
<title>Unit Test: itemizedlist.013</title>
4+
<itemizedlist spacing="compact">
5+
<info/>
6+
<para>This is a preamble.</para>
7+
<listitem>
8+
<para>First</para>
9+
</listitem>
10+
<listitem>
11+
<para>Second</para>
12+
</listitem>
13+
<listitem>
14+
<para>Third</para>
15+
</listitem>
16+
</itemizedlist>
17+
</article>

‎src/test/resources/xml/itemizedlist.014.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<article xmlns="http://docbook.org/ns/docbook">
3+
<title>Unit Test: itemizedlist.013</title>
4+
<itemizedlist spacing="compact">
5+
<info/>
6+
<para>This is a preamble.</para>
7+
<listitem>
8+
<simpara>First</simpara>
9+
</listitem>
10+
<listitem>
11+
<simpara>Second</simpara>
12+
</listitem>
13+
<listitem>
14+
<simpara>Third</simpara>
15+
</listitem>
16+
</itemizedlist>
17+
</article>

‎src/test/resources/xml/itemizedlist.015.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<article xmlns="http://docbook.org/ns/docbook">
3+
<title>Unit Test: itemizedlist.013</title>
4+
<itemizedlist spacing="compact">
5+
<info/>
6+
<para>This is a preamble.</para>
7+
<listitem>
8+
<simpara>First</simpara>
9+
</listitem>
10+
<listitem>
11+
<para>Second</para>
12+
</listitem>
13+
<listitem>
14+
<simpara>Third</simpara>
15+
</listitem>
16+
</itemizedlist>
17+
</article>

‎src/test/resources/xml/orderedlist.008mix.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<article xmlns="http://docbook.org/ns/docbook">
3+
<title>Unit Test: orderedlist.008</title>
4+
<orderedlist spacing="compact">
5+
<info/>
6+
<listitem>
7+
<para>First</para>
8+
</listitem>
9+
<listitem>
10+
<simpara>Second</simpara>
11+
</listitem>
12+
<listitem>
13+
<simpara>Third</simpara>
14+
</listitem>
15+
</orderedlist>
16+
</article>

‎src/test/resources/xml/orderedlist.008sim.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<article xmlns="http://docbook.org/ns/docbook">
3+
<title>Unit Test: orderedlist.008</title>
4+
<orderedlist spacing="compact">
5+
<info/>
6+
<listitem>
7+
<simpara>First</simpara>
8+
</listitem>
9+
<listitem>
10+
<simpara>Second</simpara>
11+
</listitem>
12+
<listitem>
13+
<simpara>Third</simpara>
14+
</listitem>
15+
</orderedlist>
16+
</article>

0 commit comments

Comments
 (0)