diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-12 08:13:11 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-01-12 08:13:11 -0800 |
| commit | 5da2d1e66ca0dec86b31407f6e6e9d129e5b23b5 (patch) | |
| tree | e1cfe10b843a78af8dbdd95d2f7572b40e715b30 /tests | |
| parent | ff74c51b532f05303343b4c9de3a8c392298c014 (diff) | |
| parent | 91510a109f9284934fd5b6386fa23a5fc37b09bb (diff) | |
| download | pandoc-5da2d1e66ca0dec86b31407f6e6e9d129e5b23b5.tar.gz | |
Merge branch 'master' into tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/s5.basic.html | 2 | ||||
| -rw-r--r-- | tests/s5.fancy.html | 2 | ||||
| -rw-r--r-- | tests/s5.inserts.html | 2 | ||||
| -rw-r--r-- | tests/writer.html | 36 |
4 files changed, 21 insertions, 21 deletions
diff --git a/tests/s5.basic.html b/tests/s5.basic.html index 825d05868..64971417a 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>My S5 Document</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> <meta name="author" content="Sam Smith" /> <meta name="author" content="Jen Jones" /> <meta name="date" content="July 15, 2006" /> + <title>My S5 Document</title> <!-- configuration parameters --> <meta name="defaultView" content="slideshow" /> <meta name="controlVis" content="hidden" /> diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index f4f2e7815..200990b6a 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>My S5 Document</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> <meta name="author" content="Sam Smith" /> <meta name="author" content="Jen Jones" /> <meta name="date" content="July 15, 2006" /> + <title>My S5 Document</title> <!-- configuration parameters --> <meta name="defaultView" content="slideshow" /> <meta name="controlVis" content="hidden" /> diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index 90014f2e6..3010ef758 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>My S5 Document</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> <meta name="author" content="Sam Smith" /> <meta name="author" content="Jen Jones" /> <meta name="date" content="July 15, 2006" /> + <title>My S5 Document</title> <link rel="stylesheet" href="main.css" type="text/css" /> STUFF INSERTED </head> diff --git a/tests/writer.html b/tests/writer.html index 39ae2ebb7..ae83dc20f 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>Pandoc Test Suite</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> <meta name="author" content="John MacFarlane" /> <meta name="author" content="Anonymous" /> <meta name="date" content="July 17, 2006" /> + <title>Pandoc Test Suite</title> </head> <body> <h1 class="title">Pandoc Test Suite</h1> @@ -74,7 +74,7 @@ ></pre ><p >A list:</p - ><ol style="list-style-type: decimal;" + ><ol style="list-style-type: decimal" ><li >item one</li ><li @@ -207,7 +207,7 @@ These should not be escaped: \$ \\ \> \[ \{ >Ordered</h2 ><p >Tight:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li >First</li ><li @@ -217,7 +217,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >and:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li >One</li ><li @@ -227,7 +227,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >Loose using tabs:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li ><p >First</p @@ -243,7 +243,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >and using spaces:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li ><p >One</p @@ -259,7 +259,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >Multiple paragraphs:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li ><p >Item 1, graf one.</p @@ -291,7 +291,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ul ><p >Here’s another:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li >First</li ><li @@ -309,7 +309,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >Same thing but with paragraphs:</p -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li ><p >First</p @@ -355,7 +355,7 @@ These should not be escaped: \$ \\ \> \[ \{ ></ul ><h2 id="fancy-list-markers" >Fancy list markers</h2 -><ol start="2" style="list-style-type: decimal;" +><ol start="2" style="list-style-type: decimal" ><li >begins with 2</li ><li @@ -363,11 +363,11 @@ These should not be escaped: \$ \\ \> \[ \{ >and now 3</p ><p >with a continuation</p - ><ol start="4" style="list-style-type: lower-roman;" + ><ol start="4" style="list-style-type: lower-roman" ><li >sublist with roman numerals, starting with 4</li ><li - >more items<ol style="list-style-type: upper-alpha;" + >more items<ol style="list-style-type: upper-alpha" ><li >a subsublist</li ><li @@ -379,13 +379,13 @@ These should not be escaped: \$ \\ \> \[ \{ ></ol ><p >Nesting:</p -><ol style="list-style-type: upper-alpha;" +><ol style="list-style-type: upper-alpha" ><li - >Upper Alpha<ol style="list-style-type: upper-roman;" + >Upper Alpha<ol style="list-style-type: upper-roman" ><li - >Upper Roman.<ol start="6" style="list-style-type: decimal;" + >Upper Roman.<ol start="6" style="list-style-type: decimal" ><li - >Decimal start with 6<ol start="3" style="list-style-type: lower-alpha;" + >Decimal start with 6<ol start="3" style="list-style-type: lower-alpha" ><li >Lower alpha with paren</li ></ol @@ -559,7 +559,7 @@ These should not be escaped: \$ \\ \> \[ \{ ><dd ><p >orange fruit</p - ><ol style="list-style-type: decimal;" + ><ol style="list-style-type: decimal" ><li >sublist</li ><li @@ -1110,7 +1110,7 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+ ></sup ></p ></blockquote -><ol style="list-style-type: decimal;" +><ol style="list-style-type: decimal" ><li >And in list items.<sup ><a href="#fn5" class="footnoteRef" id="fnref5" |