Skip to content

Commit e86f67f

Browse files
ndwndw
authored
Merge pull request #549 from ndw/simplesect
Fix simplesect titles
2 parents 5e95601 + 02230bf commit e86f67f

File tree

4 files changed

+53
-3
lines changed

4 files changed

+53
-3
lines changed

‎src/main/xslt/modules/templates.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,56 @@
451451
</header>
452452
</db:section>
453453

454+
<!-- h5/h6 is small enough ... -->
455+
<db:simplesect
456+
context="parent::db:section/parent::db:section/parent::db:section
457+
|parent::db:sect3|parent::db:sect4|parent::db:sect5">
458+
<header>
459+
<tmp:apply-templates select="db:title">
460+
<h5><tmp:content/></h5>
461+
</tmp:apply-templates>
462+
<tmp:apply-templates select="db:subtitle">
463+
<h6><tmp:content/></h6>
464+
</tmp:apply-templates>
465+
</header>
466+
</db:simplesect>
467+
468+
<db:simplesect
469+
context="parent::db:section/parent::db:section
470+
|parent::db:sect2">
471+
<header>
472+
<tmp:apply-templates select="db:title">
473+
<h4><tmp:content/></h4>
474+
</tmp:apply-templates>
475+
<tmp:apply-templates select="db:subtitle">
476+
<h5><tmp:content/></h5>
477+
</tmp:apply-templates>
478+
</header>
479+
</db:simplesect>
480+
481+
<db:simplesect context="parent::db:section
482+
|parent::db:sect1">
483+
<header>
484+
<tmp:apply-templates select="db:title">
485+
<h3><tmp:content/></h3>
486+
</tmp:apply-templates>
487+
<tmp:apply-templates select="db:subtitle">
488+
<h4><tmp:content/></h4>
489+
</tmp:apply-templates>
490+
</header>
491+
</db:simplesect>
492+
493+
<db:simplesect>
494+
<header>
495+
<tmp:apply-templates select="db:title">
496+
<h2><tmp:content/></h2>
497+
</tmp:apply-templates>
498+
<tmp:apply-templates select="db:subtitle">
499+
<h3><tmp:content/></h3>
500+
</tmp:apply-templates>
501+
</header>
502+
</db:simplesect>
503+
454504
<db:refsect3>
455505
<header>
456506
<tmp:apply-templates select="db:title">

