diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Tests/Arbitrary.hs | 8 | ||||
-rw-r--r-- | tests/latex-reader.native | 2 | ||||
-rw-r--r-- | tests/markdown-reader-more.native | 8 | ||||
-rw-r--r-- | tests/rst-reader.native | 6 | ||||
-rw-r--r-- | tests/testsuite.native | 36 | ||||
-rw-r--r-- | tests/textile-reader.native | 12 | ||||
-rw-r--r-- | tests/writer.context | 1 | ||||
-rw-r--r-- | tests/writer.docbook | 2 | ||||
-rw-r--r-- | tests/writer.html | 2 | ||||
-rw-r--r-- | tests/writer.latex | 1 | ||||
-rw-r--r-- | tests/writer.man | 1 | ||||
-rw-r--r-- | tests/writer.mediawiki | 1 | ||||
-rw-r--r-- | tests/writer.native | 36 | ||||
-rw-r--r-- | tests/writer.rst | 8 | ||||
-rw-r--r-- | tests/writer.rtf | 1 | ||||
-rw-r--r-- | tests/writer.texinfo | 1 | ||||
-rw-r--r-- | tests/writer.textile | 1 |
17 files changed, 65 insertions, 62 deletions
diff --git a/tests/Tests/Arbitrary.hs b/tests/Tests/Arbitrary.hs index 1da7db143..0191fda7b 100644 --- a/tests/Tests/Arbitrary.hs +++ b/tests/Tests/Arbitrary.hs @@ -35,6 +35,8 @@ arbInline n = frequency $ [ (60, liftM Str realString) , (5, return EnDash) , (5, return Apostrophe) , (5, return Ellipses) + , (5, elements [ RawInline "html" "<a>*&*</a>" + , RawInline "latex" "\\my{command}" ]) ] ++ [ x | x <- nesters, n > 1] where nesters = [ (10, liftM Emph $ listOf $ arbInline (n-1)) , (10, liftM Strong $ listOf $ arbInline (n-1)) @@ -66,7 +68,11 @@ arbBlock :: Int -> Gen Block arbBlock n = frequency $ [ (10, liftM Plain arbitrary) , (15, liftM Para arbitrary) , (5, liftM2 CodeBlock arbitrary realString) - , (2, liftM RawHtml realString) + , (2, elements [ RawBlock "html" + "<div>\n*&*\n</div>" + , RawBlock "latex" + "\\begin[opt]{env}\nhi\n{\\end{env}" + ]) , (5, do x1 <- choose (1 :: Int, 6) x2 <- arbitrary return (Header x1 x2)) diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 79c48fca0..cb5f201aa 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -259,7 +259,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,Header 1 [Str "LaTeX"] ,BulletList [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str "22",Str "-",Str "23"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] []]] - ,[Para [TeX "\\doublespacing"]] + ,[Para [RawInline "latex" "\\doublespacing"]] ,[Para [Math InlineMath "2+2=4"]] ,[Para [Math InlineMath "x \\in y"]] ,[Para [Math InlineMath "\\alpha \\wedge \\omega"]] diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native index ce093b9fa..003eceb70 100644 --- a/tests/markdown-reader-more.native +++ b/tests/markdown-reader-more.native @@ -2,8 +2,8 @@ ,Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"] ,Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")] ,Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"] -,Para [TeX "\\placeformula",Space,TeX "\\startformula\n L_{1} = L_{2}\n \\stopformula"] -,Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"] +,Para [RawInline "latex" "\\placeformula",Space,RawInline "latex" "\\startformula\n L_{1} = L_{2}\n \\stopformula"] +,RawBlock "latex" "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]" ,Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"] ,Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")] ,Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")] @@ -11,13 +11,13 @@ ,HorizontalRule ,HorizontalRule ,Header 2 [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"] -,Plain [HtmlInline "<a>",HtmlInline "</a>"] +,Plain [RawInline "html" "<a>",RawInline "html" "</a>"] ,Header 3 [Str "my",Space,Str "header"] ,Header 2 [Str "$",Space,Str "in",Space,Str "math"] ,Para [Math InlineMath "\\$2 + \\$3"] ,Header 2 [Str "Commented",Str "-",Str "out",Space,Str "list",Space,Str "item"] ,BulletList - [[Plain [Str "one",Space,HtmlInline "<!--\n- two\n-->"]] + [[Plain [Str "one",Space,RawInline "html" "<!--\n- two\n-->"]] ,[Plain [Str "three"]]] ,Header 2 [Str "Backslash",Space,Str "newline"] ,Para [Str "hi",LineBreak,Str "there"] diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 1134cb245..e11e7b0ed 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -174,11 +174,11 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ": [[Plain [Str "123",EnDash,Str "4567"]]])] ,Header 1 [Str "HTML",Space,Str "Blocks"] ,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] -,RawHtml "<div>foo</div>\n" +,RawBlock "html" "<div>foo</div>\n" ,Para [Str "Now,",Space,Str "nested",Str ":"] -,RawHtml "<div>\n <div>\n <div>\n foo\n </div>\n </div>\n</div>\n" +,RawBlock "html" "<div>\n <div>\n <div>\n foo\n </div>\n </div>\n</div>\n" ,Header 1 [Str "LaTeX",Space,Str "Block"] -,Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}\n"] +,RawBlock "latex" "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}\n" ,Header 1 [Str "Inline",Space,Str "Markup"] ,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str "."] ,Para [Str "This",Space,Str "is",Space,Str "code",Str ":",Space,Code ">",Str ",",Space,Code "$",Str ",",Space,Code "\\",Str ",",Space,Code "\\$",Str ",",Space,Code "<html>",Str "."] diff --git a/tests/testsuite.native b/tests/testsuite.native index 072849bbf..607c95eb2 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -228,45 +228,45 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,[Plain [Str "sublist"]]]]])] ,Header 1 [Str "HTML",Space,Str "Blocks"] ,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] -,RawHtml "<div>" +,RawBlock "html" "<div>" ,Plain [Str "foo"] -,RawHtml "</div>\n" +,RawBlock "html" "</div>\n" ,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation",Str ":"] -,RawHtml "<div>\n<div>\n<div>" +,RawBlock "html" "<div>\n<div>\n<div>" ,Plain [Str "foo"] -,RawHtml "</div>\n</div>\n<div>" +,RawBlock "html" "</div>\n</div>\n<div>" ,Plain [Str "bar"] -,RawHtml "</div>\n</div>\n" +,RawBlock "html" "</div>\n</div>\n" ,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table",Str ":"] -,RawHtml "<table>\n<tr>\n<td>" +,RawBlock "html" "<table>\n<tr>\n<td>" ,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]] -,RawHtml "</td>\n<td>" +,RawBlock "html" "</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" +,RawBlock "html" "</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",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block",Str ":"] -,RawHtml "<div>\n " +,RawBlock "html" "<div>\n " ,Plain [Str "foo"] -,RawHtml "</div>\n" +,RawBlock "html" "</div>\n" ,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block",Str ",",Space,Str "though",Str ":"] ,CodeBlock ("",[],[]) "<div>\n foo\n</div>" ,Para [Str "As",Space,Str "should",Space,Str "this",Str ":"] ,CodeBlock ("",[],[]) "<div>foo</div>" ,Para [Str "Now",Str ",",Space,Str "nested",Str ":"] -,RawHtml "<div>\n <div>\n <div>\n " +,RawBlock "html" "<div>\n <div>\n <div>\n " ,Plain [Str "foo"] -,RawHtml "</div>\n </div>\n</div>\n" +,RawBlock "html" "</div>\n </div>\n</div>\n" ,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment",Str ":"] -,RawHtml "<!-- Comment -->\n" +,RawBlock "html" "<!-- Comment -->\n" ,Para [Str "Multiline",Str ":"] -,RawHtml "<!--\nBlah\nBlah\n-->\n\n<!--\n This is another comment.\n-->\n" +,RawBlock "html" "<!--\nBlah\nBlah\n-->\n\n<!--\n This is another comment.\n-->\n" ,Para [Str "Code",Space,Str "block",Str ":"] ,CodeBlock ("",[],[]) "<!-- Comment -->" ,Para [Str "Just",Space,Str "plain",Space,Str "comment",Str ",",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line",Str ":"] -,RawHtml "<!-- foo --> \n" +,RawBlock "html" "<!-- foo --> \n" ,Para [Str "Code",Str ":"] ,CodeBlock ("",[],[]) "<hr />" ,Para [Str "Hr",Apostrophe,Str "s",Str ":"] -,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" +,RawBlock "html" "<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 "."] @@ -294,7 +294,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,HorizontalRule ,Header 1 [Str "LaTeX"] ,BulletList - [[Plain [TeX "\\cite[22-23]{smith.1899}"]] + [[Plain [RawInline "latex" "\\cite[22-23]{smith.1899}"]] ,[Plain [Math InlineMath "2+2=4"]] ,[Plain [Math InlineMath "x \\in y"]] ,[Plain [Math InlineMath "\\alpha \\wedge \\omega"]] @@ -309,7 +309,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,[Plain [Str "Shoes",Space,Str "(",Str "$",Str "20",Str ")",Space,Str "and",Space,Str "socks",Space,Str "(",Str "$",Str "5",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",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table",Str ":"] -,Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}"] +,RawBlock "latex" "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}" ,HorizontalRule ,Header 1 [Str "Special",Space,Str "Characters"] ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode",Str ":"] diff --git a/tests/textile-reader.native b/tests/textile-reader.native index d0079cd19..fad1c0972 100644 --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -125,18 +125,18 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) ,[Plain [Str "24"]] ,[Plain [Str "f"]]]] ,Header 1 [Str "Raw",Space,Str "HTML"] -,Para [Str "However",Str ",",Space,HtmlInline "<strong>",Space,Str "raw",Space,Str "HTML",Space,Str "inlines",Space,HtmlInline "</strong>",Space,Str "are",Space,Str "accepted",Str ",",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str ":"] -,RawHtml "<div class=\"foobar\">" +,Para [Str "However",Str ",",Space,RawInline "html" "<strong>",Space,Str "raw",Space,Str "HTML",Space,Str "inlines",Space,RawInline "html" "</strong>",Space,Str "are",Space,Str "accepted",Str ",",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str ":"] +,RawBlock "html" "<div class=\"foobar\">" ,Para [Str "any",Space,Strong [Str "Raw",Space,Str "HTML",Space,Str "Block"],Space,Str "with",Space,Str "bold",LineBreak] -,RawHtml "</div>" +,RawBlock "html" "</div>" ,Para [Str "Html",Space,Str "blocks",Space,Str "can",Space,Str "be"] -,RawHtml "<div>" +,RawBlock "html" "<div>" ,Para [Str "inlined"] -,RawHtml "</div>" +,RawBlock "html" "</div>" ,Para [Str "as",Space,Str "well",Str "."] ,BulletList [[Plain [Str "this",Space,Str "<",Str "div",Str ">",Space,Str "won",Apostrophe,Str "t",Space,Str "produce",Space,Str "raw",Space,Str "html",Space,Str "blocks",Space,Str "<",Str "/div",Str ">"]] - ,[Plain [Str "but",Space,Str "this",Space,HtmlInline "<strong>",Space,Str "will",Space,Str "produce",Space,Str "inline",Space,Str "html",Space,HtmlInline "</strong>"]]] + ,[Plain [Str "but",Space,Str "this",Space,RawInline "html" "<strong>",Space,Str "will",Space,Str "produce",Space,Str "inline",Space,Str "html",Space,RawInline "html" "</strong>"]]] ,Para [Str "Can",Space,Str "you",Space,Str "prove",Space,Str "that",Space,Str "2",Space,Str "<",Space,Str "3",Space,Str "?"] ,Header 1 [Str "Acronyms",Space,Str "and",Space,Str "marks"] ,Para [Str "PBS",Space,Str "(",Str "Public",Space,Str "Broadcasting",Space,Str "System",Str ")"] diff --git a/tests/writer.context b/tests/writer.context index 316cd7735..f47249c5a 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -696,7 +696,6 @@ Animal & Number \\ \hline Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} - \thinrule \subject{Special Characters} diff --git a/tests/writer.docbook b/tests/writer.docbook index 15704f8bf..e7e948288 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -1133,8 +1133,6 @@ These should not be escaped: \$ \\ \> \[ \{ <para> Here's a LaTeX table: </para> - <para> - </para> </section> <section id="special-characters"> <title>Special Characters</title> diff --git a/tests/writer.html b/tests/writer.html index ae83dc20f..f2c850c81 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -846,8 +846,6 @@ Blah ></ul ><p >Here’s a LaTeX table:</p -><p -></p ><hr /><h1 id="special-characters" >Special Characters</h1 diff --git a/tests/writer.latex b/tests/writer.latex index e6adff585..44e11c874 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -634,7 +634,6 @@ Animal & Number \\ \hline Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} - \begin{center}\rule{3in}{0.4pt}\end{center} \section{Special Characters} diff --git a/tests/writer.man b/tests/writer.man index 80897f252..bdbb91604 100644 --- a/tests/writer.man +++ b/tests/writer.man @@ -591,7 +591,6 @@ Escaped \f[C]$\f[]: $73 \f[I]this should be emphasized\f[] 23$. .PP Here's a LaTeX table: .PP -.PP * * * * * .SH Special Characters .PP diff --git a/tests/writer.mediawiki b/tests/writer.mediawiki index 557396bfb..af4f7050c 100644 --- a/tests/writer.mediawiki +++ b/tests/writer.mediawiki @@ -496,7 +496,6 @@ Here’s a LaTeX table: - ----- = Special Characters = diff --git a/tests/writer.native b/tests/writer.native index 072849bbf..607c95eb2 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -228,45 +228,45 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,[Plain [Str "sublist"]]]]])] ,Header 1 [Str "HTML",Space,Str "Blocks"] ,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] -,RawHtml "<div>" +,RawBlock "html" "<div>" ,Plain [Str "foo"] -,RawHtml "</div>\n" +,RawBlock "html" "</div>\n" ,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation",Str ":"] -,RawHtml "<div>\n<div>\n<div>" +,RawBlock "html" "<div>\n<div>\n<div>" ,Plain [Str "foo"] -,RawHtml "</div>\n</div>\n<div>" +,RawBlock "html" "</div>\n</div>\n<div>" ,Plain [Str "bar"] -,RawHtml "</div>\n</div>\n" +,RawBlock "html" "</div>\n</div>\n" ,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table",Str ":"] -,RawHtml "<table>\n<tr>\n<td>" +,RawBlock "html" "<table>\n<tr>\n<td>" ,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]] -,RawHtml "</td>\n<td>" +,RawBlock "html" "</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" +,RawBlock "html" "</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",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block",Str ":"] -,RawHtml "<div>\n " +,RawBlock "html" "<div>\n " ,Plain [Str "foo"] -,RawHtml "</div>\n" +,RawBlock "html" "</div>\n" ,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block",Str ",",Space,Str "though",Str ":"] ,CodeBlock ("",[],[]) "<div>\n foo\n</div>" ,Para [Str "As",Space,Str "should",Space,Str "this",Str ":"] ,CodeBlock ("",[],[]) "<div>foo</div>" ,Para [Str "Now",Str ",",Space,Str "nested",Str ":"] -,RawHtml "<div>\n <div>\n <div>\n " +,RawBlock "html" "<div>\n <div>\n <div>\n " ,Plain [Str "foo"] -,RawHtml "</div>\n </div>\n</div>\n" +,RawBlock "html" "</div>\n </div>\n</div>\n" ,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment",Str ":"] -,RawHtml "<!-- Comment -->\n" +,RawBlock "html" "<!-- Comment -->\n" ,Para [Str "Multiline",Str ":"] -,RawHtml "<!--\nBlah\nBlah\n-->\n\n<!--\n This is another comment.\n-->\n" +,RawBlock "html" "<!--\nBlah\nBlah\n-->\n\n<!--\n This is another comment.\n-->\n" ,Para [Str "Code",Space,Str "block",Str ":"] ,CodeBlock ("",[],[]) "<!-- Comment -->" ,Para [Str "Just",Space,Str "plain",Space,Str "comment",Str ",",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line",Str ":"] -,RawHtml "<!-- foo --> \n" +,RawBlock "html" "<!-- foo --> \n" ,Para [Str "Code",Str ":"] ,CodeBlock ("",[],[]) "<hr />" ,Para [Str "Hr",Apostrophe,Str "s",Str ":"] -,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" +,RawBlock "html" "<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 "."] @@ -294,7 +294,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,HorizontalRule ,Header 1 [Str "LaTeX"] ,BulletList - [[Plain [TeX "\\cite[22-23]{smith.1899}"]] + [[Plain [RawInline "latex" "\\cite[22-23]{smith.1899}"]] ,[Plain [Math InlineMath "2+2=4"]] ,[Plain [Math InlineMath "x \\in y"]] ,[Plain [Math InlineMath "\\alpha \\wedge \\omega"]] @@ -309,7 +309,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,[Plain [Str "Shoes",Space,Str "(",Str "$",Str "20",Str ")",Space,Str "and",Space,Str "socks",Space,Str "(",Str "$",Str "5",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",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table",Str ":"] -,Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}"] +,RawBlock "latex" "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}" ,HorizontalRule ,Header 1 [Str "Special",Space,Str "Characters"] ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode",Str ":"] diff --git a/tests/writer.rst b/tests/writer.rst index 79d989915..189886a87 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -617,6 +617,14 @@ These shouldn’t be math: Here’s a LaTeX table: +.. raw:: latex + + \begin{tabular}{|l|l|}\hline + Animal & Number \\ \hline + Dog & 2 \\ + Cat & 1 \\ \hline + \end{tabular} + -------------- Special Characters diff --git a/tests/writer.rtf b/tests/writer.rtf index 3cb1d2996..3acbe4ef5 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -277,7 +277,6 @@ quoted link {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Shoes ($20) and socks ($5).\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Escaped {\f1 $}: $73 {\i this should be emphasized} 23$.\sa180\par} {\pard \ql \f0 \sa180 \li0 \fi0 Here\u8217's a LaTeX table:\par} -{\pard \ql \f0 \sa180 \li0 \fi0 \par} {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par} {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 Special Characters\par} {\pard \ql \f0 \sa180 \li0 \fi0 Here is some unicode:\par} diff --git a/tests/writer.texinfo b/tests/writer.texinfo index 62611d7a6..4e08e8f63 100644 --- a/tests/writer.texinfo +++ b/tests/writer.texinfo @@ -789,7 +789,6 @@ Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} @end tex - @iftex @bigskip@hrule@bigskip @end iftex diff --git a/tests/writer.textile b/tests/writer.textile index 8abbdb848..51aca5a08 100644 --- a/tests/writer.textile +++ b/tests/writer.textile @@ -533,7 +533,6 @@ These shouldn't be math: Here's a LaTeX table: - <hr /> h1. Special Characters |