diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-12-20 13:44:03 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-12-22 09:45:02 -0800 |
| commit | 7a9832166e36f77402d5e0259647e9f5c7ba4e58 (patch) | |
| tree | 38b417997812c3e04704be97c05368ea795b15fe /test | |
| parent | 0bdf37315766eb4b785002ffaf38cdb724628e7a (diff) | |
| download | pandoc-7a9832166e36f77402d5e0259647e9f5c7ba4e58.tar.gz | |
Add text wrapping to HTML output.
Previously the HTML writer was exceptional in not being
sensitive to the `--wrap` option. With this change `--wrap`
now works for HTML. The default (as with other formats) is
automatic wrapping to 72 columns.
A new internal module, T.P.Writers.Blaze, exports `layoutMarkup`.
This converts a blaze Html structure into a doclayout Doc Text.
In addition, we now add a line break between an `img` tag
and the associated `figcaption`.
Note: Output is never wrapped in `writeHtmlStringForEPUB`.
This accords with previous behavior since previously the HTML
writer was insensitive to `--wrap` settings. There's no real
need to wrap HTML inside a zipped container.
Note that the contents of script, textarea, and pre tags are
always laid out with the `flush` combinator, so that unwanted
spaces won't be introduced if these occur in an indented context
in a template.
Closes #7764.
Diffstat (limited to 'test')
37 files changed, 277 insertions, 122 deletions
diff --git a/test/command/262.md b/test/command/262.md index bda2acb35..61af20ede 100644 --- a/test/command/262.md +++ b/test/command/262.md @@ -5,7 +5,8 @@ .. _hello: .. _goodbye: example.com ^D -<p><a href="example.com">hello</a> and <a href="example.com">goodbye</a></p> +<p><a href="example.com">hello</a> and <a +href="example.com">goodbye</a></p> ``` ``` diff --git a/test/command/2649.md b/test/command/2649.md index 52ae16ce4..4ab059ea0 100644 --- a/test/command/2649.md +++ b/test/command/2649.md @@ -90,17 +90,20 @@ <tbody> <tr class="odd"> <td><p>1</p></td> -<td><p><a href="Sébastien_Loeb" title="wikilink">Sébastien Loeb</a></p></td> +<td><p><a href="Sébastien_Loeb" title="wikilink">Sébastien +Loeb</a></p></td> <td><p>78</p></td> </tr> <tr class="even"> <td><p>2</p></td> -<td><p><strong><a href="Sébastien_Ogier" title="wikilink">Sébastien Ogier</a></strong></p></td> +<td><p><strong><a href="Sébastien_Ogier" title="wikilink">Sébastien +Ogier</a></strong></p></td> <td><p>38</p></td> </tr> <tr class="odd"> <td><p>10</p></td> -<td><p><a href="Hannu_Mikkola" title="wikilink">Hannu Mikkola</a></p></td> +<td><p><a href="Hannu_Mikkola" title="wikilink">Hannu +Mikkola</a></p></td> <td><p>18</p></td> </tr> </tbody> diff --git a/test/command/3523.md b/test/command/3523.md index cb0089489..c3574943c 100644 --- a/test/command/3523.md +++ b/test/command/3523.md @@ -19,8 +19,12 @@ \end{document} ^D <div class="epigraph"> -<p>Das Recht hat kein Dasein f<span>ü</span>r sich, sein Wesen vielmehr ist das Leben des Menschen selbst, von einer besonderen Seite angesehen.</p> -<p>Das Recht hat kein Dasein f<span>ü</span>r sich, sein Wesen vielmehr ist das Leben des Menschen selbst, von einer besonderen Seite angesehen.</p> +<p>Das Recht hat kein Dasein f<span>ü</span>r sich, sein Wesen vielmehr +ist das Leben des Menschen selbst, von einer besonderen Seite +angesehen.</p> +<p>Das Recht hat kein Dasein f<span>ü</span>r sich, sein Wesen vielmehr +ist das Leben des Menschen selbst, von einer besonderen Seite +angesehen.</p> <ul> <li><p>hey</p></li> <li><p>hey</p></li> diff --git a/test/command/3534.md b/test/command/3534.md index 8692007d2..42dca9207 100644 --- a/test/command/3534.md +++ b/test/command/3534.md @@ -2,7 +2,9 @@ % pandoc -f latex -t html I want to explain the interface of \lstinline[language=Java]{public class MyClass}. ^D -<p>I want to explain the interface of <code class="sourceCode java"><span class="kw">public</span> <span class="kw">class</span> MyClass</code>.</p> +<p>I want to explain the interface of <code class="sourceCode +java"><span class="kw">public</span> <span class="kw">class</span> +MyClass</code>.</p> ``` @@ -10,7 +12,8 @@ I want to explain the interface of \lstinline[language=Java]{public class MyClas % pandoc -f latex -t html I want to explain the interface of \lstinline{public class MyClass}. ^D -<p>I want to explain the interface of <code>public class MyClass</code>.</p> +<p>I want to explain the interface of <code>public class +MyClass</code>.</p> ``` @@ -43,7 +46,9 @@ I want to explain the interface of \lstinline[language=Java]{public class MyClas % pandoc -f latex -t html I want to explain the interface of \mintinline{java}{public class MyClass}. ^D -<p>I want to explain the interface of <code class="sourceCode java"><span class="kw">public</span> <span class="kw">class</span> MyClass</code>.</p> +<p>I want to explain the interface of <code class="sourceCode +java"><span class="kw">public</span> <span class="kw">class</span> +MyClass</code>.</p> ``` @@ -51,7 +56,9 @@ I want to explain the interface of \mintinline{java}{public class MyClass}. % pandoc -f latex -t html I want to explain the interface of \mintinline{java}|public class MyClass|. ^D -<p>I want to explain the interface of <code class="sourceCode java"><span class="kw">public</span> <span class="kw">class</span> MyClass</code>.</p> +<p>I want to explain the interface of <code class="sourceCode +java"><span class="kw">public</span> <span class="kw">class</span> +MyClass</code>.</p> ``` diff --git a/test/command/3577.md b/test/command/3577.md index 2f415146d..2caeb7c11 100644 --- a/test/command/3577.md +++ b/test/command/3577.md @@ -16,10 +16,12 @@ \end{figure} ^D <figure> -<img src="img1.jpg" alt="Caption 1" /><figcaption aria-hidden="true">Caption 1</figcaption> +<img src="img1.jpg" alt="Caption 1" /> +<figcaption aria-hidden="true">Caption 1</figcaption> </figure> <figure> -<img src="img2.jpg" alt="Caption 2" /><figcaption aria-hidden="true">Caption 2</figcaption> +<img src="img2.jpg" alt="Caption 2" /> +<figcaption aria-hidden="true">Caption 2</figcaption> </figure> ``` ``` @@ -30,6 +32,7 @@ \end{figure} ^D <figure> -<img src="img1.jpg" alt="Caption 3" /><figcaption aria-hidden="true">Caption 3</figcaption> +<img src="img1.jpg" alt="Caption 3" /> +<figcaption aria-hidden="true">Caption 3</figcaption> </figure> ``` diff --git a/test/command/3701.md b/test/command/3701.md index 01e438639..bd70fae59 100644 --- a/test/command/3701.md +++ b/test/command/3701.md @@ -55,6 +55,7 @@ ^D <p><a href="u">a</a></p> <p><a href="u">a</a></p> -<p><a href="u2">a</a> <a href="u">A</a> <a href="u" class="foo">a</a></p> +<p><a href="u2">a</a> <a href="u">A</a> <a href="u" +class="foo">a</a></p> <p><a href="u3">a</a></p> ``` diff --git a/test/command/3752.md b/test/command/3752.md index 863e3f2d4..7db581cfe 100644 --- a/test/command/3752.md +++ b/test/command/3752.md @@ -32,11 +32,14 @@ A spider: [spider] ^D <h1 id="chapter-one">Chapter one</h1> <p>A spider: <img src="command/chap1/spider.png" alt="spider" /></p> -<p>Another spider: <img src="command/chap2/spider.png" alt="another spider" /></p> +<p>Another spider: <img src="command/chap2/spider.png" alt="another +spider" /></p> <p>The moon: <img src="command/chap1/../../lalune.jpg" alt="moon" /></p> <p>Link to <a href="command/chap1/spider.png">spider picture</a>.</p> -<p>URL left alone: <a href="https://pandoc.org/MANUAL.html">manual</a>.</p> -<p>Absolute path left alone: <a href="/foo/bar/baz.png">absolute</a>.</p> +<p>URL left alone: <a +href="https://pandoc.org/MANUAL.html">manual</a>.</p> +<p>Absolute path left alone: <a +href="/foo/bar/baz.png">absolute</a>.</p> <p>Link to fragment: <a href="#chapter-two">chapter two</a>.</p> <p>Empty path: <a href="">empty</a>.</p> <h1 id="chapter-two">Chapter two</h1> @@ -48,11 +51,14 @@ A spider: [spider] ^D <h1>Chapter one</h1> <p>A spider: <img src="command/chap1/spider.png" alt="spider" /></p> -<p>Another spider: <img src="command/chap2/spider.png" alt="another spider" /></p> +<p>Another spider: <img src="command/chap2/spider.png" alt="another +spider" /></p> <p>The moon: <img src="command/chap1/../../lalune.jpg" alt="moon" /></p> <p>Link to <a href="command/chap1/spider.png">spider picture</a>.</p> -<p>URL left alone: <a href="https://pandoc.org/MANUAL.html">manual</a>.</p> -<p>Absolute path left alone: <a href="/foo/bar/baz.png">absolute</a>.</p> +<p>URL left alone: <a +href="https://pandoc.org/MANUAL.html">manual</a>.</p> +<p>Absolute path left alone: <a +href="/foo/bar/baz.png">absolute</a>.</p> <p>Link to fragment: <a href="#chapter-two">chapter two</a>.</p> <p>Empty path: <a href="">empty</a>.</p> <h1>Chapter two</h1> diff --git a/test/command/3840.md b/test/command/3840.md index ceb1d1e51..a0dd314d3 100644 --- a/test/command/3840.md +++ b/test/command/3840.md @@ -2,7 +2,8 @@ % pandoc [@Alhazen1572-qk, V.9]: "competentius est" ^D -<p><span class="citation" data-cites="Alhazen1572-qk">[@Alhazen1572-qk, V.9]</span>: “competentius est”</p> +<p><span class="citation" data-cites="Alhazen1572-qk">[@Alhazen1572-qk, +V.9]</span>: “competentius est”</p> ``` ``` diff --git a/test/command/4012.md b/test/command/4012.md index 9e32692d6..26e971d4e 100644 --- a/test/command/4012.md +++ b/test/command/4012.md @@ -4,5 +4,6 @@ [image]: http://example.com/image.jpg {height=35mm} ^D -<p><img src="http://example.com/image.jpg" style="height:35mm" alt="image" /></p> +<p><img src="http://example.com/image.jpg" style="height:35mm" +alt="image" /></p> ``` diff --git a/test/command/4186.md b/test/command/4186.md index 90ac1271b..b2a2bd6e9 100644 --- a/test/command/4186.md +++ b/test/command/4186.md @@ -57,7 +57,8 @@ Outside all lists. </ul> <pre id="carrie" class="example"><code>This belongs to the outer list element, and is aligned accordingly, since the NAME attribute is not indented deeply enough. It is not enough for the BEGIN alone to be aligned deeply if the block is meant to have a NAME. </code></pre> -<p>Still in the shallower list element since the preceding example block forced the deeper list element to terminate.</p></li> +<p>Still in the shallower list element since the preceding example block +forced the deeper list element to terminate.</p></li> </ul> <p>Outside all lists.</p> ``` diff --git a/test/command/4235.md b/test/command/4235.md index 4f2644dd6..5b534b6d7 100644 --- a/test/command/4235.md +++ b/test/command/4235.md @@ -2,11 +2,15 @@ % pandoc --id-prefix=foo This.^[Has a footnote.] ^D -<p>This.<a href="#foofn1" class="footnote-ref" id="foofnref1" role="doc-noteref"><sup>1</sup></a></p> -<section class="footnotes footnotes-end-of-document" role="doc-endnotes"> +<p>This.<a href="#foofn1" class="footnote-ref" id="foofnref1" +role="doc-noteref"><sup>1</sup></a></p> +<section class="footnotes footnotes-end-of-document" +role="doc-endnotes"> <hr /> <ol> -<li id="foofn1" role="doc-endnote"><p>Has a footnote.<a href="#foofnref1" class="footnote-back" role="doc-backlink">↩︎</a></p></li> +<li id="foofn1" role="doc-endnote"><p>Has a footnote.<a +href="#foofnref1" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> </ol> </section> ``` diff --git a/test/command/4639.md b/test/command/4639.md index c35df1749..31ac3a5d9 100644 --- a/test/command/4639.md +++ b/test/command/4639.md @@ -5,6 +5,6 @@ \end{equation} ^D <p><span class="math display">\[\begin{equation} - E=mc^2 +E=mc^2 \end{equation}\]</span></p> ``` diff --git a/test/command/4677.md b/test/command/4677.md index 2694624b9..64c436005 100644 --- a/test/command/4677.md +++ b/test/command/4677.md @@ -3,6 +3,7 @@ {#img:1} ^D <figure> -<img src="img.png" id="img:1" alt="Caption" /><figcaption aria-hidden="true">Caption</figcaption> +<img src="img.png" id="img:1" alt="Caption" /> +<figcaption aria-hidden="true">Caption</figcaption> </figure> ``` diff --git a/test/command/4743.md b/test/command/4743.md index 582540736..a75ec1078 100644 --- a/test/command/4743.md +++ b/test/command/4743.md @@ -41,5 +41,7 @@ My:thumbsup:emoji:heart: My:thumbsup:emoji:heart:x :hearts: xyz ^D <h1><span class="emoji" data-emoji="zero">0️⃣</span> header</h1> -<p>My<span class="emoji" data-emoji="thumbsup">👍</span>emoji<span class="emoji" data-emoji="heart">❤️</span>x <span class="emoji" data-emoji="hearts">♥️</span> xyz</p> +<p>My<span class="emoji" data-emoji="thumbsup">👍</span>emoji<span +class="emoji" data-emoji="heart">❤️</span>x <span class="emoji" +data-emoji="hearts">♥️</span> xyz</p> ``` diff --git a/test/command/512.md b/test/command/512.md index b95921309..21b3ea9a7 100644 --- a/test/command/512.md +++ b/test/command/512.md @@ -8,7 +8,8 @@ __ link1_ __ link2_ ^D -<p><a href="http://www.example.com/">click here</a> or <a href="http://johnmacfarlane.net/pandoc/">click here</a></p> +<p><a href="http://www.example.com/">click here</a> or <a +href="http://johnmacfarlane.net/pandoc/">click here</a></p> ``` Multiple indirection: diff --git a/test/command/5121.md b/test/command/5121.md index 1ee6bda77..f1b972fb4 100644 --- a/test/command/5121.md +++ b/test/command/5121.md @@ -5,7 +5,8 @@ ## Header 2 ^D <figure> -<img src="./my-figure.jpg" width="500" alt="My caption" /><figcaption aria-hidden="true">My caption</figcaption> +<img src="./my-figure.jpg" width="500" alt="My caption" /> +<figcaption aria-hidden="true">My caption</figcaption> </figure> ## Header 2 diff --git a/test/command/5627.md b/test/command/5627.md index 9910e76c5..dde4c99d6 100644 --- a/test/command/5627.md +++ b/test/command/5627.md @@ -20,8 +20,10 @@ Something <li>Two <code>-->something<!--</code></li> <li>Three</li> </ol> -<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> -<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>Something</span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode +html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> +<div class="sourceCode" id="cb2"><pre class="sourceCode +html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>Something</span></code></pre></div> ``` ``` @@ -46,8 +48,10 @@ Something <li><code>-->something<!--</code></li> <li>bye <code>-->something else<!--</code></li> </ul> -<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> -<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>Something</span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode +html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> +<div class="sourceCode" id="cb2"><pre class="sourceCode +html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>Something</span></code></pre></div> ``` ``` diff --git a/test/command/5642.md b/test/command/5642.md index cd60df812..120a88ada 100644 --- a/test/command/5642.md +++ b/test/command/5642.md @@ -3,6 +3,7 @@ {aria-describedby="barbaz"} ^D <figure> -<img src="foo" aria-describedby="barbaz" alt="test" /><figcaption aria-hidden="true">test</figcaption> +<img src="foo" aria-describedby="barbaz" alt="test" /> +<figcaption aria-hidden="true">test</figcaption> </figure> ``` diff --git a/test/command/5650.md b/test/command/5650.md index a2dd215bc..1e96aeaa4 100644 --- a/test/command/5650.md +++ b/test/command/5650.md @@ -5,7 +5,8 @@ a b ``` ^D -<div class="sourceCode" id="foocb1"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foocb1-1"><a href="#foocb1-1" aria-hidden="true" tabindex="-1"></a>a</span> +<div class="sourceCode" id="foocb1"><pre class="sourceCode +haskell"><code class="sourceCode haskell"><span id="foocb1-1"><a href="#foocb1-1" aria-hidden="true" tabindex="-1"></a>a</span> <span id="foocb1-2"><a href="#foocb1-2" aria-hidden="true" tabindex="-1"></a>b</span></code></pre></div> ```` @@ -16,7 +17,8 @@ a b ``` ^D -<div class="sourceCode" id="foobar"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foobar-1"><a href="#foobar-1" aria-hidden="true" tabindex="-1"></a>a</span> +<div class="sourceCode" id="foobar"><pre class="sourceCode +haskell"><code class="sourceCode haskell"><span id="foobar-1"><a href="#foobar-1" aria-hidden="true" tabindex="-1"></a>a</span> <span id="foobar-2"><a href="#foobar-2" aria-hidden="true" tabindex="-1"></a>b</span></code></pre></div> ```` diff --git a/test/command/5655.md b/test/command/5655.md index 692009562..72ad46e5e 100644 --- a/test/command/5655.md +++ b/test/command/5655.md @@ -2,13 +2,19 @@ % pandoc --webtex $T_n={n+1 \choose 2}$ ^D -<p><img style="vertical-align:middle" src="https://latex.codecogs.com/png.latex?%5Ctextstyle%20T_n%3D%7Bn%2B1%20%5Cchoose%202%7D" alt="T_n={n+1 \choose 2}" title="T_n={n+1 \choose 2}" class="math inline" /></p> +<p><img style="vertical-align:middle" +src="https://latex.codecogs.com/png.latex?%5Ctextstyle%20T_n%3D%7Bn%2B1%20%5Cchoose%202%7D" +alt="T_n={n+1 \choose 2}" title="T_n={n+1 \choose 2}" class="math +inline" /></p> ```` ```` % pandoc --webtex $$T_n={n+1 \choose 2}$$ ^D -<p><img style="vertical-align:middle" src="https://latex.codecogs.com/png.latex?%5Cdisplaystyle%20T_n%3D%7Bn%2B1%20%5Cchoose%202%7D" alt="T_n={n+1 \choose 2}" title="T_n={n+1 \choose 2}" class="math display" /></p> +<p><img style="vertical-align:middle" +src="https://latex.codecogs.com/png.latex?%5Cdisplaystyle%20T_n%3D%7Bn%2B1%20%5Cchoose%202%7D" +alt="T_n={n+1 \choose 2}" title="T_n={n+1 \choose 2}" class="math +display" /></p> ```` diff --git a/test/command/5813.md b/test/command/5813.md index 927a161ed..51f774524 100644 --- a/test/command/5813.md +++ b/test/command/5813.md @@ -2,5 +2,6 @@ % pandoc -f gfm ### Jekyll Plugins & Gems :gem: ^D -<h3 id="jekyll-plugins--gems-gem">Jekyll Plugins & Gems <span class="emoji" data-emoji="gem">💎</span></h3> +<h3 id="jekyll-plugins--gems-gem">Jekyll Plugins & Gems <span +class="emoji" data-emoji="gem">💎</span></h3> ``` diff --git a/test/command/5986.md b/test/command/5986.md index c181e33ad..aaa1e6568 100644 --- a/test/command/5986.md +++ b/test/command/5986.md @@ -6,7 +6,8 @@ <p><span id="nav.xhtml"></span></p> <nav epub:type="landmarks" id="landmarks" hidden="hidden"> <ol> -<li><a href="text/title_page.xhtml" class="titlepage">Title Page</a></li> +<li><a href="text/title_page.xhtml" class="titlepage">Title +Page</a></li> <li><a href="#nav.xhtml#toc" class="toc">Table of Contents</a></li> </ol> </nav> diff --git a/test/command/6739.md b/test/command/6739.md index 7c9ed24a2..ff2d4bc75 100644 --- a/test/command/6739.md +++ b/test/command/6739.md @@ -4,7 +4,8 @@ * `--argA | --argB` This item has a pipe character ^D <ul> -<li><code>--argument</code> This item does not have a pipe character</li> +<li><code>--argument</code> This item does not have a pipe +character</li> <li><code>--argA | --argB</code> This item has a pipe character</li> </ul> ``` diff --git a/test/command/7006.md b/test/command/7006.md index 7e2215cdf..22aaf84ad 100644 --- a/test/command/7006.md +++ b/test/command/7006.md @@ -6,13 +6,16 @@ Test.[^fn]  ^D -<p>Test.<a href="#fn1" class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a></p> -<section class="footnotes footnotes-end-of-document" role="doc-endnotes"> +<p>Test.<a href="#fn1" class="footnote-ref" id="fnref1" +role="doc-noteref"><sup>1</sup></a></p> +<section class="footnotes footnotes-end-of-document" +role="doc-endnotes"> <hr /> <ol> <li id="fn1" role="doc-endnote"><p>Foo:</p> <figure> -<img src="/image.jpg" alt="Caption." /><figcaption aria-hidden="true">Caption.</figcaption> +<img src="/image.jpg" alt="Caption." /> +<figcaption aria-hidden="true">Caption.</figcaption> </figure> <a href="#fnref1" class="footnote-back" role="doc-backlink">↩︎</a></li> </ol> diff --git a/test/command/7416.md b/test/command/7416.md index 2f9577f10..d440725ab 100644 --- a/test/command/7416.md +++ b/test/command/7416.md @@ -4,7 +4,8 @@ ^D <figure> -<img src="../media/rId25.jpg" title="title" alt="alt" /><figcaption>caption</figcaption> +<img src="../media/rId25.jpg" title="title" alt="alt" /> +<figcaption>caption</figcaption> </figure> ``` @@ -14,6 +15,7 @@ ^D <figure> -<img src="../media/rId25.jpg" title="title" alt="caption" /><figcaption aria-hidden="true">caption</figcaption> +<img src="../media/rId25.jpg" title="title" alt="caption" /> +<figcaption aria-hidden="true">caption</figcaption> </figure> ``` diff --git a/test/command/7568.md b/test/command/7568.md index 42f1e37b1..487da0861 100644 --- a/test/command/7568.md +++ b/test/command/7568.md @@ -7,5 +7,10 @@ holds a useful spot. .. _Labyrinth Lord\: Revised Edition: https://www.drivethrurpg.com/product/64332/Labyrinth-Lord-Revised-Edition ^D -<p>While <a href="https://www.drivethrurpg.com/product/64332/Labyrinth-Lord-Revised-Edition">Labyrinth Lord: Revised Edition</a> (LLRE; PDF and POD) has been criticized for not being a completely faithful retro-clone of the Moldvay/Cook/Marsh Basic/Expert D&D rules (B/X), I think it still holds a useful spot.</p> +<p>While <a +href="https://www.drivethrurpg.com/product/64332/Labyrinth-Lord-Revised-Edition">Labyrinth +Lord: Revised Edition</a> (LLRE; PDF and POD) has been criticized for +not being a completely faithful retro-clone of the Moldvay/Cook/Marsh +Basic/Expert D&D rules (B/X), I think it still holds a useful +spot.</p> ``` diff --git a/test/command/7713.md b/test/command/7713.md index d42dcd9b8..851cb4729 100644 --- a/test/command/7713.md +++ b/test/command/7713.md @@ -21,7 +21,8 @@ <tr class="odd"> <td></td> <td></td> -<td>cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc</td> +<td>cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc +cccccccccc</td> </tr> </tbody> </table> diff --git a/test/command/853.md b/test/command/853.md index 54eb416a9..bcc3b4654 100644 --- a/test/command/853.md +++ b/test/command/853.md @@ -7,11 +7,13 @@ Here is a citation reference: [CIT2002]_. .. [CIT2002] This is the citation. It's just like a footnote, except the label is textual. ^D -<p>Here is a citation reference: <a href="#CIT2002" class="citation">[CIT2002]</a>.</p> +<p>Here is a citation reference: <a href="#CIT2002" +class="citation">[CIT2002]</a>.</p> <div id="citations"> <dl> <dt><span id="CIT2002" class="citation-label">CIT2002</span></dt> -<dd><p>This is the citation. It's just like a footnote, except the label is textual.</p> +<dd><p>This is the citation. It's just like a footnote, except the label +is textual.</p> </dd> </dl> </div> diff --git a/test/command/video-audio.md b/test/command/video-audio.md index 451b614d8..4fbd58db3 100644 --- a/test/command/video-audio.md +++ b/test/command/video-audio.md @@ -10,9 +10,13 @@  ^D -<p><video src="./test.mp4" controls=""><a href="./test.mp4">Video</a></video></p> -<p><video src="foo/test.webm" width="300" controls=""><a href="foo/test.webm">Your browser does not support video.</a></video></p> -<p><audio src="test.mp3" controls=""><a href="test.mp3">Audio</a></audio></p> +<p><video src="./test.mp4" controls=""><a +href="./test.mp4">Video</a></video></p> +<p><video src="foo/test.webm" width="300" controls=""><a +href="foo/test.webm">Your browser does not support +video.</a></video></p> +<p><audio src="test.mp3" controls=""><a +href="test.mp3">Audio</a></audio></p> <p><embed src="./test.pdf" /></p> <p><img src="./test.jpg" /></p> ``` diff --git a/test/ipynb/rank.out.html b/test/ipynb/rank.out.html index eb5176509..a82fe8bbc 100644 --- a/test/ipynb/rank.out.html +++ b/test/ipynb/rank.out.html @@ -1,8 +1,12 @@ -<div id="5cf8f54d-bf3c-4db2-996d-22662a86ad43" class="cell code" data-execution_count="1"> -<div class="sourceCode" id="cb1"><pre class="sourceCode python"><code class="sourceCode python"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="im">import</span> matplotlib.pyplot <span class="im">as</span> plt</span></code></pre></div> +<div id="5cf8f54d-bf3c-4db2-996d-22662a86ad43" class="cell code" +data-execution_count="1"> +<div class="sourceCode" id="cb1"><pre class="sourceCode +python"><code class="sourceCode python"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="im">import</span> matplotlib.pyplot <span class="im">as</span> plt</span></code></pre></div> </div> -<div id="a0228622-9ff8-4392-9ddd-f70a90f0e106" class="cell code" data-execution_count="2"> -<div class="sourceCode" id="cb2"><pre class="sourceCode python"><code class="sourceCode python"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>fig, ax <span class="op">=</span> plt.subplots(figsize<span class="op">=</span>(<span class="dv">1</span>, <span class="dv">1</span>), dpi<span class="op">=</span><span class="dv">4</span>)</span> +<div id="a0228622-9ff8-4392-9ddd-f70a90f0e106" class="cell code" +data-execution_count="2"> +<div class="sourceCode" id="cb2"><pre class="sourceCode +python"><code class="sourceCode python"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>fig, ax <span class="op">=</span> plt.subplots(figsize<span class="op">=</span>(<span class="dv">1</span>, <span class="dv">1</span>), dpi<span class="op">=</span><span class="dv">4</span>)</span> <span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a>ax.imshow([[<span class="dv">0</span>, <span class="dv">1</span>], [<span class="dv">2</span>, <span class="dv">3</span>]])<span class="op">;</span></span></code></pre></div> <div class="output display_data"> <p><em>you should see this when converting from ipynb to html instead of the image below.</em></p> diff --git a/test/s5-basic.html b/test/s5-basic.html index 7440b575b..3a225da83 100644 --- a/test/s5-basic.html +++ b/test/s5-basic.html @@ -56,7 +56,8 @@ <div id="math" class="slide section level1"> <h1>Math</h1> <ul> -<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li> +<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}$</span></li> </ul> </div> </div> diff --git a/test/s5-fancy.html b/test/s5-fancy.html index f5c41e561..00b25e80c 100644 --- a/test/s5-fancy.html +++ b/test/s5-fancy.html @@ -28,7 +28,9 @@ <link rel="stylesheet" href="s5/default/opera.css" type="text/css" media="projection" id="operaFix" /> <!-- S5 JS --> <script src="s5/default/slides.js" type="text/javascript"></script> - <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js" type="text/javascript"></script> + <script + src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js" + type="text/javascript"></script> </head> <body> <div class="layout"> @@ -56,7 +58,8 @@ <div id="math" class="slide section level1"> <h1>Math</h1> <ul class="incremental"> -<li><span class="math inline">\(\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}\)</span></li> +<li><span class="math inline">\(\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}\)</span></li> </ul> </div> </div> diff --git a/test/s5-fragment.html b/test/s5-fragment.html index 81c578d25..1a8d4839d 100644 --- a/test/s5-fragment.html +++ b/test/s5-fragment.html @@ -5,5 +5,6 @@ </ul> <h1 id="math">Math</h1> <ul> -<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li> +<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}$</span></li> </ul> diff --git a/test/s5-inserts.html b/test/s5-inserts.html index 1df9dd018..04dfc134a 100644 --- a/test/s5-inserts.html +++ b/test/s5-inserts.html @@ -35,7 +35,8 @@ STUFF INSERTED </ul> <h1 id="math">Math</h1> <ul> -<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li> +<li><span class="math inline">$\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}$</span></li> </ul> STUFF INSERTED </body> diff --git a/test/tables.html5 b/test/tables.html5 index 533d2fd25..b3ee0ec79 100644 --- a/test/tables.html5 +++ b/test/tables.html5 @@ -121,7 +121,8 @@ <td style="text-align: center;">Second</td> <td style="text-align: left;">row</td> <td style="text-align: right;">5.0</td> -<td style="text-align: left;">Here’s another one. Note the blank line between rows.</td> +<td style="text-align: left;">Here’s another one. Note the blank line between +rows.</td> </tr> </tbody> </table> @@ -152,7 +153,8 @@ <td style="text-align: center;">Second</td> <td style="text-align: left;">row</td> <td style="text-align: right;">5.0</td> -<td style="text-align: left;">Here’s another one. Note the blank line between rows.</td> +<td style="text-align: left;">Here’s another one. Note the blank line between +rows.</td> </tr> </tbody> </table> diff --git a/test/writer.html4 b/test/writer.html4 index 257d86ddb..e2adcf5bc 100644 --- a/test/writer.html4 +++ b/test/writer.html4 @@ -156,10 +156,12 @@ <h2 class="author">Anonymous</h2> <h3 class="date">July 17, 2006</h3> </div> -<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</p> +<p>This is a set of tests for pandoc. Most of them are adapted from John +Gruber’s markdown test suite.</p> <hr /> <h1 id="headers">Headers</h1> -<h2 id="level-2-with-an-embedded-link">Level 2 with an <a href="/url">embedded link</a></h2> +<h2 id="level-2-with-an-embedded-link">Level 2 with an <a href="/url">embedded +link</a></h2> <h3 id="level-3-with-emphasis">Level 3 with <em>emphasis</em></h3> <h4 id="level-4">Level 4</h4> <h5 id="level-5">Level 5</h5> @@ -172,7 +174,9 @@ <hr /> <h1 id="paragraphs">Paragraphs</h1> <p>Here’s a regular paragraph.</p> -<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p> +<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. +Because a hard-wrapped line in the middle of a paragraph looked like a list +item.</p> <p>Here’s one with a bullet. * criminey.</p> <p>There should be a hard line break<br /> here.</p> @@ -283,7 +287,8 @@ These should not be escaped: \$ \\ \> \[ \{</code></pre> <p>Multiple paragraphs:</p> <ol style="list-style-type: decimal"> <li><p>Item 1, graf one.</p> -<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p></li> +<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s +back.</p></li> <li><p>Item 2.</p></li> <li><p>Item 3.</p></li> </ol> @@ -540,18 +545,22 @@ Blah <p>So is <strong><em>this</em></strong> word.</p> <p><strong><em>This is strong and em.</em></strong></p> <p>So is <strong><em>this</em></strong> word.</p> -<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code><html></code>.</p> +<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, +<code>\$</code>, <code><html></code>.</p> <p><del>This is <em>strikeout</em>.</del></p> -<p>Superscripts: a<sup>bc</sup>d a<sup><em>hello</em></sup> a<sup>hello there</sup>.</p> +<p>Superscripts: a<sup>bc</sup>d a<sup><em>hello</em></sup> +a<sup>hello there</sup>.</p> <p>Subscripts: H<sub>2</sub>O, H<sub>23</sub>O, H<sub>many of them</sub>O.</p> -<p>These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</p> +<p>These should not be superscripts or subscripts, because of the unescaped +spaces: a^b c^d, a~b c~d.</p> <hr /> <h1 id="smart-quotes-ellipses-dashes">Smart quotes, ellipses, dashes</h1> <p>“Hello,” said the spider. “‘Shelob’ is my name.”</p> <p>‘A’, ‘B’, and ‘C’ are letters.</p> <p>‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p> <p>‘He said, “I want to go.”’ Were you alive in the 70’s?</p> -<p>Here is some quoted ‘<code>code</code>’ and a “<a href="http://example.com/?foo=1&bar=2">quoted link</a>”.</p> +<p>Here is some quoted ‘<code>code</code>’ and a “<a +href="http://example.com/?foo=1&bar=2">quoted link</a>”.</p> <p>Some dashes: one—two — three—four — five.</p> <p>Dashes between numbers: 5–7, 255–66, 1987–1999.</p> <p>Ellipses…and…and….</p> @@ -564,13 +573,16 @@ Blah <li><span class="math inline"><em>α</em> ∧ <em>ω</em></span></li> <li><span class="math inline">223</span></li> <li><span class="math inline"><em>p</em></span>-Tree</li> -<li>Here’s some display math: <span class="math display">$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</span></li> -<li>Here’s one that has a line break in it: <span class="math inline"><em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup></span>.</li> +<li>Here’s some display math: <span class="math +display">$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</span></li> +<li>Here’s one that has a line break in it: <span class="math +inline"><em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup></span>.</li> </ul> <p>These shouldn’t be math:</p> <ul> <li>To get the famous equation, write <code>$e = mc^2$</code>.</li> -<li>$22,000 is a <em>lot</em> of money. So is $34,000. (It worked if “lot” is emphasized.)</li> +<li>$22,000 is a <em>lot</em> of money. So is $34,000. (It worked if “lot” is +emphasized.)</li> <li>Shoes ($20) and socks ($5).</li> <li>Escaped <code>$</code>: $73 <em>this should be emphasized</em> 23$.</li> </ul> @@ -613,7 +625,8 @@ Blah <p><a href="/url/" title="title">URL and title</a>.</p> <p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p> <p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p> -<p><a href="/url/" title="title with "quotes" in it">URL and title</a></p> +<p><a href="/url/" title="title with "quotes" in it">URL and +title</a></p> <p><a href="/url/" title="title with single quotes">URL and title</a></p> <p><a href="/url/with_underscore">with_underscore</a></p> <p><a href="mailto:nobody@nowhere.net">Email link</a></p> @@ -630,22 +643,29 @@ Blah <p>Foo <a href="/url/" title="Title with "quotes" inside">bar</a>.</p> <p>Foo <a href="/url/" title="Title with "quote" inside">biz</a>.</p> <h2 id="with-ampersands">With ampersands</h2> -<p>Here’s a <a href="http://example.com/?foo=1&bar=2">link with an ampersand in the URL</a>.</p> -<p>Here’s a link with an amersand in the link text: <a href="http://att.com/" title="AT&T">AT&T</a>.</p> +<p>Here’s a <a href="http://example.com/?foo=1&bar=2">link with an ampersand +in the URL</a>.</p> +<p>Here’s a link with an amersand in the link text: <a href="http://att.com/" +title="AT&T">AT&T</a>.</p> <p>Here’s an <a href="/script?foo=1&bar=2">inline link</a>.</p> -<p>Here’s an <a href="/script?foo=1&bar=2">inline link in pointy braces</a>.</p> +<p>Here’s an <a href="/script?foo=1&bar=2">inline link in pointy +braces</a>.</p> <h2 id="autolinks">Autolinks</h2> -<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2" class="uri">http://example.com/?foo=1&bar=2</a></p> +<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2" +class="uri">http://example.com/?foo=1&bar=2</a></p> <ul> <li>In a list?</li> <li><a href="http://example.com/" class="uri">http://example.com/</a></li> <li>It should.</li> </ul> -<p>An e-mail address: <a href="mailto:nobody@nowhere.net" class="email">nobody@nowhere.net</a></p> +<p>An e-mail address: <a href="mailto:nobody@nowhere.net" +class="email">nobody@nowhere.net</a></p> <blockquote> -<p>Blockquoted: <a href="http://example.com/" class="uri">http://example.com/</a></p> +<p>Blockquoted: <a href="http://example.com/" +class="uri">http://example.com/</a></p> </blockquote> -<p>Auto-links should not occur here: <code><http://example.com/></code></p> +<p>Auto-links should not occur here: +<code><http://example.com/></code></p> <pre><code>or here: <http://example.com/></code></pre> <hr /> <h1 id="images">Images</h1> @@ -657,23 +677,36 @@ Blah <p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p> <hr /> <h1 id="footnotes">Footnotes</h1> -<p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnote-ref" id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnote-ref" id="fnref3"><sup>3</sup></a></p> +<p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" +id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnote-ref" +id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, +because it contains a space.[^my note] Here is an inline note.<a href="#fn3" +class="footnote-ref" id="fnref3"><sup>3</sup></a></p> <blockquote> -<p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" id="fnref4"><sup>4</sup></a></p> +<p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" +id="fnref4"><sup>4</sup></a></p> </blockquote> <ol style="list-style-type: decimal"> -<li>And in list items.<a href="#fn5" class="footnote-ref" id="fnref5"><sup>5</sup></a></li> +<li>And in list items.<a href="#fn5" class="footnote-ref" +id="fnref5"><sup>5</sup></a></li> </ol> <p>This paragraph should not be part of the note, as it is not indented.</p> <div class="footnotes footnotes-end-of-document"> <hr /> <ol> -<li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnote-back">↩︎</a></p></li> +<li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote +reference. It need not be placed at the end of the document.<a href="#fnref1" +class="footnote-back">↩︎</a></p></li> <li id="fn2"><p>Here’s the long note. This one contains multiple blocks.</p> -<p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p> +<p>Subsequent blocks are indented to show that they belong to the footnote (as +with list items).</p> <pre><code> { <code> }</code></pre> -<p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnote-back">↩︎</a></p></li> -<li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnote-back">↩︎</a></p></li> +<p>If you want, you can indent every line, but you can also be lazy and just +indent the first line of each block.<a href="#fnref2" +class="footnote-back">↩︎</a></p></li> +<li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a +href="http://google.com">links</a> and <code>]</code> verbatim characters, as +well as [bracketed text].<a href="#fnref3" class="footnote-back">↩︎</a></p></li> <li id="fn4"><p>In quote.<a href="#fnref4" class="footnote-back">↩︎</a></p></li> <li id="fn5"><p>In list.<a href="#fnref5" class="footnote-back">↩︎</a></p></li> </ol> diff --git a/test/writer.html5 b/test/writer.html5 index 0141bf9fe..cdfcf042f 100644 --- a/test/writer.html5 +++ b/test/writer.html5 @@ -159,10 +159,12 @@ <p class="author">Anonymous</p> <p class="date">July 17, 2006</p> </header> -<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</p> +<p>This is a set of tests for pandoc. Most of them are adapted from John +Gruber’s markdown test suite.</p> <hr /> <h1 id="headers">Headers</h1> -<h2 id="level-2-with-an-embedded-link">Level 2 with an <a href="/url">embedded link</a></h2> +<h2 id="level-2-with-an-embedded-link">Level 2 with an <a href="/url">embedded +link</a></h2> <h3 id="level-3-with-emphasis">Level 3 with <em>emphasis</em></h3> <h4 id="level-4">Level 4</h4> <h5 id="level-5">Level 5</h5> @@ -175,7 +177,9 @@ <hr /> <h1 id="paragraphs">Paragraphs</h1> <p>Here’s a regular paragraph.</p> -<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p> +<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. +Because a hard-wrapped line in the middle of a paragraph looked like a list +item.</p> <p>Here’s one with a bullet. * criminey.</p> <p>There should be a hard line break<br /> here.</p> @@ -286,7 +290,8 @@ These should not be escaped: \$ \\ \> \[ \{</code></pre> <p>Multiple paragraphs:</p> <ol type="1"> <li><p>Item 1, graf one.</p> -<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p></li> +<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s +back.</p></li> <li><p>Item 2.</p></li> <li><p>Item 3.</p></li> </ol> @@ -543,18 +548,22 @@ Blah <p>So is <strong><em>this</em></strong> word.</p> <p><strong><em>This is strong and em.</em></strong></p> <p>So is <strong><em>this</em></strong> word.</p> -<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code><html></code>.</p> +<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, +<code>\$</code>, <code><html></code>.</p> <p><del>This is <em>strikeout</em>.</del></p> -<p>Superscripts: a<sup>bc</sup>d a<sup><em>hello</em></sup> a<sup>hello there</sup>.</p> +<p>Superscripts: a<sup>bc</sup>d a<sup><em>hello</em></sup> +a<sup>hello there</sup>.</p> <p>Subscripts: H<sub>2</sub>O, H<sub>23</sub>O, H<sub>many of them</sub>O.</p> -<p>These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</p> +<p>These should not be superscripts or subscripts, because of the unescaped +spaces: a^b c^d, a~b c~d.</p> <hr /> <h1 id="smart-quotes-ellipses-dashes">Smart quotes, ellipses, dashes</h1> <p>“Hello,” said the spider. “‘Shelob’ is my name.”</p> <p>‘A’, ‘B’, and ‘C’ are letters.</p> <p>‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p> <p>‘He said, “I want to go.”’ Were you alive in the 70’s?</p> -<p>Here is some quoted ‘<code>code</code>’ and a “<a href="http://example.com/?foo=1&bar=2">quoted link</a>”.</p> +<p>Here is some quoted ‘<code>code</code>’ and a “<a +href="http://example.com/?foo=1&bar=2">quoted link</a>”.</p> <p>Some dashes: one—two — three—four — five.</p> <p>Dashes between numbers: 5–7, 255–66, 1987–1999.</p> <p>Ellipses…and…and….</p> @@ -567,13 +576,16 @@ Blah <li><span class="math inline"><em>α</em> ∧ <em>ω</em></span></li> <li><span class="math inline">223</span></li> <li><span class="math inline"><em>p</em></span>-Tree</li> -<li>Here’s some display math: <span class="math display">$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</span></li> -<li>Here’s one that has a line break in it: <span class="math inline"><em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup></span>.</li> +<li>Here’s some display math: <span class="math +display">$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</span></li> +<li>Here’s one that has a line break in it: <span class="math +inline"><em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup></span>.</li> </ul> <p>These shouldn’t be math:</p> <ul> <li>To get the famous equation, write <code>$e = mc^2$</code>.</li> -<li>$22,000 is a <em>lot</em> of money. So is $34,000. (It worked if “lot” is emphasized.)</li> +<li>$22,000 is a <em>lot</em> of money. So is $34,000. (It worked if “lot” is +emphasized.)</li> <li>Shoes ($20) and socks ($5).</li> <li>Escaped <code>$</code>: $73 <em>this should be emphasized</em> 23$.</li> </ul> @@ -616,7 +628,8 @@ Blah <p><a href="/url/" title="title">URL and title</a>.</p> <p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p> <p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p> -<p><a href="/url/" title="title with "quotes" in it">URL and title</a></p> +<p><a href="/url/" title="title with "quotes" in it">URL and +title</a></p> <p><a href="/url/" title="title with single quotes">URL and title</a></p> <p><a href="/url/with_underscore">with_underscore</a></p> <p><a href="mailto:nobody@nowhere.net">Email link</a></p> @@ -633,51 +646,78 @@ Blah <p>Foo <a href="/url/" title="Title with "quotes" inside">bar</a>.</p> <p>Foo <a href="/url/" title="Title with "quote" inside">biz</a>.</p> <h2 id="with-ampersands">With ampersands</h2> -<p>Here’s a <a href="http://example.com/?foo=1&bar=2">link with an ampersand in the URL</a>.</p> -<p>Here’s a link with an amersand in the link text: <a href="http://att.com/" title="AT&T">AT&T</a>.</p> +<p>Here’s a <a href="http://example.com/?foo=1&bar=2">link with an ampersand +in the URL</a>.</p> +<p>Here’s a link with an amersand in the link text: <a href="http://att.com/" +title="AT&T">AT&T</a>.</p> <p>Here’s an <a href="/script?foo=1&bar=2">inline link</a>.</p> -<p>Here’s an <a href="/script?foo=1&bar=2">inline link in pointy braces</a>.</p> +<p>Here’s an <a href="/script?foo=1&bar=2">inline link in pointy +braces</a>.</p> <h2 id="autolinks">Autolinks</h2> -<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2" class="uri">http://example.com/?foo=1&bar=2</a></p> +<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2" +class="uri">http://example.com/?foo=1&bar=2</a></p> <ul> <li>In a list?</li> <li><a href="http://example.com/" class="uri">http://example.com/</a></li> <li>It should.</li> </ul> -<p>An e-mail address: <a href="mailto:nobody@nowhere.net" class="email">nobody@nowhere.net</a></p> +<p>An e-mail address: <a href="mailto:nobody@nowhere.net" +class="email">nobody@nowhere.net</a></p> <blockquote> -<p>Blockquoted: <a href="http://example.com/" class="uri">http://example.com/</a></p> +<p>Blockquoted: <a href="http://example.com/" +class="uri">http://example.com/</a></p> </blockquote> -<p>Auto-links should not occur here: <code><http://example.com/></code></p> +<p>Auto-links should not occur here: +<code><http://example.com/></code></p> <pre><code>or here: <http://example.com/></code></pre> <hr /> <h1 id="images">Images</h1> <p>From “Voyage dans la Lune” by Georges Melies (1902):</p> <figure> -<img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" /><figcaption aria-hidden="true">lalune</figcaption> +<img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" /> +<figcaption aria-hidden="true">lalune</figcaption> </figure> <p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p> <hr /> <h1 id="footnotes">Footnotes</h1> -<p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a> and another.<a href="#fn2" class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnote-ref" id="fnref3" role="doc-noteref"><sup>3</sup></a></p> +<p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" id="fnref1" +role="doc-noteref"><sup>1</sup></a> and another.<a href="#fn2" +class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> This should +<em>not</em> be a footnote reference, because it contains a space.[^my note] +Here is an inline note.<a href="#fn3" class="footnote-ref" id="fnref3" +role="doc-noteref"><sup>3</sup></a></p> <blockquote> -<p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" id="fnref4" role="doc-noteref"><sup>4</sup></a></p> +<p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" id="fnref4" +role="doc-noteref"><sup>4</sup></a></p> </blockquote> <ol type="1"> -<li>And in list items.<a href="#fn5" class="footnote-ref" id="fnref5" role="doc-noteref"><sup>5</sup></a></li> +<li>And in list items.<a href="#fn5" class="footnote-ref" id="fnref5" +role="doc-noteref"><sup>5</sup></a></li> </ol> <p>This paragraph should not be part of the note, as it is not indented.</p> <section class="footnotes footnotes-end-of-document" role="doc-endnotes"> <hr /> <ol> -<li id="fn1" role="doc-endnote"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnote-back" role="doc-backlink">↩︎</a></p></li> -<li id="fn2" role="doc-endnote"><p>Here’s the long note. This one contains multiple blocks.</p> -<p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p> +<li id="fn1" role="doc-endnote"><p>Here is the footnote. It can go anywhere +after the footnote reference. It need not be placed at the end of the +document.<a href="#fnref1" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +<li id="fn2" role="doc-endnote"><p>Here’s the long note. This one contains +multiple blocks.</p> +<p>Subsequent blocks are indented to show that they belong to the footnote (as +with list items).</p> <pre><code> { <code> }</code></pre> -<p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnote-back" role="doc-backlink">↩︎</a></p></li> -<li id="fn3" role="doc-endnote"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnote-back" role="doc-backlink">↩︎</a></p></li> -<li id="fn4" role="doc-endnote"><p>In quote.<a href="#fnref4" class="footnote-back" role="doc-backlink">↩︎</a></p></li> -<li id="fn5" role="doc-endnote"><p>In list.<a href="#fnref5" class="footnote-back" role="doc-backlink">↩︎</a></p></li> +<p>If you want, you can indent every line, but you can also be lazy and just +indent the first line of each block.<a href="#fnref2" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +<li id="fn3" role="doc-endnote"><p>This is <em>easier</em> to type. Inline notes +may contain <a href="http://google.com">links</a> and <code>]</code> verbatim +characters, as well as [bracketed text].<a href="#fnref3" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +<li id="fn4" role="doc-endnote"><p>In quote.<a href="#fnref4" +class="footnote-back" role="doc-backlink">↩︎</a></p></li> +<li id="fn5" role="doc-endnote"><p>In list.<a href="#fnref5" +class="footnote-back" role="doc-backlink">↩︎</a></p></li> </ol> </section> </body> |