aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2011-02-04 23:09:51 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2011-02-04 23:09:51 -0800
commitbb89fd99596020f5d7b5bc00c0fe783fb2d1de12 (patch)
tree84d987fd6017a6af5eda112507c6341f527b6faf
parent58929eb4e5d63d13cb660a808a38fb2871e10d68 (diff)
downloadpandoc-bb89fd99596020f5d7b5bc00c0fe783fb2d1de12.tar.gz
Updated tests.
-rw-r--r--tests/lhs-test.nohl.html9
-rw-r--r--tests/lhs-test.nohl.html+lhs9
-rw-r--r--tests/s5.basic.html4
-rw-r--r--tests/s5.fancy.html4
-rw-r--r--tests/s5.fragment.html3
-rw-r--r--tests/s5.inserts.html3
-rw-r--r--tests/tables.html13
-rw-r--r--tests/writer.html393
8 files changed, 56 insertions, 382 deletions
diff --git a/tests/lhs-test.nohl.html b/tests/lhs-test.nohl.html
index 663ea81bb..2b5208408 100644
--- a/tests/lhs-test.nohl.html
+++ b/tests/lhs-test.nohl.html
@@ -7,22 +7,15 @@
</head>
<body>
<h1 id="lhs-test">lhs test</h1>
-
<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
-
<pre class="sourceCode haskell"><code>unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
unsplit = arr . uncurry
-- arr (\op (x,y) -&gt; x `op` y)
</code></pre>
-
<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
-
<pre><code>f *** g = first f &gt;&gt;&gt; second g
</code></pre>
-
<p>Block quote:</p>
-
-<blockquote>
-<p>foo bar</p></blockquote>
+<blockquote><p>foo bar</p></blockquote>
</body>
</html>
diff --git a/tests/lhs-test.nohl.html+lhs b/tests/lhs-test.nohl.html+lhs
index e18ee4ce1..ef9967ec2 100644
--- a/tests/lhs-test.nohl.html+lhs
+++ b/tests/lhs-test.nohl.html+lhs
@@ -7,22 +7,15 @@
</head>
<body>
<h1 id="lhs-test">lhs test</h1>
-
<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
-
<pre class="sourceCode literate haskell"><code>&gt; unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
&gt; unsplit = arr . uncurry
&gt; -- arr (\op (x,y) -&gt; x `op` y)
</code></pre>
-
<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
-
<pre><code>f *** g = first f &gt;&gt;&gt; second g
</code></pre>
-
<p>Block quote:</p>
-
-<blockquote>
-<p>foo bar</p></blockquote>
+<blockquote><p>foo bar</p></blockquote>
</body>
</html>
diff --git a/tests/s5.basic.html b/tests/s5.basic.html
index 581c7842e..34016bf18 100644
--- a/tests/s5.basic.html
+++ b/tests/s5.basic.html
@@ -36,9 +36,7 @@
</div>
<div class="slide">
-
<h1>First slide</h1>
-
<ul>
<li>first bullet</li>
<li>second bullet</li>
@@ -47,9 +45,7 @@
<div class="slide">
-
<h1>Math</h1>
-
<ul>
<li><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
</ul>
diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html
index c165f95a0..6fc2d51f4 100644
--- a/tests/s5.fancy.html
+++ b/tests/s5.fancy.html
@@ -235,9 +235,7 @@
</div>
<div class="slide">
-
<h1>First slide</h1>
-
<ul class="incremental">
<li>first bullet</li>
<li>second bullet</li>
@@ -246,9 +244,7 @@
<div class="slide">
-
<h1>Math</h1>
-
<ul class="incremental">
<li><span class="LaTeX">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
</ul>
diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html
index bf93c05a2..e8a888972 100644
--- a/tests/s5.fragment.html
+++ b/tests/s5.fragment.html
@@ -1,12 +1,9 @@
<h1 id="first-slide">First slide</h1>
-
<ul>
<li>first bullet</li>
<li>second bullet</li>
</ul>
-
<h1 id="math">Math</h1>
-
<ul>
<li><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
</ul>
diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html
index 2de50c3dc..534da25d3 100644
--- a/tests/s5.inserts.html
+++ b/tests/s5.inserts.html
@@ -14,14 +14,11 @@
STUFF INSERTED
<h1 class="title">My S5 Document</h1>
<h1 id="first-slide">First slide</h1>
-
<ul>
<li>first bullet</li>
<li>second bullet</li>
</ul>
-
<h1 id="math">Math</h1>
-
<ul>
<li><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
</ul>
diff --git a/tests/tables.html b/tests/tables.html
index 95c1a4ef5..8f06c5832 100644
--- a/tests/tables.html
+++ b/tests/tables.html
@@ -1,5 +1,4 @@
<p>Simple table with caption:</p>
-
<table><caption>Demonstration of simple table syntax.</caption><thead><tr class="header"><th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
@@ -21,9 +20,7 @@
<td align="left">1</td>
</tr>
</tbody></table>
-
<p>Simple table without caption:</p>
-
<table><thead><tr class="header"><th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
@@ -45,9 +42,7 @@
<td align="left">1</td>
</tr>
</tbody></table>
-
<p>Simple table indented two spaces:</p>
-
<table><caption>Demonstration of simple table syntax.</caption><thead><tr class="header"><th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
@@ -69,9 +64,7 @@
<td align="left">1</td>
</tr>
</tbody></table>
-
<p>Multiline table with caption:</p>
-
<table><caption>Here's the caption. It may span multiple lines.</caption><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><thead><tr class="header"><th align="center">Centered Header</th>
<th align="left">Left Aligned</th>
<th align="right">Right Aligned</th>
@@ -88,9 +81,7 @@
<td align="left">Here's another one. Note the blank line between rows.</td>
</tr>
</tbody></table>
-
<p>Multiline table without caption:</p>
-
<table><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><thead><tr class="header"><th align="center">Centered Header</th>
<th align="left">Left Aligned</th>
<th align="right">Right Aligned</th>
@@ -107,9 +98,7 @@
<td align="left">Here's another one. Note the blank line between rows.</td>
</tr>
</tbody></table>
-
<p>Table without column headers:</p>
-
<table><tbody><tr class="odd"><td align="right">12</td>
<td align="left">12</td>
<td align="center">12</td>
@@ -126,9 +115,7 @@
<td align="right">1</td>
</tr>
</tbody></table>
-
<p>Multiline table without column headers:</p>
-
<table><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><tbody><tr class="odd"><td align="center">First</td>
<td align="left">row</td>
<td align="right">12.0</td>
diff --git a/tests/writer.html b/tests/writer.html
index 02f0ea244..6724fc97e 100644
--- a/tests/writer.html
+++ b/tests/writer.html
@@ -11,85 +11,46 @@
<body>
<h1 class="title">Pandoc Test Suite</h1>
<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>
-
<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>
-
<h1 id="level-1">Level 1</h1>
-
<h2 id="level-2-with-emphasis">Level 2 with <em>emphasis</em></h2>
-
<h3 id="level-3">Level 3</h3>
-
<p>with no blank line</p>
-
<h2 id="level-2">Level 2</h2>
-
<p>with no blank line</p>
-
<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>Here’s one with a bullet. * criminey.</p>
-
<p>There should be a hard line break<br />here.</p>
-
<hr />
-
<h1 id="block-quotes">Block Quotes</h1>
-
<p>E-mail style:</p>
-
-<blockquote>
-<p>This is a block quote. It is pretty short.</p></blockquote>
-
-<blockquote>
-<p>Code in a block quote:</p>
-
+<blockquote><p>This is a block quote. It is pretty short.</p></blockquote>
+<blockquote><p>Code in a block quote:</p>
<pre><code>sub status {
print &quot;working&quot;;
}
</code></pre>
-
<p>A list:</p>
-
<ol style="list-style-type: decimal">
<li>item one</li>
<li>item two</li>
</ol>
-
<p>Nested block quotes:</p>
-
-<blockquote>
-<p>nested</p></blockquote>
-
-<blockquote>
-<p>nested</p></blockquote></blockquote>
-
+<blockquote><p>nested</p></blockquote>
+<blockquote><p>nested</p></blockquote></blockquote>
<p>This should not be a block quote: 2 &gt; 1.</p>
-
<p>And a following paragraph.</p>
-
<hr />
-
<h1 id="code-blocks">Code Blocks</h1>
-
<p>Code:</p>
-
<pre><code>---- (should be four hyphens)
sub status {
@@ -98,150 +59,96 @@ sub status {
this code block is indented by one tab
</code></pre>
-
<p>And:</p>
-
<pre><code> this code block is indented by two tabs
These should not be escaped: \$ \\ \&gt; \[ \{
</code></pre>
-
<hr />
-
<h1 id="lists">Lists</h1>
-
<h2 id="unordered">Unordered</h2>
-
<p>Asterisks tight:</p>
-
<ul>
<li>asterisk 1</li>
<li>asterisk 2</li>
<li>asterisk 3</li>
</ul>
-
<p>Asterisks loose:</p>
-
<ul>
-<li>
-<p>asterisk 1</p></li>
-<li>
-<p>asterisk 2</p></li>
-<li>
-<p>asterisk 3</p></li>
+<li><p>asterisk 1</p></li>
+<li><p>asterisk 2</p></li>
+<li><p>asterisk 3</p></li>
</ul>
-
<p>Pluses tight:</p>
-
<ul>
<li>Plus 1</li>
<li>Plus 2</li>
<li>Plus 3</li>
</ul>
-
<p>Pluses loose:</p>
-
<ul>
-<li>
-<p>Plus 1</p></li>
-<li>
-<p>Plus 2</p></li>
-<li>
-<p>Plus 3</p></li>
+<li><p>Plus 1</p></li>
+<li><p>Plus 2</p></li>
+<li><p>Plus 3</p></li>
</ul>
-
<p>Minuses tight:</p>
-
<ul>
<li>Minus 1</li>
<li>Minus 2</li>
<li>Minus 3</li>
</ul>
-
<p>Minuses loose:</p>
-
<ul>
-<li>
-<p>Minus 1</p></li>
-<li>
-<p>Minus 2</p></li>
-<li>
-<p>Minus 3</p></li>
+<li><p>Minus 1</p></li>
+<li><p>Minus 2</p></li>
+<li><p>Minus 3</p></li>
</ul>
-
<h2 id="ordered">Ordered</h2>
-
<p>Tight:</p>
-
<ol style="list-style-type: decimal">
<li>First</li>
<li>Second</li>
<li>Third</li>
</ol>
-
<p>and:</p>
-
<ol style="list-style-type: decimal">
<li>One</li>
<li>Two</li>
<li>Three</li>
</ol>
-
<p>Loose using tabs:</p>
-
<ol style="list-style-type: decimal">
-<li>
-<p>First</p></li>
-<li>
-<p>Second</p></li>
-<li>
-<p>Third</p></li>
+<li><p>First</p></li>
+<li><p>Second</p></li>
+<li><p>Third</p></li>
</ol>
-
<p>and using spaces:</p>
-
<ol style="list-style-type: decimal">
-<li>
-<p>One</p></li>
-<li>
-<p>Two</p></li>
-<li>
-<p>Three</p></li>
+<li><p>One</p></li>
+<li><p>Two</p></li>
+<li><p>Three</p></li>
</ol>
-
<p>Multiple paragraphs:</p>
-
<ol style="list-style-type: decimal">
-<li>
-<p>Item 1, graf one.</p>
-
+<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>
-<li>
-<p>Item 2.</p></li>
-<li>
-<p>Item 3.</p></li>
+<li><p>Item 2.</p></li>
+<li><p>Item 3.</p></li>
</ol>
-
<h2 id="nested">Nested</h2>
-
<ul>
<li>Tab
-
<ul>
<li>Tab
-
<ul>
<li>Tab</li>
</ul></li>
</ul></li>
</ul>
-
<p>Here’s another:</p>
-
<ol style="list-style-type: decimal">
<li>First</li>
<li>Second:
-
<ul>
<li>Fee</li>
<li>Fie</li>
@@ -249,101 +156,67 @@ These should not be escaped: \$ \\ \&gt; \[ \{
</ul></li>
<li>Third</li>
</ol>
-
<p>Same thing but with paragraphs:</p>
-
<ol style="list-style-type: decimal">
-<li>
-<p>First</p></li>
-<li>
-<p>Second:</p>
-
+<li><p>First</p></li>
+<li><p>Second:</p>
<ul>
<li>Fee</li>
<li>Fie</li>
<li>Foe</li>
</ul></li>
-<li>
-<p>Third</p></li>
+<li><p>Third</p></li>
</ol>
-
<h2 id="tabs-and-spaces">Tabs and spaces</h2>
-
<ul>
-<li>
-<p>this is a list item indented with tabs</p></li>
-<li>
-<p>this is a list item indented with spaces</p>
-
+<li><p>this is a list item indented with tabs</p></li>
+<li><p>this is a list item indented with spaces</p>
<ul>
-<li>
-<p>this is an example list item indented with tabs</p></li>
-<li>
-<p>this is an example list item indented with spaces</p></li>
+<li><p>this is an example list item indented with tabs</p></li>
+<li><p>this is an example list item indented with spaces</p></li>
</ul></li>
</ul>
-
<h2 id="fancy-list-markers">Fancy list markers</h2>
-
<ol start="2" style="list-style-type: decimal">
<li>begins with 2</li>
-<li>
-<p>and now 3</p>
-
+<li><p>and now 3</p>
<p>with a continuation</p>
-
<ol start="4" style="list-style-type: lower-roman">
<li>sublist with roman numerals, starting with 4</li>
<li>more items
-
<ol style="list-style-type: upper-alpha">
<li>a subsublist</li>
<li>a subsublist</li>
</ol></li>
</ol></li>
</ol>
-
<p>Nesting:</p>
-
<ol style="list-style-type: upper-alpha">
<li>Upper Alpha
-
<ol style="list-style-type: upper-roman">
<li>Upper Roman.
-
<ol start="6" style="list-style-type: decimal">
<li>Decimal start with 6
-
<ol start="3" style="list-style-type: lower-alpha">
<li>Lower alpha with paren</li>
</ol></li>
</ol></li>
</ol></li>
</ol>
-
<p>Autonumbering:</p>
-
<ol>
<li>Autonumber.</li>
<li>More.
-
<ol>
<li>Nested.</li>
</ol></li>
</ol>
-
<p>Should not be a list item:</p>
-
<p>M.A. 2007</p>
-
<p>B. Williams</p>
-
<hr />
-
<h1 id="definition-lists">Definition Lists</h1>
-
<p>Tight using spaces:</p>
-
<dl>
<dt>apple</dt>
<dd>red fruit
@@ -355,9 +228,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<dd>yellow fruit
</dd>
</dl>
-
<p>Tight using tabs:</p>
-
<dl>
<dt>apple</dt>
<dd>red fruit
@@ -369,47 +240,32 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<dd>yellow fruit
</dd>
</dl>
-
<p>Loose:</p>
-
<dl>
<dt>apple</dt>
-<dd>
-<p>red fruit</p>
+<dd><p>red fruit</p>
</dd>
<dt>orange</dt>
-<dd>
-<p>orange fruit</p>
+<dd><p>orange fruit</p>
</dd>
<dt>banana</dt>
-<dd>
-<p>yellow fruit</p>
+<dd><p>yellow fruit</p>
</dd>
</dl>
-
<p>Multiple blocks with italics:</p>
-
<dl>
<dt><em>apple</em></dt>
-<dd>
-<p>red fruit</p>
-
+<dd><p>red fruit</p>
<p>contains seeds, crisp, pleasant to taste</p>
</dd>
<dt><em>orange</em></dt>
-<dd>
-<p>orange fruit</p>
-
+<dd><p>orange fruit</p>
<pre><code>{ orange code block }
</code></pre>
-
-<blockquote>
-<p>orange block quote</p></blockquote>
+<blockquote><p>orange block quote</p></blockquote>
</dd>
</dl>
-
<p>Multiple definitions, tight:</p>
-
<dl>
<dt>apple</dt>
<dd>red fruit
@@ -420,52 +276,37 @@ These should not be escaped: \$ \\ \&gt; \[ \{
</dd><dd>bank
</dd>
</dl>
-
<p>Multiple definitions, loose:</p>
-
<dl>
<dt>apple</dt>
-<dd>
-<p>red fruit</p>
-</dd><dd>
-<p>computer</p>
+<dd><p>red fruit</p>
+</dd><dd><p>computer</p>
</dd>
<dt>orange</dt>
-<dd>
-<p>orange fruit</p>
-</dd><dd>
-<p>bank</p>
+<dd><p>orange fruit</p>
+</dd><dd><p>bank</p>
</dd>
</dl>
-
<p>Blank line after term, indented marker, alternate markers:</p>
-
<dl>
<dt>apple</dt>
-<dd>
-<p>red fruit</p>
-</dd><dd>
-<p>computer</p>
+<dd><p>red fruit</p>
+</dd><dd><p>computer</p>
</dd>
<dt>orange</dt>
-<dd>
-<p>orange fruit</p>
-
+<dd><p>orange fruit</p>
<ol style="list-style-type: decimal">
<li>sublist</li>
<li>sublist</li>
</ol>
</dd>
</dl>
-
<h1 id="html-blocks">HTML Blocks</h1>
-
<p>Simple block on one line:</p>
<div>
foo
</div>
-
<p>And nested without indentation:</p>
<div>
<div>
@@ -478,7 +319,6 @@ bar
</div>
</div>
-
<p>Interpreted markdown in a table:</p>
<table>
<tr>
@@ -493,26 +333,20 @@ And this is <strong>strong</strong>
<script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script>
-
<p>Here’s a simple block:</p>
<div>
foo
</div>
-
<p>This should be a code block, though:</p>
-
<pre><code>&lt;div&gt;
foo
&lt;/div&gt;
</code></pre>
-
<p>As should this:</p>
-
<pre><code>&lt;div&gt;foo&lt;/div&gt;
</code></pre>
-
<p>Now, nested:</p>
<div>
<div>
@@ -523,11 +357,9 @@ foo
</div>
</div>
-
<p>This should just be an HTML comment:</p>
<!-- Comment -->
-
<p>Multiline:</p>
<!--
Blah
@@ -538,21 +370,15 @@ Blah
This is another comment.
-->
-
<p>Code block:</p>
-
<pre><code>&lt;!-- Comment --&gt;
</code></pre>
-
<p>Just plain comment, with trailing spaces on the line:</p>
<!-- foo -->
-
<p>Code:</p>
-
<pre><code>&lt;hr /&gt;
</code></pre>
-
<p>Hr’s:</p>
<hr>
@@ -572,59 +398,32 @@ Blah
<hr class="foo" id="bar">
-
<hr />
-
<h1 id="inline-markup">Inline Markup</h1>
-
<p>This is <em>emphasized</em>, and so <em>is this</em>.</p>
-
<p>This is <strong>strong</strong>, and so <strong>is this</strong>.</p>
-
<p>An <em><a href="/url">emphasized link</a></em>.</p>
-
<p><strong><em>This is strong and em.</em></strong></p>
-
<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>&gt;</code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code>&lt;html&gt;</code>.</p>
-
<p><span style="text-decoration: line-through;">This is <em>strikeout</em>.</span></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>
-
<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&amp;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>
-
<hr />
-
<h1 id="latex">LaTeX</h1>
-
<ul>
<li></li>
<li><span class="math">2 + 2 = 4</span></li>
@@ -635,25 +434,18 @@ Blah
<li>Here’s some display math: <br /><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span><br /></li>
<li>Here’s one that has a line break in it: <span class="math">α + ω × <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>Shoes ($20) and socks ($5).</li>
<li>Escaped <code>$</code>: $73 <em>this should be emphasized</em> 23$.</li>
</ul>
-
<p>Here’s a LaTeX table:</p>
-
<hr />
-
<h1 id="special-characters">Special Characters</h1>
-
<p>Here is some unicode:</p>
-
<ul>
<li>I hat: Î</li>
<li>o umlaut: ö</li>
@@ -661,185 +453,108 @@ Blah
<li>set membership: ∈</li>
<li>copyright: ©</li>
</ul>
-
<p>AT&amp;T has an ampersand in their name.</p>
-
<p>AT&amp;T is another way to write it.</p>
-
<p>This &amp; that.</p>
-
<p>4 &lt; 5.</p>
-
<p>6 &gt; 5.</p>
-
<p>Backslash: \</p>
-
<p>Backtick: `</p>
-
<p>Asterisk: *</p>
-
<p>Underscore: _</p>
-
<p>Left brace: {</p>
-
<p>Right brace: }</p>
-
<p>Left bracket: [</p>
-
<p>Right bracket: ]</p>
-
<p>Left paren: (</p>
-
<p>Right paren: )</p>
-
<p>Greater-than: &gt;</p>
-
<p>Hash: #</p>
-
<p>Period: .</p>
-
<p>Bang: !</p>
-
<p>Plus: +</p>
-
<p>Minus: -</p>
-
<hr />
-
<h1 id="links">Links</h1>
-
<h2 id="explicit">Explicit</h2>
-
<p>Just a <a href="/url/">URL</a>.</p>
-
<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 &quot;quotes&quot; 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><script type="text/javascript">
<!--
h='&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#46;&#110;&#x65;&#116;';a='&#64;';n='&#110;&#x6f;&#98;&#x6f;&#100;&#x79;';e=n+a+h;
document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>');
// -->
</script><noscript>&#x45;&#x6d;&#x61;&#x69;&#108;&#32;&#108;&#x69;&#110;&#x6b;&#32;&#40;&#110;&#x6f;&#98;&#x6f;&#100;&#x79;&#32;&#x61;&#116;&#32;&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#32;&#100;&#x6f;&#116;&#32;&#110;&#x65;&#116;&#x29;</noscript></p>
-
<p><a href="">Empty</a>.</p>
-
<h2 id="reference">Reference</h2>
-
<p>Foo <a href="/url/">bar</a>.</p>
-
<p>Foo <a href="/url/">bar</a>.</p>
-
<p>Foo <a href="/url/">bar</a>.</p>
-
<p>With <a href="/url/">embedded [brackets]</a>.</p>
-
<p><a href="/url/">b</a> by itself should be a link.</p>
-
<p>Indented <a href="/url">once</a>.</p>
-
<p>Indented <a href="/url">twice</a>.</p>
-
<p>Indented <a href="/url">thrice</a>.</p>
-
<p>This should [not][] be a link.</p>
-
<pre><code>[not]: /url
</code></pre>
-
<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
-
<p>Foo <a href="/url/" title="Title with &quot;quote&quot; inside">biz</a>.</p>
-
<h2 id="with-ampersands">With ampersands</h2>
-
<p>Here’s a <a href="http://example.com/?foo=1&amp;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&amp;T">AT&amp;T</a>.</p>
-
<p>Here’s an <a href="/script?foo=1&amp;bar=2">inline link</a>.</p>
-
<p>Here’s an <a href="/script?foo=1&amp;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&amp;bar=2"><code class="url">http://example.com/?foo=1&amp;bar=2</code></a></p>
-
<ul>
<li>In a list?</li>
<li><a href="http://example.com/"><code class="url">http://example.com/</code></a></li>
<li>It should.</li>
</ul>
-
<p>An e-mail address: <script type="text/javascript">
<!--
h='&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#46;&#110;&#x65;&#116;';a='&#64;';n='&#110;&#x6f;&#98;&#x6f;&#100;&#x79;';e=n+a+h;
document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+'a'+'>');
// -->
</script><noscript>&#110;&#x6f;&#98;&#x6f;&#100;&#x79;&#32;&#x61;&#116;&#32;&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#32;&#100;&#x6f;&#116;&#32;&#110;&#x65;&#116;</noscript></p>
-
-<blockquote>
-<p>Blockquoted: <a href="http://example.com/"><code class="url">http://example.com/</code></a></p></blockquote>
-
+<blockquote><p>Blockquoted: <a href="http://example.com/"><code class="url">http://example.com/</code></a></p></blockquote>
<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
-
<pre><code>or here: &lt;http://example.com/&gt;
</code></pre>
-
<hr />
-
<h1 id="images">Images</h1>
-
<p>From “Voyage dans la Lune” by Georges Melies (1902):</p>
-
<div class="figure">
<img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" /><p class="caption">lalune</p>
</div>
-
<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,<sup><a href="#fn1" class="footnoteRef" id="fnref1">1</a></sup> and another.<sup><a href="#fn2" class="footnoteRef" id="fnref2">2</a></sup> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<sup><a href="#fn3" class="footnoteRef" id="fnref3">3</a></sup></p>
-
-<blockquote>
-<p>Notes can go in quotes.<sup><a href="#fn4" class="footnoteRef" id="fnref4">4</a></sup></p></blockquote>
-
+<blockquote><p>Notes can go in quotes.<sup><a href="#fn4" class="footnoteRef" id="fnref4">4</a></sup></p></blockquote>
<ol style="list-style-type: decimal">
<li>And in list items.<sup><a href="#fn5" class="footnoteRef" id="fnref5">5</a></sup></li>
</ol>
-
-<p>This paragraph should not be part of the note, as it is not indented.</p><div class="footnotes">
+<p>This paragraph should not be part of the note, as it is not indented.</p>
+<div class="footnotes">
<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="footnoteBackLink" title="Jump back to footnote 1">↩</a></p></li>
-<li id="fn2">
-<p>Here’s the long note. This one contains multiple blocks.</p>
-
+<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="footnoteBackLink" title="Jump back to footnote 1">↩</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>
-
<pre><code> { &lt;code&gt; }
</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="footnoteBackLink" title="Jump back to footnote 2">↩</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="footnoteBackLink" title="Jump back to footnote 3">↩</a></p></li>
-<li id="fn4">
-<p>In quote. <a href="#fnref4" class="footnoteBackLink" title="Jump back to footnote 4">↩</a></p></li>
-<li id="fn5">
-<p>In list. <a href="#fnref5" class="footnoteBackLink" title="Jump back to footnote 5">↩</a></p></li>
-</ol></div>
+<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="footnoteBackLink" title="Jump back to footnote 3">↩</a></p></li>
+<li id="fn4"><p>In quote. <a href="#fnref4" class="footnoteBackLink" title="Jump back to footnote 4">↩</a></p></li>
+<li id="fn5"><p>In list. <a href="#fnref5" class="footnoteBackLink" title="Jump back to footnote 5">↩</a></p></li>
+</ol>
+</div>
</body>
</html>