Skip to content

Commit

Permalink
Add the xlink span wrapper to the expected results
Browse files Browse the repository at this point in the history
  • Loading branch information
@ndw
ndw committed Jul 20, 2020
1 parent 3228955 commit 2e96312
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/test/resources/expected/fit.001.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<span class="line" db-line="13"><span class="ln"></span><span class="ld"><code> <span class="nt">&lt;link</span> <span class="na">xlink:to=</span><span class="s">"target"</span> <span class="na">xlink:from=</span><span class="s">"source"</span> <span class="na">xlink:type=</span><span class="s">"arc"</span><span class="nt">/&gt;</span></code></span></span>
<span class="line" db-line="14"><span class="ln"></span><span class="ld"><code><span class="nt">&lt;/phrase&gt;</span></code></span></span>
</pre></div><p>With JavaScript enabled, this link to
<i class="citetitle"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="xlink_para2_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="xlink_para2_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i> has a popup menu to select the link target. Rendered without JavaScript,
<i class="citetitle"><span class="xlink"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="xlink_para2_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="xlink_para2_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i> has a popup menu to select the link target. Rendered without JavaScript,
the link choices are presented as alternatives after the link.
<span class="phrase">In print media, the link URIs are also shown in
parenthesis.</span></p></div><div id="pdf" class="appendix"><header><h2><span class="label">Appendix<span class="sep"> </span></span><span class="number">A<span class="sep">. </span></span>Paged media support</h2></header><p>The <i class="citetitle">DocBook xslTNG Stylesheets</i> anticipate
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/expected/xlink.001.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Inline extended XLink</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="http://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"/><link href="./css/docbook-screen.css" rel="stylesheet"/></head><body class="home"><nav class="top"></nav><main><article class="article"><header><h1>Inline extended XLink</h1></header><p>What about
<i class="citetitle"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para1_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para1_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i>?
<i class="citetitle"><span class="xlink"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para1_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para1_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i>?
</p></article></main><nav class="bottom"></nav></body></html>
6 changes: 3 additions & 3 deletions src/test/resources/expected/xlink.002.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Extended XLink</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="http://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"/><link href="./css/docbook-screen.css" rel="stylesheet"/></head><body class="home"><nav class="top"></nav><main><article class="article"><header><h1>Extended XLink</h1></header><p>What about
<i class="citetitle"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para1_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para1_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i>
<i class="citetitle"><span class="xlink"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para1_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para1_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i>
and
<i id="xquery" class="citetitle"><span class="source">XQuery</span><span class="xlink-arc-list" db-arcs="xquery-arcs"></span><span class="nhrefs" id="xquery-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.w3.org/TR/XQuery">XQuery specification</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://www.w3.org/XML/Query/">XQuery WG</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/XQuery">XQuery on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i>?
</p><p>And would <span class="orgname"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para2_orgname1-arcs"></span><span class="nhrefs" id="R_para2_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span> work?</p><p>And would <span class="orgname"><span class="source">MLS</span><span class="xlink-arc-list" db-arcs="R_para3_orgname1-arcs"></span><span class="nhrefs" id="R_para3_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span> work?</p><p>This orgname, <span class="orgname">nwalsh.com</span>, doesn’t have a link.</p><p>But <span class="orgname"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para5_orgname1-arcs"></span><span class="nhrefs" id="R_para5_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span> works even if it’s repeated.</p></article></main><nav class="bottom"></nav></body></html>
<i id="xquery" class="citetitle"><span class="xlink"><span class="source">XQuery</span><span class="xlink-arc-list" db-arcs="xquery-arcs"></span><span class="nhrefs" id="xquery-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.w3.org/TR/XQuery">XQuery specification</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://www.w3.org/XML/Query/">XQuery WG</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/XQuery">XQuery on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i>?
</p><p>And would <span class="orgname"><span class="xlink"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para2_orgname1-arcs"></span><span class="nhrefs" id="R_para2_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></span> work?</p><p>And would <span class="orgname"><span class="xlink"><span class="source">MLS</span><span class="xlink-arc-list" db-arcs="R_para3_orgname1-arcs"></span><span class="nhrefs" id="R_para3_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></span> work?</p><p>This orgname, <span class="orgname">nwalsh.com</span>, doesn’t have a link.</p><p>But <span class="orgname"><span class="xlink"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para5_orgname1-arcs"></span><span class="nhrefs" id="R_para5_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></span> works even if it’s repeated.</p></article></main><nav class="bottom"></nav></body></html>
6 changes: 3 additions & 3 deletions src/test/resources/expected/xlink.004.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Unit test: xlink.004</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="http://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"/><link href="./css/docbook-screen.css" rel="stylesheet"/></head><body class="home"><nav class="top"></nav><main><article class="article"><header><h1>Unit test: xlink.004</h1></header><p>Testing several flavors of XLink with xlink-style=inline.</p><p>What about
<i class="citetitle"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para2_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para2_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i>
<i class="citetitle"><span class="xlink"><span class="source">DocBook</span><span class="xlink-arc-list" db-arcs="R_para2_phrase1_citetitle1-arcs"></span><span class="nhrefs" id="R_para2_phrase1_citetitle1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://docbook.org/">DocBook.org</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/DocBook">DocBook on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i>
and
<i id="xquery" class="citetitle"><span class="source">XQuery</span><span class="xlink-arc-list" db-arcs="xquery-arcs"></span><span class="nhrefs" id="xquery-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title">XQuery-related links</span><span class="xlink-arc-delim sep">: </span><span class="arc"><a href="http://www.w3.org/TR/XQuery">XQuery specification</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://www.w3.org/XML/Query/">XQuery WG</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/XQuery">XQuery on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></i>?
</p><p>And would <span class="orgname"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para3_orgname1-arcs"></span><span class="nhrefs" id="R_para3_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span> work?</p><p>And would <span class="orgname"><span class="source">MLS</span><span class="xlink-arc-list" db-arcs="R_para4_orgname1-arcs"></span><span class="nhrefs" id="R_para4_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span> work?</p><p>And would <span class="orgname"><a href="http://nwalsh.com/" title="nwalsh.com">nwalsh.com</a></span> work?</p><p>Inline extended link on target: link from <span id="here" class="phrase"><a href="#heretarget">here</a></span>
<i id="xquery" class="citetitle"><span class="xlink"><span class="source">XQuery</span><span class="xlink-arc-list" db-arcs="xquery-arcs"></span><span class="nhrefs" id="xquery-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title">XQuery-related links</span><span class="xlink-arc-delim sep">: </span><span class="arc"><a href="http://www.w3.org/TR/XQuery">XQuery specification</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://www.w3.org/XML/Query/">XQuery WG</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/XQuery">XQuery on Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></i>?
</p><p>And would <span class="orgname"><span class="xlink"><span class="source">MarkLogic</span><span class="xlink-arc-list" db-arcs="R_para3_orgname1-arcs"></span><span class="nhrefs" id="R_para3_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></span> work?</p><p>And would <span class="orgname"><span class="xlink"><span class="source">MLS</span><span class="xlink-arc-list" db-arcs="R_para4_orgname1-arcs"></span><span class="nhrefs" id="R_para4_orgname1-arcs"><span class="xlink-arc-delim before"> [</span><span class="xlink-arc-title"></span><span class="arc"><a href="http://www.marklogic.com/">MarkLogic</a></span><span class="xlink-arc-delim sep">, </span><span class="arc"><a href="http://en.wikipedia.org/wiki/MarkLogic">MarkLogic at Wikipedia</a></span><span class="xlink-arc-delim after">] </span></span></span></span> work?</p><p>And would <span class="orgname"><a href="http://nwalsh.com/" title="nwalsh.com">nwalsh.com</a></span> work?</p><p>Inline extended link on target: link from <span id="here" class="phrase"><a href="#heretarget">here</a></span>
to
<span id="heretarget" class="phrase">there</span>.</p><p>Inline extended link on source: link from
<span class="phrase"><a href="#here2target">here</a></span>
Expand Down
Loading

0 comments on commit 2e96312

Please sign in to comment.