aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/generate.sh1
-rw-r--r--tests/runtests.pl6
-rw-r--r--tests/s5.basic.html25
-rw-r--r--tests/s5.fancy.html25
-rw-r--r--tests/s5.fragment.html14
-rw-r--r--tests/s5.inserts.html21
-rw-r--r--tests/s5.native6
-rw-r--r--tests/testsuite.native114
-rw-r--r--tests/writer.docbook61
-rw-r--r--tests/writer.html903
-rw-r--r--tests/writer.latex4
-rw-r--r--tests/writer.markdown4
-rw-r--r--tests/writer.native114
-rw-r--r--tests/writer.rst4
-rw-r--r--tests/writer.rtf56
-rw-r--r--tests/writer.smart.html474
16 files changed, 850 insertions, 982 deletions
diff --git a/tests/generate.sh b/tests/generate.sh
index 4c236e654..a98ec66a8 100755
--- a/tests/generate.sh
+++ b/tests/generate.sh
@@ -4,7 +4,6 @@
../pandoc -r native -s -w markdown testsuite.native > writer.markdown
../pandoc -r native -s -w rst testsuite.native > writer.rst
../pandoc -r native -s -w html testsuite.native > writer.html
-../pandoc -r native -s -w html -S testsuite.native > writer.smart.html
../pandoc -r native -s -w latex testsuite.native > writer.latex
../pandoc -r native -s -w rtf testsuite.native > writer.rtf
sed -e '/^, Header 1 \[Str "HTML",Space,Str "Blocks"\]/,/^, HorizontalRule/d' testsuite.native | ../pandoc -r native -w docbook -s > writer.docbook
diff --git a/tests/runtests.pl b/tests/runtests.pl
index ed624e359..754b6e75e 100644
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -14,7 +14,7 @@ unless (-x $script) { die "$script is not executable.\n"; }
print "Writer tests:\n";
-my @writeformats = ("html", "smart.html", "latex", "rst", "rtf", "markdown", "native"); # s5 separately
+my @writeformats = ("html", "latex", "rst", "rtf", "markdown", "native"); # s5 separately
my @readformats = ("latex", "native"); # handle html,markdown & rst separately
my $source = "testsuite.native";
@@ -62,7 +62,7 @@ print "Testing s5 writer (basic)...";
test_results("s5 writer (basic)", "tmp.html", "s5.basic.html");
print "Testing s5 writer (fancy)...";
-`$script -r native -w s5 -s -S -m -i s5.native > tmp.html`;
+`$script -r native -w s5 -s -m -i s5.native > tmp.html`;
test_results("s5 writer (fancy)", "tmp.html", "s5.fancy.html");
print "Testing html fragment...";
@@ -76,7 +76,7 @@ test_results("-B, -A, -H, -c options", "tmp.html", "s5.inserts.html");
print "\nReader tests:\n";
print "Testing markdown reader...";
-`$script -r markdown -w native -s testsuite.txt > tmp.native`;
+`$script -r markdown -w native -s -S testsuite.txt > tmp.native`;
test_results("markdown reader", "tmp.native", "testsuite.native");
print "Testing rst reader...";
diff --git a/tests/s5.basic.html b/tests/s5.basic.html
index 50ce30968..8722240f6 100644
--- a/tests/s5.basic.html
+++ b/tests/s5.basic.html
@@ -737,6 +737,7 @@ function startup() {
window.onload = startup;
window.onresize = function(){setTimeout('fontScale()', 50);}</script>
+
<meta name="author" content="Sam Smith, Jen Jones" />
<meta name="date" content="July 15, 2006" />
<title>My S5 Document</title>
@@ -747,38 +748,40 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>
<div id="currentSlide"></div>
<div id="header"></div>
<div id="footer">
+
<h1>July 15, 2006</h1>
<h2>My S5 Document</h2>
</div>
</div>
+
<div class="presentation">
+
<div class="slide">
+
<h1>My S5 Document</h1>
<h3>Sam Smith, Jen Jones</h3>
<h4>July 15, 2006</h4>
</div>
+
<div class="slide">
+
<h1>First slide</h1>
<ul>
-<li>first bullet</li>
-<li>second bullet</li>
-</ul>
-</div>
-<div class="slide">
-<h1>Smarty</h1>
-<ul class="incremental">
-<li>&quot;Hello there&quot;</li>
-<li>Here's a -- dash</li>
-<li>And 'ellipses'...</li>
+ <li>first bullet</li>
+ <li>second bullet</li>
</ul>
</div>
+
<div class="slide">
+
<h1>Math</h1>
<ul>
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
+ <li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
</ul>
</div>
+
</div>
+
</body>
</html>
diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html
index fbf872241..8892e2ac7 100644
--- a/tests/s5.fancy.html
+++ b/tests/s5.fancy.html
@@ -1649,6 +1649,7 @@ else
}
}
</script>
+
<meta name="author" content="Sam Smith, Jen Jones" />
<meta name="date" content="July 15, 2006" />
<title>My S5 Document</title>
@@ -1659,38 +1660,40 @@ else
<div id="currentSlide"></div>
<div id="header"></div>
<div id="footer">
+
<h1>July 15, 2006</h1>
<h2>My S5 Document</h2>
</div>
</div>
+
<div class="presentation">
+
<div class="slide">
+
<h1>My S5 Document</h1>
<h3>Sam Smith, Jen Jones</h3>
<h4>July 15, 2006</h4>
</div>
+
<div class="slide">
+
<h1>First slide</h1>
<ul class="incremental">
-<li>first bullet</li>
-<li>second bullet</li>
-</ul>
-</div>
-<div class="slide">
-<h1>Smarty</h1>
-<ul>
-<li>&ldquo;Hello there&rdquo;</li>
-<li>Here&rsquo;s a&mdash;dash</li>
-<li>And &lsquo;ellipses&rsquo;&hellip;</li>
+ <li>first bullet</li>
+ <li>second bullet</li>
</ul>
</div>
+
<div class="slide">
+
<h1>Math</h1>
<ul class="incremental">
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
+ <li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
</ul>
</div>
+
</div>
+
</body>
</html>
diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html
index c40f2514e..728ca8704 100644
--- a/tests/s5.fragment.html
+++ b/tests/s5.fragment.html
@@ -1,17 +1,9 @@
<h1>First slide</h1>
<ul>
-<li>first bullet</li>
-<li>second bullet</li>
+ <li>first bullet</li>
+ <li>second bullet</li>
</ul>
-<h1>Smarty</h1>
-<blockquote>
-<ul>
-<li>&quot;Hello there&quot;</li>
-<li>Here's a -- dash</li>
-<li>And 'ellipses'...</li>
-</ul>
-</blockquote>
<h1>Math</h1>
<ul>
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
+ <li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
</ul>
diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html
index c7e544409..836546d2d 100644
--- a/tests/s5.inserts.html
+++ b/tests/s5.inserts.html
@@ -6,30 +6,27 @@
<meta name="generator" content="pandoc" />
<link rel="stylesheet" href="main.css" type="text/css" media="all" />
STUFF INSERTED
+
<meta name="author" content="Sam Smith, Jen Jones" />
<meta name="date" content="July 15, 2006" />
<title>My S5 Document</title>
</head>
<body>
STUFF INSERTED
-<h1 class="title">My S5 Document</h1>
+
+<h1 class="title">
+My S5 Document
+</h1>
<h1>First slide</h1>
<ul>
-<li>first bullet</li>
-<li>second bullet</li>
+ <li>first bullet</li>
+ <li>second bullet</li>
</ul>
-<h1>Smarty</h1>
-<blockquote>
-<ul>
-<li>&quot;Hello there&quot;</li>
-<li>Here's a -- dash</li>
-<li>And 'ellipses'...</li>
-</ul>
-</blockquote>
<h1>Math</h1>
<ul>
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
+ <li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
</ul>
STUFF INSERTED
+
</body>
</html>
diff --git a/tests/s5.native b/tests/s5.native
index 154011f68..115a89f68 100644
--- a/tests/s5.native
+++ b/tests/s5.native
@@ -3,12 +3,6 @@ Pandoc (Meta [Str "My",Space,Str "S5",Space,Str "Document"] ["Sam Smith","Jen Jo
, BulletList
[ [ Plain [Str "first",Space,Str "bullet"] ]
, [ Plain [Str "second",Space,Str "bullet"] ] ]
-, Header 1 [Str "Smarty"]
-, BlockQuote
- [ BulletList
- [ [ Plain [Str "\"Hello",Space,Str "there\""] ]
- , [ Plain [Str "Here's",Space,Str "a",Space,Str "--",Space,Str "dash"] ]
- , [ Plain [Str "And",Space,Str "'ellipses'..."] ] ] ]
, Header 1 [Str "Math"]
, BulletList
[ [ Plain [TeX "$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$"] ]
diff --git a/tests/testsuite.native b/tests/testsuite.native
index 81b601870..cb60c1922 100644
--- a/tests/testsuite.native
+++ b/tests/testsuite.native
@@ -1,5 +1,5 @@
Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane","Anonymous"] "July 17, 2006")
-[ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
+[ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."]
, HorizontalRule
, Header 1 [Str "Headers"]
, Header 2 [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link [Str "embedded",Space,Str "link"] (Src "/url" "")]
@@ -14,15 +14,15 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
, HorizontalRule
, Header 1 [Str "Paragraphs"]
-, Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-, Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard",Str "-",Str "wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-, Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
-, Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "regular",Space,Str "paragraph",Str "."]
+, Para [Str "In",Space,Str "Markdown",Space,Str "1",Str ".",Str "0",Str ".",Str "0",Space,Str "and",Space,Str "earlier",Str ".",Space,Str "Version",Space,Str "8",Str ".",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item",Str ".",Space,Str "Because",Space,Str "a",Space,Str "hard",Str "-",Str "wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item",Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet",Str ".",Space,Str "*",Space,Str "criminey",Str "."]
+, Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here",Str "."]
, HorizontalRule
, Header 1 [Str "Block",Space,Str "Quotes"]
, Para [Str "E",Str "-",Str "mail",Space,Str "style:"]
, BlockQuote
- [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."] ]
+ [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote",Str ".",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short",Str "."] ]
, BlockQuote
[ Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
@@ -38,7 +38,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BlockQuote
[ Para [Str "nested"] ]
]
-, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."]
+, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1",Str "."]
, Para [Str "Box",Str "-",Str "style:"]
, BlockQuote
[ Para [Str "Example:"]
@@ -47,13 +47,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
[ OrderedList
[ [ Plain [Str "do",Space,Str "laundry"] ]
, [ Plain [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"] ] ] ]
-, Para [Str "Here's",Space,Str "a",Space,Str "nested",Space,Str "one:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "nested",Space,Str "one:"]
, BlockQuote
[ Para [Str "Joe",Space,Str "said:"]
, BlockQuote
- [ Para [Str "Don't",Space,Str "quote",Space,Str "me."] ]
+ [ Para [Str "Don",Apostrophe,Str "t",Space,Str "quote",Space,Str "me",Str "."] ]
]
-, Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
+, Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph",Str "."]
, HorizontalRule
, Header 1 [Str "Code",Space,Str "Blocks"]
, Para [Str "Code:"]
@@ -116,9 +116,9 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Para [Str "Three"] ] ]
, Para [Str "Multiple",Space,Str "paragraphs:"]
, OrderedList
- [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
- , Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog's",Space,Str "back."] ], [ Para [Str "Item",Space,Str "2."] ]
- , [ Para [Str "Item",Space,Str "3."] ] ]
+ [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one",Str "."]
+ , Para [Str "Item",Space,Str "1",Str ".",Space,Str "graf",Space,Str "two",Str ".",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog",Apostrophe,Str "s",Space,Str "back",Str "."] ], [ Para [Str "Item",Space,Str "2",Str "."] ]
+ , [ Para [Str "Item",Space,Str "3",Str "."] ] ]
, Header 2 [Str "Nested"]
, BulletList
[ [ Plain [Str "Tab"]
@@ -127,7 +127,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BulletList
[ [ Plain [Str "Tab"] ]
] ] ] ] ]
-, Para [Str "Here's",Space,Str "another:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "another:"]
, OrderedList
[ [ Plain [Str "First"] ]
, [ Plain [Str "Second:"]
@@ -168,7 +168,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, RawHtml "</td>\n<td>"
, Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]]
, RawHtml "</td>\n</tr>\n</table>\n\n<script type=\"text/javascript\">document.write('This *should not* be interpreted as markdown');</script>\n"
-, Para [Str "Here's",Space,Str "a",Space,Str "simple",Space,Str "block:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"]
, RawHtml "<div>\n "
, Plain [Str "foo"]
, RawHtml "</div>\n"
@@ -190,28 +190,28 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, RawHtml "<!-- foo --> \n"
, Para [Str "Code:"]
, CodeBlock "<hr />"
-, Para [Str "Hr's:"]
+, Para [Str "Hr",Apostrophe,Str "s:"]
, RawHtml "<hr>\n\n<hr />\n\n<hr />\n\n<hr> \n\n<hr /> \n\n<hr /> \n\n<hr class=\"foo\" id=\"bar\" />\n\n<hr class=\"foo\" id=\"bar\" />\n\n<hr class=\"foo\" id=\"bar\">\n"
, HorizontalRule
, Header 1 [Str "Inline",Space,Str "Markup"]
, Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."]
, Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."]
, Para [Str "An",Space,Emph [Link [Str "emphasized",Space,Str "link"] (Src "/url" "")],Str "."]
-, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
+, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em",Str "."]]]
+, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."]
+, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em",Str "."]]]
+, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."]
, Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ">",Str ",",Space,Code "$",Str ",",Space,Code "\\",Str ",",Space,Code "\\$",Str ",",Space,Code "<html>",Str "."]
, HorizontalRule
, Header 1 [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-, Para [Str "\"Hello,\"",Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Str "\"'Shelob'",Space,Str "is",Space,Str "my",Space,Str "name.\""]
-, Para [Str "'A',",Space,Str "'B',",Space,Str "and",Space,Str "'C'",Space,Str "are",Space,Str "letters."]
-, Para [Str "'Oak,'",Space,Str "'elm,'",Space,Str "and",Space,Str "'beech'",Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Str "'pine.'"]
-, Para [Str "'He",Space,Str "said,",Space,Str "\"I",Space,Str "want",Space,Str "to",Space,Str "go.\"'",Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70's?"]
-, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Str "'",Code "code",Str "'",Space,Str "and",Space,Str "a",Space,Str "\"",Link [Str "quoted",Space,Str "link"] (Ref [Str "1"]),Str "\"."]
-, Para [Str "Some",Space,Str "dashes:",Space,Str "one",Str "---",Str "two",Space,Str "---",Space,Str "three",Str "--",Str "four",Space,Str "--",Space,Str "five."]
-, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",Str "-",Str "7,",Space,Str "255",Str "-",Str "66,",Space,Str "1987",Str "-",Str "1999."]
-, Para [Str "Ellipses...and.",Space,Str ".",Space,Str ".and",Space,Str ".",Space,Str ".",Space,Str ".",Space,Str "."]
+, Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider",Str ".",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name",Str "."]]
+, Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters",Str "."]
+, Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees",Str ".",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine",Str "."]]
+, Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go",Str "."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70",Apostrophe,Str "s?"]
+, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link [Str "quoted",Space,Str "link"] (Ref [Str "1"])],Str "."]
+, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",EmDash,Str "three",EmDash,Str "four",EmDash,Str "five",Str "."]
+, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",EnDash,Str "7,",Space,Str "255",EnDash,Str "66,",Space,Str "1987",EnDash,Str "1999",Str "."]
+, Para [Str "Ellipses",Ellipses,Str "and",Ellipses,Str "and",Ellipses,Str "."]
, HorizontalRule
, Header 1 [Str "LaTeX"]
, BulletList
@@ -223,13 +223,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Plain [TeX "$223$"] ]
, [ Plain [TeX "$p$",Str "-",Str "Tree"] ]
, [ Plain [TeX "$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$"] ]
- , [ Plain [Str "Here's",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,TeX "$\\alpha + \\omega \\times x^2$",Str "."] ] ]
-, Para [Str "These",Space,Str "shouldn't",Space,Str "be",Space,Str "math:"]
+ , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,TeX "$\\alpha + \\omega \\times x^2$",Str "."] ] ]
+, Para [Str "These",Space,Str "shouldn",Apostrophe,Str "t",Space,Str "be",Space,Str "math:"]
, BulletList
[ [ Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code "$e = mc^2$",Str "."] ]
- , [ Plain [Str "$",Str "22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$",Str "34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Str "\"lot\"",Space,Str "is",Space,Str "emphasized.)"] ]
+ , [ Plain [Str "$",Str "22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money",Str ".",Space,Str "So",Space,Str "is",Space,Str "$",Str "34,000",Str ".",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized",Str ".",Str ")"] ]
, [ Plain [Str "Escaped",Space,Code "$",Str ":",Space,Str "$",Str "73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23",Str "$",Str "."] ] ]
-, Para [Str "Here's",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
, Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}"]
, HorizontalRule
, Header 1 [Str "Special",Space,Str "Characters"]
@@ -240,11 +240,11 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Plain [Str "section:",Space,Str "\167"] ]
, [ Plain [Str "set",Space,Str "membership:",Space,Str "\8712"] ]
, [ Plain [Str "copyright:",Space,Str "\169"] ] ]
-, Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-, Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-, Para [Str "This",Space,Str "&",Space,Str "that."]
-, Para [Str "4",Space,Str "<",Space,Str "5."]
-, Para [Str "6",Space,Str ">",Space,Str "5."]
+, Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name",Str "."]
+, Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it",Str "."]
+, Para [Str "This",Space,Str "&",Space,Str "that",Str "."]
+, Para [Str "4",Space,Str "<",Space,Str "5",Str "."]
+, Para [Str "6",Space,Str ">",Space,Str "5",Str "."]
, Para [Str "Backslash:",Space,Str "\\"]
, Para [Str "Backtick:",Space,Str "`"]
, Para [Str "Asterisk:",Space,Str "*"]
@@ -278,11 +278,11 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "Foo",Space,Link [Str "bar"] (Ref [Str "a"]),Str "."]
, Key [Str "a"] (Src "/url/" "")
, Para [Str "With",Space,Link [Str "embedded",Space,Str "[",Str "brackets",Str "]"] (Ref [Str "b"]),Str "."]
-, Para [Link [Str "b"] (Ref [Str "b"]),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
+, Para [Link [Str "b"] (Ref [Str "b"]),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link",Str "."]
, Para [Str "Indented",Space,Link [Str "once"] (Ref [Str "once"]),Str "."]
, Para [Str "Indented",Space,Link [Str "twice"] (Ref [Str "twice"]),Str "."]
, Para [Str "Indented",Space,Link [Str "thrice"] (Ref [Str "thrice"]),Str "."]
-, Para [Str "This",Space,Str "should",Space,Str "[",Str "not",Str "]",Str "[",Str "]",Space,Str "be",Space,Str "a",Space,Str "link."]
+, Para [Str "This",Space,Str "should",Space,Str "[",Str "not",Str "]",Str "[",Str "]",Space,Str "be",Space,Str "a",Space,Str "link",Str "."]
, Key [Str "once"] (Src "/url" "")
, Key [Str "twice"] (Src "/url" "")
, Key [Str "thrice"] (Src "/url" "")
@@ -292,10 +292,10 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "Foo",Space,Link [Str "biz"] (Src "/url/" "Title with &quot;quote&quot; inside"),Str "."]
, Key [Str "bar"] (Src "/url/" "Title with &quot;quotes&quot; inside")
, Header 2 [Str "With",Space,Str "ampersands"]
-, Para [Str "Here's",Space,Str "a",Space,Link [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] (Ref [Str "1"]),Str "."]
-, Para [Str "Here's",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link [Str "AT&T"] (Ref [Str "2"]),Str "."]
-, Para [Str "Here's",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] (Src "/script?foo=1&bar=2" ""),Str "."]
-, Para [Str "Here's",Space,Str "an",Space,Link [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] (Src "/script?foo=1&bar=2" ""),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Link [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] (Ref [Str "1"]),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link [Str "AT&T"] (Ref [Str "2"]),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] (Src "/script?foo=1&bar=2" ""),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] (Src "/script?foo=1&bar=2" ""),Str "."]
, Key [Str "1"] (Src "http://example.com/?foo=1&bar=2" "")
, Key [Str "2"] (Src "http://att.com/" "AT&T")
, Header 2 [Str "Autolinks"]
@@ -303,7 +303,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BulletList
[ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ]
, [ Plain [Link [Str "http://example.com/"] (Src "http://example.com/" "")] ]
- , [ Plain [Str "It",Space,Str "should."] ] ]
+ , [ Plain [Str "It",Space,Str "should",Str "."] ] ]
, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Str "nobody@nowhere.net"] (Src "mailto:nobody@nowhere.net" "")]
, BlockQuote
[ Para [Str "Blockquoted:",Space,Link [Str "http://example.com/"] (Src "http://example.com/" "")] ]
@@ -312,34 +312,34 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, CodeBlock "or here: <http://example.com/>"
, HorizontalRule
, Header 1 [Str "Images"]
-, Para [Str "From",Space,Str "\"Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune\"",Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
+, Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
, Para [Image [Str "lalune"] (Ref [Str "lalune"])]
, Key [Str "lalune"] (Src "lalune.jpg" "Voyage dans la Lune")
-, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon."]
+, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon",Str "."]
, HorizontalRule
, Header 1 [Str "Footnotes"]
-, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another.",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space.",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",NoteRef "3"]
+, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another",Str ".",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str ".",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note",Str ".",NoteRef "3"]
, BlockQuote
- [ Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",NoteRef "4"] ]
+ [ Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes",Str ".",NoteRef "4"] ]
, OrderedList
- [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",NoteRef "5"] ]
+ [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",NoteRef "5"] ]
]
-, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."]
+, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."]
, Note "1"
- [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."] ]
+ [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote",Str ".",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference",Str ".",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document",Str "."] ]
, Note "2"
- [ Para [Str "Here's",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."]
- , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."]
+ [ Para [Str "Here",Apostrophe,Str "s",Space,Str "the",Space,Str "long",Space,Str "note",Str ".",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks",Str "."]
+ , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)",Str "."]
, CodeBlock " { <code> }"
- , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ]
+ , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block",Str "."] ]
, Note "3"
- [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters."] ]
+ [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type",Str ".",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters",Str "."] ]
, Note "4"
- [ Para [Str "In",Space,Str "quote."] ]
+ [ Para [Str "In",Space,Str "quote",Str "."] ]
, Note "5"
- [ Para [Str "In",Space,Str "list."] ]
+ [ Para [Str "In",Space,Str "list",Str "."] ]
]
diff --git a/tests/writer.docbook b/tests/writer.docbook
index 150b63bac..c6c99f9bf 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -17,7 +17,7 @@
</articleinfo>
<para>
This is a set of tests for pandoc. Most of them are adapted from
- John Gruber's markdown test suite.
+ John Gruber&apos;s markdown test suite.
</para>
<section>
<title>Headers</title>
@@ -58,7 +58,7 @@
<section>
<title>Paragraphs</title>
<para>
- Here's a regular paragraph.
+ Here&apos;s a regular paragraph.
</para>
<para>
In Markdown 1.0.0 and earlier. Version 8. This line turns into a
@@ -66,7 +66,7 @@
looked like a list item.
</para>
<para>
- Here's one with a bullet. * criminey.
+ Here&apos;s one with a bullet. * criminey.
</para>
<para>
There should be a hard line
@@ -152,7 +152,7 @@ sub status {
</orderedlist>
</blockquote>
<para>
- Here's a nested one:
+ Here&apos;s a nested one:
</para>
<blockquote>
<para>
@@ -160,7 +160,7 @@ sub status {
</para>
<blockquote>
<para>
- Don't quote me.
+ Don&apos;t quote me.
</para>
</blockquote>
</blockquote>
@@ -407,8 +407,8 @@ These should not be escaped: \$ \\ \&gt; \[ \{
Item 1, graf one.
</para>
<para>
- Item 1. graf two. The quick brown fox jumped over the lazy dog's
- back.
+ Item 1. graf two. The quick brown fox jumped over the lazy
+ dog&apos;s back.
</para>
</listitem>
<listitem>
@@ -447,7 +447,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
</listitem>
</itemizedlist>
<para>
- Here's another:
+ Here&apos;s another:
</para>
<orderedlist>
<listitem>
@@ -585,30 +585,33 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<section>
<title>Smart quotes, ellipses, dashes</title>
<para>
- &quot;Hello,&quot; said the spider. &quot;'Shelob' is my
- name.&quot;
+ <quote>Hello,</quote> said the spider.
+ <quote><quote>Shelob</quote> is my name.</quote>
</para>
<para>
- 'A', 'B', and 'C' are letters.
+ <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are
+ letters.
</para>
<para>
- 'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'
+ <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote>
+ are names of trees. So is <quote>pine.</quote>
</para>
<para>
- 'He said, &quot;I want to go.&quot;' Were you alive in the 70's?
+ <quote>He said, <quote>I want to go.</quote></quote> Were you alive
+ in the 70&apos;s?
</para>
<para>
- Here is some quoted '<literal>code</literal>' and a
- &quot;<ulink url="http://example.com/?foo=1&amp;bar=2">quoted link</ulink>&quot;.
+ Here is some quoted <quote><literal>code</literal></quote> and a
+ <quote><ulink url="http://example.com/?foo=1&amp;bar=2">quoted link</ulink></quote>.
</para>
<para>
- Some dashes: one---two --- three--four -- five.
+ Some dashes: one&mdash;two&mdash;three&mdash;four&mdash;five.
</para>
<para>
- Dashes between numbers: 5-7, 255-66, 1987-1999.
+ Dashes between numbers: 5&ndash;7, 255&ndash;66, 1987&ndash;1999.
</para>
<para>
- Ellipses...and. . .and . . . .
+ Ellipses&hellip;and&hellip;and&hellip;.
</para>
</section>
<section>
@@ -656,13 +659,13 @@ These should not be escaped: \$ \\ \&gt; \[ \{
</listitem>
<listitem>
<para>
- Here's one that has a line break in it:
+ Here&apos;s one that has a line break in it:
<literal>$\alpha + \omega \times x^2$</literal>.
</para>
</listitem>
</itemizedlist>
<para>
- These shouldn't be math:
+ These shouldn&apos;t be math:
</para>
<itemizedlist>
<listitem>
@@ -673,7 +676,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<listitem>
<para>
$22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It
- worked if &quot;lot&quot; is emphasized.)
+ worked if <quote>lot</quote> is emphasized.)
</para>
</listitem>
<listitem>
@@ -684,7 +687,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
</listitem>
</itemizedlist>
<para>
- Here's a LaTeX table:
+ Here&apos;s a LaTeX table:
</para>
<para>
<literal>\begin{tabular}{|l|l|}\hline
@@ -861,18 +864,19 @@ Cat &amp; 1 \\ \hline
<section>
<title>With ampersands</title>
<para>
- Here's a
+ Here&apos;s a
<ulink url="http://example.com/?foo=1&amp;bar=2">link with an ampersand in the URL</ulink>.
</para>
<para>
- Here's a link with an amersand in the link text:
+ Here&apos;s a link with an amersand in the link text:
<ulink url="http://att.com/">AT&amp;T</ulink>.
</para>
<para>
- Here's an <ulink url="/script?foo=1&amp;bar=2">inline link</ulink>.
+ Here&apos;s an
+ <ulink url="/script?foo=1&amp;bar=2">inline link</ulink>.
</para>
<para>
- Here's an
+ Here&apos;s an
<ulink url="/script?foo=1&amp;bar=2">inline link in pointy braces</ulink>.
</para>
</section>
@@ -920,7 +924,7 @@ or here: &lt;http://example.com/&gt;
<section>
<title>Images</title>
<para>
- From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):
+ From <quote>Voyage dans la Lune</quote> by Georges Melies (1902):
</para>
<para>
<inlinemediaobject>
@@ -957,7 +961,7 @@ or here: &lt;http://example.com/&gt;
and
another.<footnote>
<para>
- Here's the long note. This one contains multiple blocks.
+ Here&apos;s the long note. This one contains multiple blocks.
</para>
<para>
Subsequent blocks are indented to show that they belong to the
@@ -1008,5 +1012,4 @@ or here: &lt;http://example.com/&gt;
indented.
</para>
</section>
-
</article>
diff --git a/tests/writer.html b/tests/writer.html
index 8915a172c..a14ef60d7 100644
--- a/tests/writer.html
+++ b/tests/writer.html
@@ -4,13 +4,19 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="generator" content="pandoc" />
+
<meta name="author" content="John MacFarlane, Anonymous" />
<meta name="date" content="July 17, 2006" />
<title>Pandoc Test Suite</title>
</head>
<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>
+<h1 class="title">
+Pandoc Test Suite
+</h1>
+<p>
+ This is a set of tests for pandoc. Most of them are adapted from
+ John Gruber&rsquo;s markdown test suite.
+</p>
<hr />
<h1>Headers</h1>
<h2>Level 2 with an <a href="/url">embedded link</a></h2>
@@ -20,67 +26,110 @@
<h1>Level 1</h1>
<h2>Level 2 with <em>emphasis</em></h2>
<h3>Level 3</h3>
-<p>with no blank line</p>
+<p>
+ with no blank line
+</p>
<h2>Level 2</h2>
-<p>with no blank line</p>
+<p>
+ with no blank line
+</p>
<hr />
<h1>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>
+<p>
+ Here&rsquo;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&rsquo;s one with a bullet. * criminey.
+</p>
+<p>
+ There should be a hard line break<br />here.
+</p>
<hr />
<h1>Block Quotes</h1>
-<p>E-mail style:</p>
+<p>
+ E-mail style:
+</p>
<blockquote>
-<p>This is a block quote. It is pretty short.</p>
+ <p>
+ This is a block quote. It is pretty short.
+ </p>
</blockquote>
<blockquote>
-<p>Code in a block quote:</p>
-<pre><code>sub status {
+ <p>
+ Code in a block quote:
+ </p>
+ <pre><code>sub status {
print &quot;working&quot;;
}
</code></pre>
-<p>A list:</p>
-<ol>
-<li>item one</li>
-<li>item two</li>
-</ol>
-<p>Nested block quotes:</p>
-<blockquote>
-<p>nested</p>
-</blockquote>
-<blockquote>
-<p>nested</p>
-</blockquote>
+ <p>
+ A list:
+ </p>
+ <ol>
+ <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>
-<p>This should not be a block quote: 2 &gt; 1.</p>
-<p>Box-style:</p>
+<p>
+ This should not be a block quote: 2 &gt; 1.
+</p>
+<p>
+ Box-style:
+</p>
<blockquote>
-<p>Example:</p>
-<pre><code>sub status {
+ <p>
+ Example:
+ </p>
+ <pre><code>sub status {
print &quot;working&quot;;
}
</code></pre>
</blockquote>
<blockquote>
-<ol>
-<li>do laundry</li>
-<li>take out the trash</li>
-</ol>
+ <ol>
+ <li>do laundry</li>
+ <li>take out the trash</li>
+ </ol>
</blockquote>
-<p>Here's a nested one:</p>
-<blockquote>
-<p>Joe said:</p>
+<p>
+ Here&rsquo;s a nested one:
+</p>
<blockquote>
-<p>Don't quote me.</p>
+ <p>
+ Joe said:
+ </p>
+ <blockquote>
+ <p>
+ Don&rsquo;t quote me.
+ </p>
+ </blockquote>
</blockquote>
-</blockquote>
-<p>And a following paragraph.</p>
+<p>
+ And a following paragraph.
+</p>
<hr />
<h1>Code Blocks</h1>
-<p>Code:</p>
+<p>
+ Code:
+</p>
<pre><code>---- (should be four hyphens)
sub status {
@@ -89,7 +138,9 @@ sub status {
this code block is indented by one tab
</code></pre>
-<p>And:</p>
+<p>
+ And:
+</p>
<pre><code> this code block is indented by two tabs
These should not be escaped: \$ \\ \&gt; \[ \{
@@ -97,181 +148,273 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<hr />
<h1>Lists</h1>
<h2>Unordered</h2>
-<p>Asterisks tight:</p>
+<p>
+ Asterisks tight:
+</p>
<ul>
-<li>asterisk 1</li>
-<li>asterisk 2</li>
-<li>asterisk 3</li>
+ <li>asterisk 1</li>
+ <li>asterisk 2</li>
+ <li>asterisk 3</li>
</ul>
-<p>Asterisks loose:</p>
+<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>
+<p>
+ Pluses tight:
+</p>
<ul>
-<li>Plus 1</li>
-<li>Plus 2</li>
-<li>Plus 3</li>
+ <li>Plus 1</li>
+ <li>Plus 2</li>
+ <li>Plus 3</li>
</ul>
-<p>Pluses loose:</p>
+<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>
+<p>
+ Minuses tight:
+</p>
<ul>
-<li>Minus 1</li>
-<li>Minus 2</li>
-<li>Minus 3</li>
+ <li>Minus 1</li>
+ <li>Minus 2</li>
+ <li>Minus 3</li>
</ul>
-<p>Minuses loose:</p>
+<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>Ordered</h2>
-<p>Tight:</p>
+<p>
+ Tight:
+</p>
<ol>
-<li>First</li>
-<li>Second</li>
-<li>Third</li>
+ <li>First</li>
+ <li>Second</li>
+ <li>Third</li>
</ol>
-<p>and:</p>
+<p>
+ and:
+</p>
<ol>
-<li>One</li>
-<li>Two</li>
-<li>Three</li>
+ <li>One</li>
+ <li>Two</li>
+ <li>Three</li>
</ol>
-<p>Loose using tabs:</p>
+<p>
+ Loose using tabs:
+</p>
<ol>
-<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>
+<p>
+ and using spaces:
+</p>
<ol>
-<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>
+<p>
+ Multiple paragraphs:
+</p>
<ol>
-<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 1, graf one.
+ </p>
+ <p>
+ Item 1. graf two. The quick brown fox jumped over the lazy
+ dog&rsquo;s back.
+ </p></li>
+ <li><p>
+ Item 2.
+ </p></li>
+ <li><p>
+ Item 3.
+ </p></li>
</ol>
<h2>Nested</h2>
<ul>
-<li>Tab<ul>
-<li>Tab<ul>
-<li>Tab</li>
-</ul>
-</li>
-</ul>
-</li>
+ <li>Tab
+ <ul>
+ <li>Tab
+ <ul>
+ <li>Tab</li>
+ </ul></li>
+ </ul></li>
</ul>
-<p>Here's another:</p>
+<p>
+ Here&rsquo;s another:
+</p>
<ol>
-<li>First</li>
-<li>Second:<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul>
-</li>
-<li>Third</li>
+ <li>First</li>
+ <li>Second:
+ <ul>
+ <li>Fee</li>
+ <li>Fie</li>
+ <li>Foe</li>
+ </ul></li>
+ <li>Third</li>
</ol>
-<p>Same thing but with paragraphs:</p>
+<p>
+ Same thing but with paragraphs:
+</p>
<ol>
-<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>
+ First
+ </p></li>
+ <li><p>
+ Second:
+ </p>
+ <ul>
+ <li>Fee</li>
+ <li>Fie</li>
+ <li>Foe</li>
+ </ul></li>
+ <li><p>
+ Third
+ </p></li>
</ol>
<h2>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>
-<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>
-</ul>
-</li>
+ <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>
+ </ul></li>
</ul>
<hr />
<h1>HTML Blocks</h1>
-<p>Simple block on one line:</p>
-<div>foo</div>
-<p>And nested without indentation:</p>
+<p>
+ Simple block on one line:
+</p>
+<div>
+foo
+</div>
+
+<p>
+ And nested without indentation:
+</p>
+<div>
<div>
<div>
-<div>foo</div>
+foo
+</div>
+</div>
+<div>
+bar
</div>
-<div>bar</div>
</div>
-<p>Interpreted markdown in a table:</p>
+
+<p>
+ Interpreted markdown in a table:
+</p>
<table>
<tr>
-<td>This is <em>emphasized</em></td>
-<td>And this is <strong>strong</strong></td>
+<td>
+This is <em>emphasized</em>
+</td>
+<td>
+And this is <strong>strong</strong>
+</td>
</tr>
</table>
<script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script>
-<p>Here's a simple block:</p>
+
+<p>
+ Here&rsquo;s a simple block:
+</p>
<div>
- foo</div>
-<p>This should be a code block, though:</p>
+
+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>
+<p>
+ As should this:
+</p>
<pre><code>&lt;div&gt;foo&lt;/div&gt;
</code></pre>
-<p>Now, nested:</p>
+<p>
+ Now, nested:
+</p>
<div>
<div>
<div>
- foo</div>
+
+foo
+</div>
</div>
</div>
-<p>This should just be an HTML comment:</p>
+
+<p>
+ This should just be an HTML comment:
+</p>
<!-- Comment -->
-<p>Multiline:</p>
+
+<p>
+ Multiline:
+</p>
<!--
Blah
Blah
@@ -280,15 +423,25 @@ Blah
<!--
This is another comment.
-->
-<p>Code block:</p>
+
+<p>
+ Code block:
+</p>
<pre><code>&lt;!-- Comment --&gt;
</code></pre>
-<p>Just plain comment, with trailing spaces on the line:</p>
+<p>
+ Just plain comment, with trailing spaces on the line:
+</p>
<!-- foo -->
-<p>Code:</p>
+
+<p>
+ Code:
+</p>
<pre><code>&lt;hr /&gt;
</code></pre>
-<p>Hr's:</p>
+<p>
+ Hr&rsquo;s:
+</p>
<hr>
<hr />
@@ -306,169 +459,367 @@ Blah
<hr class="foo" id="bar" />
<hr class="foo" id="bar">
+
<hr />
<h1>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>
+ 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>
<hr />
<h1>Smart quotes, ellipses, dashes</h1>
-<p>&quot;Hello,&quot; said the spider. &quot;'Shelob' is my name.&quot;</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, &quot;I want to go.&quot;' Were you alive in the 70's?</p>
-<p>Here is some quoted '<code>code</code>' and a &quot;<a href="http://example.com/?foo=1&amp;bar=2">quoted link</a>&quot;.</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>
+<p>
+ &ldquo;Hello,&rdquo; said the spider.
+ &ldquo;&lsquo;Shelob&rsquo; is my name.&rdquo;
+</p>
+<p>
+ &lsquo;A&rsquo;, &lsquo;B&rsquo;, and &lsquo;C&rsquo; are letters.
+</p>
+<p>
+ &lsquo;Oak,&rsquo; &lsquo;elm,&rsquo; and &lsquo;beech&rsquo; are
+ names of trees. So is &lsquo;pine.&rsquo;
+</p>
+<p>
+ &lsquo;He said, &ldquo;I want to go.&rdquo;&rsquo; Were you alive
+ in the 70&rsquo;s?
+</p>
+<p>
+ Here is some quoted &lsquo;<code>code</code>&rsquo; and a
+ &ldquo;<a href="http://example.com/?foo=1&amp;bar=2">quoted link</a>&rdquo;.
+</p>
+<p>
+ Some dashes: one&mdash;two&mdash;three&mdash;four&mdash;five.
+</p>
+<p>
+ Dashes between numbers: 5&ndash;7, 255&ndash;66, 1987&ndash;1999.
+</p>
+<p>
+ Ellipses&hellip;and&hellip;and&hellip;.
+</p>
<hr />
<h1>LaTeX</h1>
<ul>
-<li>\cite[22-23]{smith.1899}</li>
-<li>\doublespacing</li>
-<li>$2+2=4$</li>
-<li>$x \in y$</li>
-<li>$\alpha \wedge \omega$</li>
-<li>$223$</li>
-<li>$p$-Tree</li>
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
-<li>Here's one that has a line break in it: $\alpha + \omega \times x^2$.</li>
+ <li>\cite[22-23]{smith.1899}</li>
+ <li>\doublespacing</li>
+ <li>$2+2=4$</li>
+ <li>$x \in y$</li>
+ <li>$\alpha \wedge \omega$</li>
+ <li>$223$</li>
+ <li>$p$-Tree</li>
+ <li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
+ <li>Here&rsquo;s one that has a line break in it:
+ $\alpha + \omega \times x^2$.</li>
</ul>
-<p>These shouldn't be math:</p>
+<p>
+ These shouldn&rsquo;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 &quot;lot&quot; is emphasized.)</li>
-<li>Escaped <code>$</code>: $73 <em>this should be emphasized</em> 23$.</li>
+ <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 &ldquo;lot&rdquo; is emphasized.)</li>
+ <li>Escaped <code>$</code>: $73 <em>this should be emphasized</em>
+ 23$.</li>
</ul>
-<p>Here's a LaTeX table:</p>
-<p>\begin{tabular}{|l|l|}\hline
+<p>
+ Here&rsquo;s a LaTeX table:
+</p>
+<p>
+ \begin{tabular}{|l|l|}\hline
Animal &amp; Number \\ \hline
Dog &amp; 2 \\
Cat &amp; 1 \\ \hline
-\end{tabular}</p>
+\end{tabular}
+</p>
<hr />
<h1>Special Characters</h1>
-<p>Here is some unicode:</p>
+<p>
+ Here is some unicode:
+</p>
<ul>
-<li>I hat: &Icirc;</li>
-<li>o umlaut: &ouml;</li>
-<li>section: &sect;</li>
-<li>set membership: &isin;</li>
-<li>copyright: &copy;</li>
+ <li>I hat: &Icirc;</li>
+ <li>o umlaut: &ouml;</li>
+ <li>section: &sect;</li>
+ <li>set membership: &isin;</li>
+ <li>copyright: &copy;</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>
+<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>Links</h1>
<h2>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><script type="text/javascript">
+<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>
+ <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>
+</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>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>
+<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>
+<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>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>
+<p>
+ Here&rsquo;s a
+ <a href="http://example.com/?foo=1&amp;bar=2">link with an ampersand in the URL</a>.
+</p>
+<p>
+ Here&rsquo;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&rsquo;s an <a href="/script?foo=1&amp;bar=2">inline link</a>.
+</p>
+<p>
+ Here&rsquo;s an
+ <a href="/script?foo=1&amp;bar=2">inline link in pointy braces</a>.
+</p>
<h2>Autolinks</h2>
-<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
+<p>
+ With an ampersand:
+ <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a>
+</p>
<ul>
-<li>In a list?</li>
-<li><a href="http://example.com/">http://example.com/</a></li>
-<li>It should.</li>
+ <li>In a list?</li>
+ <li><a href="http://example.com/">http://example.com/</a></li>
+ <li>It should.</li>
</ul>
-<p>An e-mail address: <script type="text/javascript">
+<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+'">'+e+'<\/'+'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>
+</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/">http://example.com/</a></p>
+ <p>
+ Blockquoted: <a href="http://example.com/">http://example.com/</a>
+ </p>
</blockquote>
-<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
+<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>Images</h1>
-<p>From &quot;Voyage dans la Lune&quot; by Georges Melies (1902):</p>
-<p><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune"></p>
-<p>Here is a movie <img src="movie.jpg" alt="movie"> icon.</p>
+<p>
+ From &ldquo;Voyage dans la Lune&rdquo; by Georges Melies (1902):
+</p>
+<p>
+ <img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" />
+</p>
+<p>
+ Here is a movie <img src="movie.jpg" alt="movie" /> icon.
+</p>
<hr />
<h1>Footnotes</h1>
-<p>Here is a footnote reference,<sup class="footnoteRef" id="fnref1"><a href="#fn1">1</a></sup> and another.<sup class="footnoteRef" id="fnref2"><a href="#fn2">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 class="footnoteRef" id="fnref3"><a href="#fn3">3</a></sup></p>
+<p>
+ Here is a footnote
+ reference,<sup class="footnoteRef" id="fnref1"><a href="#fn1">1</a></sup>
+ and
+ another.<sup class="footnoteRef" id="fnref2"><a href="#fn2">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 class="footnoteRef" id="fnref3"><a href="#fn3">3</a></sup>
+</p>
<blockquote>
-<p>Notes can go in quotes.<sup class="footnoteRef" id="fnref4"><a href="#fn4">4</a></sup></p>
+ <p>
+ Notes can go in
+ quotes.<sup class="footnoteRef" id="fnref4"><a href="#fn4">4</a></sup>
+ </p>
</blockquote>
<ol>
-<li>And in list items.<sup class="footnoteRef" id="fnref5"><a href="#fn5">5</a></sup></li>
+ <li>And in list
+ items.<sup class="footnoteRef" id="fnref5"><a href="#fn5">5</a></sup></li>
</ol>
-<p>This paragraph should not be part of the note, as it is not indented.</p>
+<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.</p>
- <a href="#fnref1" class="footnoteBacklink" title="Jump back to footnote 1">&#8617;</a></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; }
+ <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.
+ </p><a href="#fnref1" class="footnoteBacklink" title="Jump back to footnote 1">&#8617;</a>
+ </li>
+ <li id="fn2">
+ <p>
+ Here&rsquo;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.</p>
- <a href="#fnref2" class="footnoteBacklink" title="Jump back to footnote 2">&#8617;</a></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.</p>
- <a href="#fnref3" class="footnoteBacklink" title="Jump back to footnote 3">&#8617;</a></li>
-<li id="fn4"><p>In quote.</p>
- <a href="#fnref4" class="footnoteBacklink" title="Jump back to footnote 4">&#8617;</a></li>
-<li id="fn5"><p>In list.</p>
- <a href="#fnref5" class="footnoteBacklink" title="Jump back to footnote 5">&#8617;</a></li>
-</ol>
+ <p>
+ If you want, you can indent every line, but you can also be lazy
+ and just indent the first line of each block.
+ </p><a href="#fnref2" class="footnoteBacklink" title="Jump back to footnote 2">&#8617;</a>
+ </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.
+ </p><a href="#fnref3" class="footnoteBacklink" title="Jump back to footnote 3">&#8617;</a>
+ </li>
+ <li id="fn4">
+ <p>
+ In quote.
+ </p><a href="#fnref4" class="footnoteBacklink" title="Jump back to footnote 4">&#8617;</a>
+ </li>
+ <li id="fn5">
+ <p>
+ In list.
+ </p><a href="#fnref5" class="footnoteBacklink" title="Jump back to footnote 5">&#8617;</a>
+ </li>
+ </ol>
</div>
</body>
</html>
diff --git a/tests/writer.latex b/tests/writer.latex
index 68976465a..12d673059 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -373,7 +373,7 @@ This is code: \verb!>!, \verb!$!, \verb!\!, \verb!\$!, \verb!<html>!.
\section{Smart quotes, ellipses, dashes}
-``Hello,'' said the spider. ``{}`Shelob' is my name.''
+``Hello,'' said the spider. ```Shelob' is my name.''
`A', `B', and `C' are letters.
@@ -387,7 +387,7 @@ Some dashes: one---two---three---four---five.
Dashes between numbers: 5--7, 255--66, 1987--1999.
-Ellipses\ldots{}and\ldots{}and \ldots{} .
+Ellipses\ldots{}and\ldots{}and\ldots{}.
\begin{center}\rule{3in}{0.4pt}\end{center}
diff --git a/tests/writer.markdown b/tests/writer.markdown
index 54b4b3f79..7d4d68f22 100644
--- a/tests/writer.markdown
+++ b/tests/writer.markdown
@@ -403,11 +403,11 @@ This is code: `>`, `$`, `\`, `\$`, `<html>`.
Here is some quoted '`code`' and a "[quoted link][1]".
-Some dashes: one---two --- three--four -- five.
+Some dashes: one--two--three--four--five.
Dashes between numbers: 5-7, 255-66, 1987-1999.
-Ellipses...and. . .and . . . .
+Ellipses...and...and....
* * * * *
diff --git a/tests/writer.native b/tests/writer.native
index 81b601870..cb60c1922 100644
--- a/tests/writer.native
+++ b/tests/writer.native
@@ -1,5 +1,5 @@
Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane","Anonymous"] "July 17, 2006")
-[ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
+[ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."]
, HorizontalRule
, Header 1 [Str "Headers"]
, Header 2 [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link [Str "embedded",Space,Str "link"] (Src "/url" "")]
@@ -14,15 +14,15 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
, HorizontalRule
, Header 1 [Str "Paragraphs"]
-, Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-, Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard",Str "-",Str "wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-, Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
-, Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "regular",Space,Str "paragraph",Str "."]
+, Para [Str "In",Space,Str "Markdown",Space,Str "1",Str ".",Str "0",Str ".",Str "0",Space,Str "and",Space,Str "earlier",Str ".",Space,Str "Version",Space,Str "8",Str ".",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item",Str ".",Space,Str "Because",Space,Str "a",Space,Str "hard",Str "-",Str "wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item",Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet",Str ".",Space,Str "*",Space,Str "criminey",Str "."]
+, Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here",Str "."]
, HorizontalRule
, Header 1 [Str "Block",Space,Str "Quotes"]
, Para [Str "E",Str "-",Str "mail",Space,Str "style:"]
, BlockQuote
- [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."] ]
+ [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote",Str ".",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short",Str "."] ]
, BlockQuote
[ Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
@@ -38,7 +38,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BlockQuote
[ Para [Str "nested"] ]
]
-, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."]
+, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1",Str "."]
, Para [Str "Box",Str "-",Str "style:"]
, BlockQuote
[ Para [Str "Example:"]
@@ -47,13 +47,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
[ OrderedList
[ [ Plain [Str "do",Space,Str "laundry"] ]
, [ Plain [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"] ] ] ]
-, Para [Str "Here's",Space,Str "a",Space,Str "nested",Space,Str "one:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "nested",Space,Str "one:"]
, BlockQuote
[ Para [Str "Joe",Space,Str "said:"]
, BlockQuote
- [ Para [Str "Don't",Space,Str "quote",Space,Str "me."] ]
+ [ Para [Str "Don",Apostrophe,Str "t",Space,Str "quote",Space,Str "me",Str "."] ]
]
-, Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
+, Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph",Str "."]
, HorizontalRule
, Header 1 [Str "Code",Space,Str "Blocks"]
, Para [Str "Code:"]
@@ -116,9 +116,9 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Para [Str "Three"] ] ]
, Para [Str "Multiple",Space,Str "paragraphs:"]
, OrderedList
- [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
- , Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog's",Space,Str "back."] ], [ Para [Str "Item",Space,Str "2."] ]
- , [ Para [Str "Item",Space,Str "3."] ] ]
+ [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one",Str "."]
+ , Para [Str "Item",Space,Str "1",Str ".",Space,Str "graf",Space,Str "two",Str ".",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog",Apostrophe,Str "s",Space,Str "back",Str "."] ], [ Para [Str "Item",Space,Str "2",Str "."] ]
+ , [ Para [Str "Item",Space,Str "3",Str "."] ] ]
, Header 2 [Str "Nested"]
, BulletList
[ [ Plain [Str "Tab"]
@@ -127,7 +127,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BulletList
[ [ Plain [Str "Tab"] ]
] ] ] ] ]
-, Para [Str "Here's",Space,Str "another:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "another:"]
, OrderedList
[ [ Plain [Str "First"] ]
, [ Plain [Str "Second:"]
@@ -168,7 +168,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, RawHtml "</td>\n<td>"
, Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]]
, RawHtml "</td>\n</tr>\n</table>\n\n<script type=\"text/javascript\">document.write('This *should not* be interpreted as markdown');</script>\n"
-, Para [Str "Here's",Space,Str "a",Space,Str "simple",Space,Str "block:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"]
, RawHtml "<div>\n "
, Plain [Str "foo"]
, RawHtml "</div>\n"
@@ -190,28 +190,28 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, RawHtml "<!-- foo --> \n"
, Para [Str "Code:"]
, CodeBlock "<hr />"
-, Para [Str "Hr's:"]
+, Para [Str "Hr",Apostrophe,Str "s:"]
, RawHtml "<hr>\n\n<hr />\n\n<hr />\n\n<hr> \n\n<hr /> \n\n<hr /> \n\n<hr class=\"foo\" id=\"bar\" />\n\n<hr class=\"foo\" id=\"bar\" />\n\n<hr class=\"foo\" id=\"bar\">\n"
, HorizontalRule
, Header 1 [Str "Inline",Space,Str "Markup"]
, Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."]
, Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."]
, Para [Str "An",Space,Emph [Link [Str "emphasized",Space,Str "link"] (Src "/url" "")],Str "."]
-, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
+, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em",Str "."]]]
+, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."]
+, Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em",Str "."]]]
+, Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."]
, Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ">",Str ",",Space,Code "$",Str ",",Space,Code "\\",Str ",",Space,Code "\\$",Str ",",Space,Code "<html>",Str "."]
, HorizontalRule
, Header 1 [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-, Para [Str "\"Hello,\"",Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Str "\"'Shelob'",Space,Str "is",Space,Str "my",Space,Str "name.\""]
-, Para [Str "'A',",Space,Str "'B',",Space,Str "and",Space,Str "'C'",Space,Str "are",Space,Str "letters."]
-, Para [Str "'Oak,'",Space,Str "'elm,'",Space,Str "and",Space,Str "'beech'",Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Str "'pine.'"]
-, Para [Str "'He",Space,Str "said,",Space,Str "\"I",Space,Str "want",Space,Str "to",Space,Str "go.\"'",Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70's?"]
-, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Str "'",Code "code",Str "'",Space,Str "and",Space,Str "a",Space,Str "\"",Link [Str "quoted",Space,Str "link"] (Ref [Str "1"]),Str "\"."]
-, Para [Str "Some",Space,Str "dashes:",Space,Str "one",Str "---",Str "two",Space,Str "---",Space,Str "three",Str "--",Str "four",Space,Str "--",Space,Str "five."]
-, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",Str "-",Str "7,",Space,Str "255",Str "-",Str "66,",Space,Str "1987",Str "-",Str "1999."]
-, Para [Str "Ellipses...and.",Space,Str ".",Space,Str ".and",Space,Str ".",Space,Str ".",Space,Str ".",Space,Str "."]
+, Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider",Str ".",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name",Str "."]]
+, Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters",Str "."]
+, Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees",Str ".",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine",Str "."]]
+, Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go",Str "."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70",Apostrophe,Str "s?"]
+, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link [Str "quoted",Space,Str "link"] (Ref [Str "1"])],Str "."]
+, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",EmDash,Str "three",EmDash,Str "four",EmDash,Str "five",Str "."]
+, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",EnDash,Str "7,",Space,Str "255",EnDash,Str "66,",Space,Str "1987",EnDash,Str "1999",Str "."]
+, Para [Str "Ellipses",Ellipses,Str "and",Ellipses,Str "and",Ellipses,Str "."]
, HorizontalRule
, Header 1 [Str "LaTeX"]
, BulletList
@@ -223,13 +223,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Plain [TeX "$223$"] ]
, [ Plain [TeX "$p$",Str "-",Str "Tree"] ]
, [ Plain [TeX "$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$"] ]
- , [ Plain [Str "Here's",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,TeX "$\\alpha + \\omega \\times x^2$",Str "."] ] ]
-, Para [Str "These",Space,Str "shouldn't",Space,Str "be",Space,Str "math:"]
+ , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,TeX "$\\alpha + \\omega \\times x^2$",Str "."] ] ]
+, Para [Str "These",Space,Str "shouldn",Apostrophe,Str "t",Space,Str "be",Space,Str "math:"]
, BulletList
[ [ Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code "$e = mc^2$",Str "."] ]
- , [ Plain [Str "$",Str "22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$",Str "34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Str "\"lot\"",Space,Str "is",Space,Str "emphasized.)"] ]
+ , [ Plain [Str "$",Str "22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money",Str ".",Space,Str "So",Space,Str "is",Space,Str "$",Str "34,000",Str ".",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized",Str ".",Str ")"] ]
, [ Plain [Str "Escaped",Space,Code "$",Str ":",Space,Str "$",Str "73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23",Str "$",Str "."] ] ]
-, Para [Str "Here's",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
, Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}"]
, HorizontalRule
, Header 1 [Str "Special",Space,Str "Characters"]
@@ -240,11 +240,11 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, [ Plain [Str "section:",Space,Str "\167"] ]
, [ Plain [Str "set",Space,Str "membership:",Space,Str "\8712"] ]
, [ Plain [Str "copyright:",Space,Str "\169"] ] ]
-, Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-, Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-, Para [Str "This",Space,Str "&",Space,Str "that."]
-, Para [Str "4",Space,Str "<",Space,Str "5."]
-, Para [Str "6",Space,Str ">",Space,Str "5."]
+, Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name",Str "."]
+, Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it",Str "."]
+, Para [Str "This",Space,Str "&",Space,Str "that",Str "."]
+, Para [Str "4",Space,Str "<",Space,Str "5",Str "."]
+, Para [Str "6",Space,Str ">",Space,Str "5",Str "."]
, Para [Str "Backslash:",Space,Str "\\"]
, Para [Str "Backtick:",Space,Str "`"]
, Para [Str "Asterisk:",Space,Str "*"]
@@ -278,11 +278,11 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "Foo",Space,Link [Str "bar"] (Ref [Str "a"]),Str "."]
, Key [Str "a"] (Src "/url/" "")
, Para [Str "With",Space,Link [Str "embedded",Space,Str "[",Str "brackets",Str "]"] (Ref [Str "b"]),Str "."]
-, Para [Link [Str "b"] (Ref [Str "b"]),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
+, Para [Link [Str "b"] (Ref [Str "b"]),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link",Str "."]
, Para [Str "Indented",Space,Link [Str "once"] (Ref [Str "once"]),Str "."]
, Para [Str "Indented",Space,Link [Str "twice"] (Ref [Str "twice"]),Str "."]
, Para [Str "Indented",Space,Link [Str "thrice"] (Ref [Str "thrice"]),Str "."]
-, Para [Str "This",Space,Str "should",Space,Str "[",Str "not",Str "]",Str "[",Str "]",Space,Str "be",Space,Str "a",Space,Str "link."]
+, Para [Str "This",Space,Str "should",Space,Str "[",Str "not",Str "]",Str "[",Str "]",Space,Str "be",Space,Str "a",Space,Str "link",Str "."]
, Key [Str "once"] (Src "/url" "")
, Key [Str "twice"] (Src "/url" "")
, Key [Str "thrice"] (Src "/url" "")
@@ -292,10 +292,10 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, Para [Str "Foo",Space,Link [Str "biz"] (Src "/url/" "Title with &quot;quote&quot; inside"),Str "."]
, Key [Str "bar"] (Src "/url/" "Title with &quot;quotes&quot; inside")
, Header 2 [Str "With",Space,Str "ampersands"]
-, Para [Str "Here's",Space,Str "a",Space,Link [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] (Ref [Str "1"]),Str "."]
-, Para [Str "Here's",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link [Str "AT&T"] (Ref [Str "2"]),Str "."]
-, Para [Str "Here's",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] (Src "/script?foo=1&bar=2" ""),Str "."]
-, Para [Str "Here's",Space,Str "an",Space,Link [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] (Src "/script?foo=1&bar=2" ""),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Link [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] (Ref [Str "1"]),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link [Str "AT&T"] (Ref [Str "2"]),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] (Src "/script?foo=1&bar=2" ""),Str "."]
+, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] (Src "/script?foo=1&bar=2" ""),Str "."]
, Key [Str "1"] (Src "http://example.com/?foo=1&bar=2" "")
, Key [Str "2"] (Src "http://att.com/" "AT&T")
, Header 2 [Str "Autolinks"]
@@ -303,7 +303,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, BulletList
[ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ]
, [ Plain [Link [Str "http://example.com/"] (Src "http://example.com/" "")] ]
- , [ Plain [Str "It",Space,Str "should."] ] ]
+ , [ Plain [Str "It",Space,Str "should",Str "."] ] ]
, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Str "nobody@nowhere.net"] (Src "mailto:nobody@nowhere.net" "")]
, BlockQuote
[ Para [Str "Blockquoted:",Space,Link [Str "http://example.com/"] (Src "http://example.com/" "")] ]
@@ -312,34 +312,34 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
, CodeBlock "or here: <http://example.com/>"
, HorizontalRule
, Header 1 [Str "Images"]
-, Para [Str "From",Space,Str "\"Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune\"",Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
+, Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
, Para [Image [Str "lalune"] (Ref [Str "lalune"])]
, Key [Str "lalune"] (Src "lalune.jpg" "Voyage dans la Lune")
-, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon."]
+, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon",Str "."]
, HorizontalRule
, Header 1 [Str "Footnotes"]
-, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another.",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space.",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",NoteRef "3"]
+, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another",Str ".",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str ".",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note",Str ".",NoteRef "3"]
, BlockQuote
- [ Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",NoteRef "4"] ]
+ [ Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes",Str ".",NoteRef "4"] ]
, OrderedList
- [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",NoteRef "5"] ]
+ [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",NoteRef "5"] ]
]
-, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."]
+, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."]
, Note "1"
- [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."] ]
+ [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote",Str ".",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference",Str ".",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document",Str "."] ]
, Note "2"
- [ Para [Str "Here's",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."]
- , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."]
+ [ Para [Str "Here",Apostrophe,Str "s",Space,Str "the",Space,Str "long",Space,Str "note",Str ".",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks",Str "."]
+ , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)",Str "."]
, CodeBlock " { <code> }"
- , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ]
+ , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block",Str "."] ]
, Note "3"
- [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters."] ]
+ [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type",Str ".",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters",Str "."] ]
, Note "4"
- [ Para [Str "In",Space,Str "quote."] ]
+ [ Para [Str "In",Space,Str "quote",Str "."] ]
, Note "5"
- [ Para [Str "In",Space,Str "list."] ]
+ [ Para [Str "In",Space,Str "list",Str "."] ]
]
diff --git a/tests/writer.rst b/tests/writer.rst
index b54ab9665..e3eb59612 100644
--- a/tests/writer.rst
+++ b/tests/writer.rst
@@ -501,11 +501,11 @@ Smart quotes, ellipses, dashes
Here is some quoted '``code``' and a "`quoted link`_".
-Some dashes: one---two --- three--four -- five.
+Some dashes: one--two--three--four--five.
Dashes between numbers: 5-7, 255-66, 1987-1999.
-Ellipses...and. . .and . . . .
+Ellipses...and...and....
--------------
diff --git a/tests/writer.rtf b/tests/writer.rtf
index 6cbae7a32..8d24e927c 100644
--- a/tests/writer.rtf
+++ b/tests/writer.rtf
@@ -6,7 +6,7 @@
{\pard \f0 \sa180 \li0 \fi0 \qc John MacFarlane\Anonymous\par}
{\pard \f0 \sa180 \li0 \fi0 \qc July 17, 2006\par}
{\pard \f0 \sa180 \li0 \fi0 \par}
-{\pard \f0 \sa180 \li0 \fi0 This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite.\par}
+{\pard \f0 \sa180 \li0 \fi0 This is a set of tests for pandoc. Most of them are adapted from John Gruber\u8217's markdown test suite.\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Headers\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs32 Level 2 with an {\field{\*\fldinst{HYPERLINK "/url"}}{\fldrslt{\ul
@@ -24,9 +24,9 @@ embedded link
{\pard \f0 \sa180 \li0 \fi0 with no blank line\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Paragraphs\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a regular paragraph.\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a regular paragraph.\par}
{\pard \f0 \sa180 \li0 \fi0 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.\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's one with a bullet. * criminey.\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's one with a bullet. * criminey.\par}
{\pard \f0 \sa180 \li0 \fi0 There should be a hard line break\line here.\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Block Quotes\par}
@@ -50,9 +50,9 @@ embedded link
\}\par}
{\pard \f0 \sa0 \li1080 \fi-360 1.\tx360\tab do laundry\par}
{\pard \f0 \sa0 \li1080 \fi-360 2.\tx360\tab take out the trash\sa180\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a nested one:\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a nested one:\par}
{\pard \f0 \sa180 \li720 \fi0 Joe said:\par}
-{\pard \f0 \sa180 \li1440 \fi0 Don't quote me.\par}
+{\pard \f0 \sa180 \li1440 \fi0 Don\u8217't quote me.\par}
{\pard \f0 \sa180 \li0 \fi0 And a following paragraph.\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Code Blocks\par}
@@ -114,14 +114,14 @@ These should not be escaped: \\$ \\\\ \\> \\[ \\\{\par}
{\pard \f0 \sa180 \li360 \fi-360 3.\tx360\tab Three\sa180\par}
{\pard \f0 \sa180 \li0 \fi0 Multiple paragraphs:\par}
{\pard \f0 \sa180 \li360 \fi-360 1.\tx360\tab Item 1, graf one.\par}
-{\pard \f0 \sa180 \li360 \fi0 Item 1. graf two. The quick brown fox jumped over the lazy dog's back.\par}
+{\pard \f0 \sa180 \li360 \fi0 Item 1. graf two. The quick brown fox jumped over the lazy dog\u8217's back.\par}
{\pard \f0 \sa180 \li360 \fi-360 2.\tx360\tab Item 2.\par}
{\pard \f0 \sa180 \li360 \fi-360 3.\tx360\tab Item 3.\sa180\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs32 Nested\par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Tab\par}
{\pard \f0 \sa0 \li720 \fi-360 \endash \tx360\tab Tab\par}
{\pard \f0 \sa0 \li1080 \fi-360 \bullet \tx360\tab Tab\sa180\sa180\sa180\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's another:\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's another:\par}
{\pard \f0 \sa0 \li360 \fi-360 1.\tx360\tab First\par}
{\pard \f0 \sa0 \li360 \fi-360 2.\tx360\tab Second:\par}
{\pard \f0 \sa0 \li720 \fi-360 \endash \tx360\tab Fee\par}
@@ -150,7 +150,7 @@ These should not be escaped: \\$ \\\\ \\> \\[ \\\{\par}
{\pard \f0 \sa180 \li0 \fi0 Interpreted markdown in a table:\par}
{\pard \f0 \sa0 \li0 \fi0 This is {\i emphasized} \par}
{\pard \f0 \sa0 \li0 \fi0 And this is {\b strong} \par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a simple block:\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a simple block:\par}
{\pard \f0 \sa0 \li0 \fi0 foo\par}
{\pard \f0 \sa180 \li0 \fi0 This should be a code block, though:\par}
{\pard \f0 \sa180 \li0 \fi0 \f1 <div>\line
@@ -167,7 +167,7 @@ These should not be escaped: \\$ \\\\ \\> \\[ \\\{\par}
{\pard \f0 \sa180 \li0 \fi0 Just plain comment, with trailing spaces on the line:\par}
{\pard \f0 \sa180 \li0 \fi0 Code:\par}
{\pard \f0 \sa180 \li0 \fi0 \f1 <hr />\par}
-{\pard \f0 \sa180 \li0 \fi0 Hr's:\par}
+{\pard \f0 \sa180 \li0 \fi0 Hr\u8217's:\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Inline Markup\par}
{\pard \f0 \sa180 \li0 \fi0 This is {\i emphasized} , and so {\i is this} .\par}
@@ -183,17 +183,17 @@ emphasized link
{\pard \f0 \sa180 \li0 \fi0 This is code: {\f1 >} , {\f1 $} , {\f1 \\} , {\f1 \\$} , {\f1 <html>} .\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Smart quotes, ellipses, dashes\par}
-{\pard \f0 \sa180 \li0 \fi0 "Hello," said the spider. "'Shelob' is my name."\par}
-{\pard \f0 \sa180 \li0 \fi0 'A', 'B', and 'C' are letters.\par}
-{\pard \f0 \sa180 \li0 \fi0 'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'\par}
-{\pard \f0 \sa180 \li0 \fi0 'He said, "I want to go."' Were you alive in the 70's?\par}
-{\pard \f0 \sa180 \li0 \fi0 Here is some quoted '{\f1 code} ' and a "{\field{\*\fldinst{HYPERLINK "http://example.com/?foo=1&bar=2"}}{\fldrslt{\ul
+{\pard \f0 \sa180 \li0 \fi0 \u8220"Hello,\u8221" said the spider. \u8220"\u8216'Shelob\u8217' is my name.\u8221"\par}
+{\pard \f0 \sa180 \li0 \fi0 \u8216'A\u8217', \u8216'B\u8217', and \u8216'C\u8217' are letters.\par}
+{\pard \f0 \sa180 \li0 \fi0 \u8216'Oak,\u8217' \u8216'elm,\u8217' and \u8216'beech\u8217' are names of trees. So is \u8216'pine.\u8217'\par}
+{\pard \f0 \sa180 \li0 \fi0 \u8216'He said, \u8220"I want to go.\u8221"\u8217' Were you alive in the 70\u8217's?\par}
+{\pard \f0 \sa180 \li0 \fi0 Here is some quoted \u8216'{\f1 code} \u8217' and a \u8220"{\field{\*\fldinst{HYPERLINK "http://example.com/?foo=1&bar=2"}}{\fldrslt{\ul
quoted link
}}}
-".\par}
-{\pard \f0 \sa180 \li0 \fi0 Some dashes: one---two --- three--four -- five.\par}
-{\pard \f0 \sa180 \li0 \fi0 Dashes between numbers: 5-7, 255-66, 1987-1999.\par}
-{\pard \f0 \sa180 \li0 \fi0 Ellipses...and. . .and . . . .\par}
+\u8221".\par}
+{\pard \f0 \sa180 \li0 \fi0 Some dashes: one\u8212-two\u8212-three\u8212-four\u8212-five.\par}
+{\pard \f0 \sa180 \li0 \fi0 Dashes between numbers: 5\u8211-7, 255\u8211-66, 1987\u8211-1999.\par}
+{\pard \f0 \sa180 \li0 \fi0 Ellipses\u8230?and\u8230?and\u8230?.\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 LaTeX\par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 \\cite[22-23]\{smith.1899\}\cf0 } \par}
@@ -204,12 +204,12 @@ quoted link
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $223$\cf0 } \par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $p$\cf0 } -Tree\par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $\\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}$\cf0 } \par}
-{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here's one that has a line break in it: {\cf1 $\\alpha + \\omega \\times x^2$\cf0 } .\sa180\par}
-{\pard \f0 \sa180 \li0 \fi0 These shouldn't be math:\par}
+{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: {\cf1 $\\alpha + \\omega \\times x^2$\cf0 } .\sa180\par}
+{\pard \f0 \sa180 \li0 \fi0 These shouldn\u8217't be math:\par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab To get the famous equation, write {\f1 $e = mc^2$} .\par}
-{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab $22,000 is a {\i lot} of money. So is $34,000. (It worked if "lot" is emphasized.)\par}
+{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab $22,000 is a {\i lot} of money. So is $34,000. (It worked if \u8220"lot\u8221" is emphasized.)\par}
{\pard \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Escaped {\f1 $} : $73 {\i this should be emphasized} 23$.\sa180\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a LaTeX table:\par}
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a LaTeX table:\par}
{\pard \f0 \sa180 \li0 \fi0 {\cf1 \\begin\{tabular\}\{|l|l|\}\\hline
Animal & Number \\\\ \\hline
Dog & 2 \\\\
@@ -323,19 +323,19 @@ biz
}}}
.\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs32 With ampersands\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a {\field{\*\fldinst{HYPERLINK "http://example.com/?foo=1&bar=2"}}{\fldrslt{\ul
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a {\field{\*\fldinst{HYPERLINK "http://example.com/?foo=1&bar=2"}}{\fldrslt{\ul
link with an ampersand in the URL
}}}
.\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's a link with an amersand in the link text: {\field{\*\fldinst{HYPERLINK "http://att.com/"}}{\fldrslt{\ul
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's a link with an amersand in the link text: {\field{\*\fldinst{HYPERLINK "http://att.com/"}}{\fldrslt{\ul
AT&T
}}}
.\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's an {\field{\*\fldinst{HYPERLINK "/script?foo=1&bar=2"}}{\fldrslt{\ul
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's an {\field{\*\fldinst{HYPERLINK "/script?foo=1&bar=2"}}{\fldrslt{\ul
inline link
}}}
.\par}
-{\pard \f0 \sa180 \li0 \fi0 Here's an {\field{\*\fldinst{HYPERLINK "/script?foo=1&bar=2"}}{\fldrslt{\ul
+{\pard \f0 \sa180 \li0 \fi0 Here\u8217's an {\field{\*\fldinst{HYPERLINK "/script?foo=1&bar=2"}}{\fldrslt{\ul
inline link in pointy braces
}}}
.\par}
@@ -362,13 +362,13 @@ http://example.com/
{\pard \f0 \sa180 \li0 \fi0 \f1 or here: <http://example.com/>\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Images\par}
-{\pard \f0 \sa180 \li0 \fi0 From "Voyage dans la Lune" by Georges Melies (1902):\par}
+{\pard \f0 \sa180 \li0 \fi0 From \u8220"Voyage dans la Lune\u8221" by Georges Melies (1902):\par}
{\pard \f0 \sa180 \li0 \fi0 {\cf1 [image: lalune.jpg]\cf0}\par}
{\pard \f0 \sa180 \li0 \fi0 Here is a movie {\cf1 [image: movie.jpg]\cf0} icon.\par}
{\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par}
{\pard \f0 \sa180 \li0 \fi0 \b \fs36 Footnotes\par}
{\pard \f0 \sa180 \li0 \fi0 Here is a footnote reference,{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.\par}
-} and another.{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here's the long note. This one contains multiple blocks.\par}
+} and another.{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here\u8217's the long note. This one contains multiple blocks.\par}
{\pard \f0 \sa180 \li0 \fi0 Subsequent blocks are indented to show that they belong to the footnote (as with list items).\par}
{\pard \f0 \sa180 \li0 \fi0 \f1 \{ <code> \}\par}
{\pard \f0 \sa180 \li0 \fi0 If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.\par}
diff --git a/tests/writer.smart.html b/tests/writer.smart.html
deleted file mode 100644
index 14b70e2fe..000000000
--- a/tests/writer.smart.html
+++ /dev/null
@@ -1,474 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="pandoc" />
-<meta name="author" content="John MacFarlane, Anonymous" />
-<meta name="date" content="July 17, 2006" />
-<title>Pandoc Test Suite</title>
-</head>
-<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&rsquo;s markdown test suite.</p>
-<hr />
-<h1>Headers</h1>
-<h2>Level 2 with an <a href="/url">embedded link</a></h2>
-<h3>Level 3 with <em>emphasis</em></h3>
-<h4>Level 4</h4>
-<h5>Level 5</h5>
-<h1>Level 1</h1>
-<h2>Level 2 with <em>emphasis</em></h2>
-<h3>Level 3</h3>
-<p>with no blank line</p>
-<h2>Level 2</h2>
-<p>with no blank line</p>
-<hr />
-<h1>Paragraphs</h1>
-<p>Here&rsquo;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&rsquo;s one with a bullet. * criminey.</p>
-<p>There should be a hard line break<br />
-here.</p>
-<hr />
-<h1>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>
-<pre><code>sub status {
- print &quot;working&quot;;
-}
-</code></pre>
-<p>A list:</p>
-<ol>
-<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>
-<p>This should not be a block quote: 2 &gt; 1.</p>
-<p>Box-style:</p>
-<blockquote>
-<p>Example:</p>
-<pre><code>sub status {
- print &quot;working&quot;;
-}
-</code></pre>
-</blockquote>
-<blockquote>
-<ol>
-<li>do laundry</li>
-<li>take out the trash</li>
-</ol>
-</blockquote>
-<p>Here&rsquo;s a nested one:</p>
-<blockquote>
-<p>Joe said:</p>
-<blockquote>
-<p>Don&rsquo;t quote me.</p>
-</blockquote>
-</blockquote>
-<p>And a following paragraph.</p>
-<hr />
-<h1>Code Blocks</h1>
-<p>Code:</p>
-<pre><code>---- (should be four hyphens)
-
-sub status {
- print &quot;working&quot;;
-}
-
-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>Lists</h1>
-<h2>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>
-</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>
-</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>
-</ul>
-<h2>Ordered</h2>
-<p>Tight:</p>
-<ol>
-<li>First</li>
-<li>Second</li>
-<li>Third</li>
-</ol>
-<p>and:</p>
-<ol>
-<li>One</li>
-<li>Two</li>
-<li>Three</li>
-</ol>
-<p>Loose using tabs:</p>
-<ol>
-<li><p>First</p>
-</li>
-<li><p>Second</p>
-</li>
-<li><p>Third</p>
-</li>
-</ol>
-<p>and using spaces:</p>
-<ol>
-<li><p>One</p>
-</li>
-<li><p>Two</p>
-</li>
-<li><p>Three</p>
-</li>
-</ol>
-<p>Multiple paragraphs:</p>
-<ol>
-<li><p>Item 1, graf one.</p>
-<p>Item 1. graf two. The quick brown fox jumped over the lazy dog&rsquo;s back.</p>
-</li>
-<li><p>Item 2.</p>
-</li>
-<li><p>Item 3.</p>
-</li>
-</ol>
-<h2>Nested</h2>
-<ul>
-<li>Tab<ul>
-<li>Tab<ul>
-<li>Tab</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<p>Here&rsquo;s another:</p>
-<ol>
-<li>First</li>
-<li>Second:<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul>
-</li>
-<li>Third</li>
-</ol>
-<p>Same thing but with paragraphs:</p>
-<ol>
-<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>
-</ol>
-<h2>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>
-<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>
-</ul>
-</li>
-</ul>
-<hr />
-<h1>HTML Blocks</h1>
-<p>Simple block on one line:</p>
-<div>foo</div>
-<p>And nested without indentation:</p>
-<div>
-<div>
-<div>foo</div>
-</div>
-<div>bar</div>
-</div>
-<p>Interpreted markdown in a table:</p>
-<table>
-<tr>
-<td>This is <em>emphasized</em></td>
-<td>And this is <strong>strong</strong></td>
-</tr>
-</table>
-
-<script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script>
-<p>Here&rsquo;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>
- <div>
- foo</div>
- </div>
-</div>
-<p>This should just be an HTML comment:</p>
-<!-- Comment -->
-<p>Multiline:</p>
-<!--
-Blah
-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&rsquo;s:</p>
-<hr>
-
-<hr />
-
-<hr />
-
-<hr>
-
-<hr />
-
-<hr />
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar">
-<hr />
-<h1>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>
-<hr />
-<h1>Smart quotes, ellipses, dashes</h1>
-<p>&ldquo;Hello,&rdquo; said the spider. &ldquo;&lsquo;Shelob&rsquo; is my name.&rdquo;</p>
-<p>&lsquo;A&rsquo;, &lsquo;B&rsquo;, and &lsquo;C&rsquo; are letters.</p>
-<p>&lsquo;Oak,&rsquo; &lsquo;elm,&rsquo; and &lsquo;beech&rsquo; are names of trees. So is &lsquo;pine.&rsquo;</p>
-<p>&lsquo;He said, &ldquo;I want to go.&rdquo;&rsquo; Were you alive in the 70&rsquo;s?</p>
-<p>Here is some quoted &lsquo;<code>code</code>&rsquo; and a &ldquo;<a href="http://example.com/?foo=1&amp;bar=2">quoted link</a>&rdquo;.</p>
-<p>Some dashes: one&mdash;two&mdash;three&mdash;four&mdash;five.</p>
-<p>Dashes between numbers: 5&ndash;7, 255&ndash;66, 1987&ndash;1999.</p>
-<p>Ellipses&hellip;and&hellip;and &hellip; .</p>
-<hr />
-<h1>LaTeX</h1>
-<ul>
-<li>\cite[22-23]{smith.1899}</li>
-<li>\doublespacing</li>
-<li>$2+2=4$</li>
-<li>$x \in y$</li>
-<li>$\alpha \wedge \omega$</li>
-<li>$223$</li>
-<li>$p$-Tree</li>
-<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>
-<li>Here&rsquo;s one that has a line break in it: $\alpha + \omega \times x^2$.</li>
-</ul>
-<p>These shouldn&rsquo;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 &ldquo;lot&rdquo; is emphasized.)</li>
-<li>Escaped <code>$</code>: $73 <em>this should be emphasized</em> 23$.</li>
-</ul>
-<p>Here&rsquo;s a LaTeX table:</p>
-<p>\begin{tabular}{|l|l|}\hline
-Animal &amp; Number \\ \hline
-Dog &amp; 2 \\
-Cat &amp; 1 \\ \hline
-\end{tabular}</p>
-<hr />
-<h1>Special Characters</h1>
-<p>Here is some unicode:</p>
-<ul>
-<li>I hat: &Icirc;</li>
-<li>o umlaut: &ouml;</li>
-<li>section: &sect;</li>
-<li>set membership: &isin;</li>
-<li>copyright: &copy;</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: &lsquo;</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>Links</h1>
-<h2>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 &ldquo;quotes&rdquo; in it">URL and title</a></p>
-<p><a href="/url/" title="title with single quotes">URL and title</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>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 &ldquo;quotes&rdquo; inside">bar</a>.</p>
-<p>Foo <a href="/url/" title="Title with &ldquo;quote&rdquo; inside">biz</a>.</p>
-<h2>With ampersands</h2>
-<p>Here&rsquo;s a <a href="http://example.com/?foo=1&amp;bar=2">link with an ampersand in the URL</a>.</p>
-<p>Here&rsquo;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&rsquo;s an <a href="/script?foo=1&amp;bar=2">inline link</a>.</p>
-<p>Here&rsquo;s an <a href="/script?foo=1&amp;bar=2">inline link in pointy braces</a>.</p>
-<h2>Autolinks</h2>
-<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
-<ul>
-<li>In a list?</li>
-<li><a href="http://example.com/">http://example.com/</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+'">'+e+'<\/'+'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/">http://example.com/</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>Images</h1>
-<p>From &ldquo;Voyage dans la Lune&rdquo; by Georges Melies (1902):</p>
-<p><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune"></p>
-<p>Here is a movie <img src="movie.jpg" alt="movie"> icon.</p>
-<hr />
-<h1>Footnotes</h1>
-<p>Here is a footnote reference,<sup class="footnoteRef" id="fnref1"><a href="#fn1">1</a></sup> and another.<sup class="footnoteRef" id="fnref2"><a href="#fn2">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 class="footnoteRef" id="fnref3"><a href="#fn3">3</a></sup></p>
-<blockquote>
-<p>Notes can go in quotes.<sup class="footnoteRef" id="fnref4"><a href="#fn4">4</a></sup></p>
-</blockquote>
-<ol>
-<li>And in list items.<sup class="footnoteRef" id="fnref5"><a href="#fn5">5</a></sup></li>
-</ol>
-<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.</p>
- <a href="#fnref1" class="footnoteBacklink" title="Jump back to footnote 1">&#8617;</a></li>
-<li id="fn2"><p>Here&rsquo;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.</p>
- <a href="#fnref2" class="footnoteBacklink" title="Jump back to footnote 2">&#8617;</a></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.</p>
- <a href="#fnref3" class="footnoteBacklink" title="Jump back to footnote 3">&#8617;</a></li>
-<li id="fn4"><p>In quote.</p>
- <a href="#fnref4" class="footnoteBacklink" title="Jump back to footnote 4">&#8617;</a></li>
-<li id="fn5"><p>In list.</p>
- <a href="#fnref5" class="footnoteBacklink" title="Jump back to footnote 5">&#8617;</a></li>
-</ol>
-</div>
-</body>
-</html>