Skip to content

Commit

Permalink
Merge pull request #146 from ndw/master
Browse files Browse the repository at this point in the history 
Remove <code> from literallayout and address output
  • Loading branch information
@ndw
ndw authored Oct 27, 2019
2 parents 3b9f692 + 39e3339 commit 2481ab9
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.4.2
version=2.4.3
saxonVersion=9.9.1-5
xmlCalabashVersion=1.1.28-99
resourcesVersion=2.1.1
Expand Down
8 changes: 4 additions & 4 deletions src/test/expected-html/address.001.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Article wrapper</title><meta charset="utf-8" /><meta name="generator" content="DocBook XSL 2.0 Stylesheets V2.3.17" /><link href="../resources/css/default.css" rel="stylesheet" type="text/css" /><link href="../resources/css/db-prism.css" rel="stylesheet" type="text/css" /><script type="text/javascript" src="../resources/js/dbmodnizr.js"></script></head><body><article id="R.1" class="article"><header class="article-titlepage"><h2>Article wrapper</h2></header><div class="content"><p>An address:</p><pre class="address language-none"><code><span class="personname">Santa Clause</span>
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Article wrapper</title><meta charset="utf-8" /><meta name="generator" content="DocBook XSL 2.0 Stylesheets V2.4.2" /><link href="../resources/css/default.css" rel="stylesheet" type="text/css" /><link href="../resources/css/db-prism.css" rel="stylesheet" type="text/css" /><script type="text/javascript" src="../resources/js/dbmodnizr.js"></script></head><body><article id="R.1" class="article"><header class="article-titlepage"><h2>Article wrapper</h2></header><div class="content"><p>An address:</p><pre class="address language-none"><span class="personname">Santa Clause</span>
<span class="street">1 Main Street</span>
<span class="city">North Pole</span>, <span class="state">AK</span> <span class="postcode">12345</span>
<span class="country">US</span></code></pre><p>Other address fields:</p><pre class="address language-none"><code>Information:
<span class="country">US</span></pre><p>Other address fields:</p><pre class="address language-none">Information:
<span class="phone">+1-914-555-1212</span>
<span class="fax">+1-213-555-1212</span>
<code class="email">&lt;<a href="mailto:[email protected]">[email protected]</a>&gt;</code>
<code class="uri">http://www.example.com/</code></code></pre><p>With a PO Box:</p><pre class="address language-none"><code><span class="otheraddr whynotorgname">Some Company</span>
<code class="uri">http://www.example.com/</code></pre><p>With a PO Box:</p><pre class="address language-none"><span class="otheraddr whynotorgname">Some Company</span>
<span class="pob">P.O. Box 123</span>
<span class="city">Anytown</span>, <span class="state">XX</span> <span class="postcode">12345</span>
</code></pre></div></article><script src="../resources/js/prism.js"></script></body></html>
</pre></div></article><script src="../resources/js/prism.js"></script></body></html>
4 changes: 2 additions & 2 deletions src/test/expected-html/footnote.002.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Article wrapper</title><meta charset="utf-8" /><meta name="generator" content="DocBook XSL 2.0 Stylesheets V2.3.17" /><link href="../resources/css/default.css" rel="stylesheet" type="text/css" /><link href="../resources/css/db-prism.css" rel="stylesheet" type="text/css" /><script type="text/javascript" src="../resources/js/dbmodnizr.js"></script></head><body><article id="R.1" class="article"><header class="article-titlepage"><h2>Article wrapper</h2></header><div class="content"><p>This paragraph contains a footnote<sup class="footnote"><span class="osq">[</span><a id="R.1.2.1" href="#ftn.R.1.2.1">1</a><span class="csq">]</span></sup>.</p><figure id="R.1.3" class="table-wrapper"><div class="title">Table 1. A table</div><div class="table"><table border="0" summary="Table 1. A table" style="border-collapse: collapse;border-top: 1px solid ; border-bottom: 1px solid ; border-left: 1px solid ; border-right: 1px solid ; "><colgroup><col class="tcol1" width="33%" /><col class="tcol2" width="33%" /><col class="tcol3" width="33%" /></colgroup><tbody><tr><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell</td><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.1.2.1" href="#ftn.R.1.3.2.1.1.2.1">a</a><span class="csq">]</span></sup></td><td style="border-bottom: 1px solid ; ">A Cell</td></tr><tr><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.2.1.1" href="#ftn.R.1.3.2.1.2.1.1">b</a><span class="csq">]</span></sup></td><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell</td><td style="border-bottom: 1px solid ; ">A Cell</td></tr><tr><td style="border-right: 1px solid ; ">A Cell</td><td style="border-right: 1px solid ; ">A Cell</td><td>A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.3.3.1" href="#ftn.R.1.3.2.1.3.3.1">c</a><span class="csq">]</span></sup></td></tr></tbody><tbody class="footnotes"><tr><td colspan="3"><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.1.2.1" id="ftn.R.1.3.2.1.1.2.1">a</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><p>First footnote.</p></div></div></div><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.2.1.1" id="ftn.R.1.3.2.1.2.1.1">b</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><p>Second footnote.</p></div></div></div><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.3.3.1" id="ftn.R.1.3.2.1.3.3.1">c</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><pre class="address language-none"><code>100 Any Street
East Yahoo, XX</code></pre></div></div></div></td></tr></tbody></table></div></figure><p>This is a longer paragraph. It will eventually contain a footnote, but first
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Article wrapper</title><meta charset="utf-8" /><meta name="generator" content="DocBook XSL 2.0 Stylesheets V2.4.2" /><link href="../resources/css/default.css" rel="stylesheet" type="text/css" /><link href="../resources/css/db-prism.css" rel="stylesheet" type="text/css" /><script type="text/javascript" src="../resources/js/dbmodnizr.js"></script></head><body><article id="R.1" class="article"><header class="article-titlepage"><h2>Article wrapper</h2></header><div class="content"><p>This paragraph contains a footnote<sup class="footnote"><span class="osq">[</span><a id="R.1.2.1" href="#ftn.R.1.2.1">1</a><span class="csq">]</span></sup>.</p><figure id="R.1.3" class="table-wrapper"><div class="title">Table 1. A table</div><div class="table"><table border="0" summary="Table 1. A table" style="border-collapse: collapse;border-top: 1px solid ; border-bottom: 1px solid ; border-left: 1px solid ; border-right: 1px solid ; "><colgroup><col class="tcol1" width="33%" /><col class="tcol2" width="33%" /><col class="tcol3" width="33%" /></colgroup><tbody><tr><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell</td><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.1.2.1" href="#ftn.R.1.3.2.1.1.2.1">a</a><span class="csq">]</span></sup></td><td style="border-bottom: 1px solid ; ">A Cell</td></tr><tr><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.2.1.1" href="#ftn.R.1.3.2.1.2.1.1">b</a><span class="csq">]</span></sup></td><td style="border-right: 1px solid ; border-bottom: 1px solid ; ">A Cell</td><td style="border-bottom: 1px solid ; ">A Cell</td></tr><tr><td style="border-right: 1px solid ; ">A Cell</td><td style="border-right: 1px solid ; ">A Cell</td><td>A Cell<sup class="footnote"><span class="osq">[</span><a id="R.1.3.2.1.3.3.1" href="#ftn.R.1.3.2.1.3.3.1">c</a><span class="csq">]</span></sup></td></tr></tbody><tbody class="footnotes"><tr><td colspan="3"><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.1.2.1" id="ftn.R.1.3.2.1.1.2.1">a</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><p>First footnote.</p></div></div></div><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.2.1.1" id="ftn.R.1.3.2.1.2.1.1">b</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><p>Second footnote.</p></div></div></div><div class="footnote"><div class="footnote-wrapper"><div class="footnote-symbol-wrapper"><p><sup><span class="osq">[</span><a href="#R.1.3.2.1.3.3.1" id="ftn.R.1.3.2.1.3.3.1">c</a><span class="csq">]</span></sup> </p></div><div class="footnote-body-wrapper"><pre class="address language-none">100 Any Street
East Yahoo, XX</pre></div></div></div></td></tr></tbody></table></div></figure><p>This is a longer paragraph. It will eventually contain a footnote, but first
it has enough text to make the footnote appear in the middle of the paragraph.
This is so we can test the effect of changing the
<span class="property">line-height-shift-adjustment</span> property. This paragraph
Expand Down
Loading

0 comments on commit 2481ab9

Please sign in to comment.