‎src/test/resources/expected/section.005.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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: section.005</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: section.005</h1><h2>Deeply nested sections with subtitles</h2><div class="author"><h3><span class="first-last personname"><span class="firstname">Michael</span> <span class="surname">Smith</span></span></h3></div></header><div class="list-of-titles"><div class="lot toc"><div class="title">Table of Contents</div><ul class="toc"><li><a href="#c2s1"><span class="label">1</span><span class="sep">. </span>Section 1</a><ul class="toc"><li><a href="#c2s1s1"><span class="label">1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1</a><ul class="toc"><li><a href="#c2s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1</a><ul class="toc"><li><a href="#c2s1s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1</a><ul class="toc"><li><a href="#c2s1s1s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.1</a></li><li><a href="#c2s1s1s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.1.2</a><ul class="toc"><li><a href="#c2s1s1s1s1s2s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.2.1</a></li></ul></li><li><a href="#c2s1s1s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.1.3</a></li></ul></li><li><a href="#c2s1s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.2</a></li><li><a href="#c2s1s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.3</a></li></ul></li><li><a href="#c2s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.2</a></li><li><a href="#c2s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.3</a></li></ul></li><li><a href="#c2s1s2"><span class="label">1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.2</a></li><li><a href="#c2s1s3"><span class="label">1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.3</a></li></ul></li></ul></div></div><div class="db-bfs"><p>See <a href="#c2s1s1s2" class="xref xref-section">Section <span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span>, “Section 1.1.2”</a>.</p></div><section id="c2s1" class="section"><header><h2><span class="label">1</span><span class="sep">. </span>Section 1</h2><h3>Subtitle</h3></header><p>blah.</p><section id="c2s1s1" class="section"><header><h3><span class="label">1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1</h3><h4>Subtitle</h4></header><p>blah.</p><section id="c2s1s1s1" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1</h4><h5>Subtitle</h5></header><p>blah.</p><section id="c2s1s1s1s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.1</h5><h6>Subtitle</h6></header><p>blah.</p></section><section id="c2s1s1s1s1s2" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.1.2</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s2s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.2.1</h5><h6>Subtitle</h6></header><p>blah.</p></section></section><section id="c2s1s1s1s1s3" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.1.3</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s3s1" class="simplesect"><header><div class="title">Section 1.1.1.1.3.1</div></header><p>blah.</p></section></section></section><section id="c2s1s1s1s2" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.2</h5><h6>Subtitle</h6></header><p>blah.</p></section><section id="c2s1s1s1s3" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.3</h5><h6>Subtitle</h6></header><p>blah.</p></section></section><section id="c2s1s1s2" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.2</h4><h5>Subtitle</h5></header><p>blah.</p></section><section id="c2s1s1s3" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.3</h4><h5>Subtitle</h5></header><p>blah.</p></section></section><section id="c2s1s2" class="section"><header><h3><span class="label">1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.2</h3><h4>Subtitle</h4></header><p>blah.</p></section><section id="c2s1s3" class="section"><header><h3><span class="label">1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.3</h3><h4>Subtitle</h4></header><p>blah.</p></section></section></article></main><nav class="bottom"></nav></body></html>
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: section.005</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: section.005</h1><h2>Deeply nested sections with subtitles</h2><div class="author"><h3><span class="first-last personname"><span class="firstname">Michael</span> <span class="surname">Smith</span></span></h3></div></header><div class="list-of-titles"><div class="lot toc"><div class="title">Table of Contents</div><ul class="toc"><li><a href="#c2s1"><span class="label">1</span><span class="sep">. </span>Section 1</a><ul class="toc"><li><a href="#c2s1s1"><span class="label">1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1</a><ul class="toc"><li><a href="#c2s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1</a><ul class="toc"><li><a href="#c2s1s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1</a><ul class="toc"><li><a href="#c2s1s1s1s1s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.1</a></li><li><a href="#c2s1s1s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.1.2</a><ul class="toc"><li><a href="#c2s1s1s1s1s2s1"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.2.1</a></li></ul></li><li><a href="#c2s1s1s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.1.3</a></li></ul></li><li><a href="#c2s1s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.2</a></li><li><a href="#c2s1s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.3</a></li></ul></li><li><a href="#c2s1s1s2"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.2</a></li><li><a href="#c2s1s1s3"><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.3</a></li></ul></li><li><a href="#c2s1s2"><span class="label">1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.2</a></li><li><a href="#c2s1s3"><span class="label">1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.3</a></li></ul></li></ul></div></div><div class="db-bfs"><p>See <a href="#c2s1s1s2" class="xref xref-section">Section <span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span>, “Section 1.1.2”</a>.</p></div><section id="c2s1" class="section"><header><h2><span class="label">1</span><span class="sep">. </span>Section 1</h2><h3>Subtitle</h3></header><p>blah.</p><section id="c2s1s1" class="section"><header><h3><span class="label">1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1</h3><h4>Subtitle</h4></header><p>blah.</p><section id="c2s1s1s1" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1</h4><h5>Subtitle</h5></header><p>blah.</p><section id="c2s1s1s1s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.1</h5><h6>Subtitle</h6></header><p>blah.</p></section><section id="c2s1s1s1s1s2" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.1.2</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s2s1" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2<span class="sep">.</span>1</span><span class="sep">. </span>Section 1.1.1.1.2.1</h5><h6>Subtitle</h6></header><p>blah.</p></section></section><section id="c2s1s1s1s1s3" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.1.3</h5><h6>Subtitle</h6></header><p>blah.</p><section id="c2s1s1s1s1s3s1" class="simplesect"><header><h5>Section 1.1.1.1.3.1</h5><h6>Subtitle</h6></header><p>blah.</p></section></section></section><section id="c2s1s1s1s2" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.1.2</h5><h6>Subtitle</h6></header><p>blah.</p></section><section id="c2s1s1s1s3" class="section"><header><h5><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.1.3</h5><h6>Subtitle</h6></header><p>blah.</p></section></section><section id="c2s1s1s2" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.1.2</h4><h5>Subtitle</h5></header><p>blah.</p></section><section id="c2s1s1s3" class="section"><header><h4><span class="label">1<span class="sep">.</span>1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.1.3</h4><h5>Subtitle</h5></header><p>blah.</p></section></section><section id="c2s1s2" class="section"><header><h3><span class="label">1<span class="sep">.</span>2</span><span class="sep">. </span>Section 1.2</h3><h4>Subtitle</h4></header><p>blah.</p></section><section id="c2s1s3" class="section"><header><h3><span class="label">1<span class="sep">.</span>3</span><span class="sep">. </span>Section 1.3</h3><h4>Subtitle</h4></header><p>blah.</p></section></section></article></main><nav class="bottom"></nav></body></html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>Chapter 1. Chapter wrapper</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="chapter component"><header><h1>Chapter <span class="label">1</span><span class="sep">. </span>Chapter wrapper</h1></header><div class="db-bfs"><p>This test case is for simplesect.</p></div><section id="R_s1" class="section"><header><h2><span class="label">1</span><span class="sep">. </span>A Section Title</h2></header><p>Some content <span class="acronym">here</span>.</p><section class="simplesect"><header><div class="title">First Simplesect</div></header><p>Some content</p></section></section><section id="R_s2" class="section"><header><h2><span class="label">2</span><span class="sep">. </span>Another Section Title</h2></header><p>Some content</p><section id="R_s2_s1" class="section"><header><h3><span class="label">2<span class="sep">.</span>1</span><span class="sep">. </span>A Subsection Title</h3></header><p>Some content</p><section class="simplesect"><header><div class="title">Second Simplesect</div></header><p>Some content</p></section></section></section></article></main><nav class="bottom"></nav></body></html>
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>Chapter 1. Chapter wrapper</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="chapter component"><header><h1>Chapter <span class="label">1</span><span class="sep">. </span>Chapter wrapper</h1></header><div class="db-bfs"><p>This test case is for simplesect.</p></div><section id="R_s1" class="section"><header><h2><span class="label">1</span><span class="sep">. </span>A Section Title</h2></header><p>Some content <span class="acronym">here</span>.</p><section class="simplesect"><header><h3>First Simplesect</h3></header><p>Some content</p></section></section><section id="R_s2" class="section"><header><h2><span class="label">2</span><span class="sep">. </span>Another Section Title</h2></header><p>Some content</p><section id="R_s2_s1" class="section"><header><h3><span class="label">2<span class="sep">.</span>1</span><span class="sep">. </span>A Subsection Title</h3></header><p>Some content</p><section class="simplesect"><header><h4>Second Simplesect</h4><h5>Subtitle</h5></header><p>Some content</p></section></section></section></article></main><nav class="bottom"></nav></body></html>

0 commit comments

Comments
 (0)