From de72aea6b444c8e922605fdb0c1c8dafd75f534a Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 28 Jul 2007 19:15:30 +0000 Subject: Brought test suite up to date. git-svn-id: https://pandoc.googlecode.com/svn/trunk@828 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/html-reader.native | 1 + tests/rst-reader.native | 1 + tests/s5.basic.html | 1 + tests/s5.fancy.html | 1 + tests/s5.fragment.html | 2 +- tests/s5.inserts.html | 1 + tests/tables.context | 1 + tests/tables.docbook | 1 + tests/tables.html | 2 +- tests/tables.latex | 1 + tests/tables.man | 2 +- tests/tables.markdown | 1 + tests/tables.native | 1 + tests/tables.rst | 1 + tests/tables.rtf | 1 + tests/testsuite.native | 5 +++-- tests/writer.context | 3 ++- tests/writer.docbook | 9 +++++---- tests/writer.html | 15 +++++++++++---- tests/writer.latex | 22 +++++++++++----------- tests/writer.man | 2 +- tests/writer.markdown | 1 + tests/writer.native | 9 +++++---- tests/writer.rst | 12 +++++------- tests/writer.rtf | 9 +++++---- 25 files changed, 64 insertions(+), 41 deletions(-) diff --git a/tests/html-reader.native b/tests/html-reader.native index a432bda7e..242055f3d 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -314,3 +314,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") , Para [Str "Caret",Space,Str "characters",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "indicate",Space,Str "that",Space,Str "the",Space,Str "blocks",Space,Str "all",Space,Str "belong",Space,Str "to",Space,Str "a",Space,Str "single",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "block",Space,Str "quotes)."] , CodeBlock " { }" , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "use",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "every",Space,Str "line,",Space,Str "as",Space,Str "with",Space,Str "blockquotes,",Space,Str "but",Space,Str "all",Space,Str "that",Space,Str "you",Space,Str "need",Space,Str "is",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "the",Space,Str "block",Space,Str "and",Space,Str "any",Space,Str "preceding",Space,Str "blank",Space,Str "lines."] ] + diff --git a/tests/rst-reader.native b/tests/rst-reader.native index b783145fb..c5f1f87d2 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -180,3 +180,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str , 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)",Str ":"] , Plain [Image [Str "image"] ("lalune.jpg","")] , Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon."] ] + diff --git a/tests/s5.basic.html b/tests/s5.basic.html index c6b0d3d6e..eb4b4e106 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -787,3 +787,4 @@ window.onresize = function(){setTimeout('fontScale()', 50);} + diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index 37723ec33..6f0a632bb 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -1699,3 +1699,4 @@ window.onresize = function(){setTimeout('fontScale()', 50);} + diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html index 505d7d2f6..489c81fde 100644 --- a/tests/s5.fragment.html +++ b/tests/s5.fragment.html @@ -12,4 +12,4 @@ >
  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
    • \ No newline at end of file +> diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index c21ed611a..9d9be77bc 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -33,3 +33,4 @@ STUFF INSERTED + diff --git a/tests/tables.context b/tests/tables.context index cb6e9ccd1..3f4b7b597 100644 --- a/tests/tables.context +++ b/tests/tables.context @@ -133,3 +133,4 @@ Multiline table without caption: \HL \stoptable + diff --git a/tests/tables.docbook b/tests/tables.docbook index 0bb094307..ffeebdc57 100644 --- a/tests/tables.docbook +++ b/tests/tables.docbook @@ -284,3 +284,4 @@ + diff --git a/tests/tables.html b/tests/tables.html index a4c402b8a..43a0fb182 100644 --- a/tests/tables.html +++ b/tests/tables.html @@ -204,4 +204,4 @@ >Here's another one. Note the blank line between rows. \ No newline at end of file +> diff --git a/tests/tables.latex b/tests/tables.latex index d4466b9c0..54359cb5d 100644 --- a/tests/tables.latex +++ b/tests/tables.latex @@ -137,3 +137,4 @@ Second \end{tabular} \end{center} + diff --git a/tests/tables.man b/tests/tables.man index de685c1b0..d9f214c93 100644 --- a/tests/tables.man +++ b/tests/tables.man @@ -202,4 +202,4 @@ T}@T{ T}@T{ Here\[aq]s another one\. Note the blank line between rows\. T} -.TE \ No newline at end of file +.TE diff --git a/tests/tables.markdown b/tests/tables.markdown index 7e6816a58..21fb015bc 100644 --- a/tests/tables.markdown +++ b/tests/tables.markdown @@ -57,3 +57,4 @@ Multiline table without caption: -------------------------------------------------------------- + diff --git a/tests/tables.native b/tests/tables.native index 44fb5dd6d..af3f11f94 100644 --- a/tests/tables.native +++ b/tests/tables.native @@ -81,3 +81,4 @@ Pandoc (Meta [] [] "") , [ Plain [Str "row"] ] , [ Plain [Str "5",Str ".",Str "0"] ] , [ Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."] ] ] ] ] + diff --git a/tests/tables.rst b/tests/tables.rst index db5c1c3d8..715031b26 100644 --- a/tests/tables.rst +++ b/tests/tables.rst @@ -69,3 +69,4 @@ Multiline table without caption: +-------------+------------+--------------+----------------------------+ + diff --git a/tests/tables.rtf b/tests/tables.rtf index 06f482090..0485d4978 100644 --- a/tests/tables.rtf +++ b/tests/tables.rtf @@ -278,3 +278,4 @@ } \intbl\row} {\pard \ql \f0 \sa180 \li0 \fi0 \par} + diff --git a/tests/testsuite.native b/tests/testsuite.native index 680749363..ad9737a16 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -341,10 +341,10 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] ("/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"] ("/script?foo=1&bar=2",""),Str "."] , Header 2 [Str "Autolinks"] -, Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] +, Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link [Code "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] , BulletList [ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ] - , [ Plain [Link [Str "http://example.com/"] ("http://example.com/","")] ] + , [ Plain [Link [Code "http://example.com/"] ("http://example.com/","")] ] , [ Plain [Str "It",Space,Str "should",Str "."] ] ] , Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Code "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] , BlockQuote @@ -367,3 +367,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ] ] , 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 "."] ] + diff --git a/tests/writer.context b/tests/writer.context index d4e07fb43..afbd6e075 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -7,7 +7,7 @@ \setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, height=middle, header=0.75in, footer=0.75in] % page layout \setuppagenumbering[location={footer,center}] % number pages -\setupbodyfont[12pt] % 12pt font +\setupbodyfont[11pt] % 11pt font \setupwhitespace[medium] % inter-paragraph spacing \setuphead[section][style=\tfc] @@ -721,3 +721,4 @@ This paragraph should not be part of the note, as it is not indented. \stoptext + diff --git a/tests/writer.docbook b/tests/writer.docbook index 7d5b72abd..596380f3f 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -979,7 +979,7 @@ Cat & 1 \\ \hline with_underscore - nobody@nowhere.net + Email link (nobody@nowhere.net) Empty. @@ -1046,7 +1046,7 @@ Cat & 1 \\ \hline Autolinks With an ampersand: - http://example.com/?foo=1&bar=2 + http://example.com/?foo=1&bar=2 @@ -1056,7 +1056,7 @@ Cat & 1 \\ \hline - http://example.com/ + http://example.com/ @@ -1071,7 +1071,7 @@ Cat & 1 \\ \hline
    Blockquoted: - http://example.com/ + http://example.com/
    @@ -1176,3 +1176,4 @@ or here: <http://example.com/> + diff --git a/tests/writer.html b/tests/writer.html index fb501fdbf..6f24e511a 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -913,14 +913,18 @@ document.write(''+'Email link'+'<\/'+'a'+'>') >Autolinks

    With an ampersand: http://example.com/?foo=1&bar=2http://example.com/?foo=1&bar=2

    • In a list?
    • http://example.com/http://example.com/
    • It should.
      • '+'Email link'+'<\/'+'a'+'>') >