de72aea · typeable/pandoc

git.iko.soy/typeable/pandoc

Brought test suite up to date.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@828 788f1e2b-df1e-0410-8736-df70ead52e1b

commitde72aea6b444c8e922605fdb0c1c8dafd75f534a authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 28 Jul 2007, 19:15 (19 years ago) parent44b1367

25 files changed+64−41

compare with master

unifiedsplit

tests/html-reader.native+1

@@ -314,3 +314,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "")

314314, 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)."]

315315, CodeBlock " { <code> }"

316316, 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."] ]

317+

tests/rst-reader.native+1

@@ -180,3 +180,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str

180180, 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 ":"]

181181, Plain [Image [Str "image"] ("lalune.jpg","")]

182182, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon."] ]

183+

tests/s5.basic.html+1

@@ -787,3 +787,4 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>

787787</body

788788 ></html

789789>

790+

tests/s5.fancy.html+1

@@ -1699,3 +1699,4 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>

16991699</body

17001700 ></html

17011701>

1702+

tests/s5.fragment.html+1−1

@@ -12,4 +12,4 @@

1212><li

1313 >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li

1414 ></ul

15−>

15+>

tests/s5.inserts.html+1

@@ -33,3 +33,4 @@ STUFF INSERTED

3333</body

3434 ></html

3535>

36+

tests/tables.context+1

@@ -133,3 +133,4 @@ Multiline table without caption:

133133\HL

134134\stoptable

135135

136+

tests/tables.docbook+1

@@ -284,3 +284,4 @@

284284 </td>

285285 </tr>

286286</informaltable>

287+

tests/tables.html+1−1

@@ -204,4 +204,4 @@

204204 >Here's another one. Note the blank line between rows.</td

205205 ></tr

206206 ></table

207−>

207+>

tests/tables.latex+1

@@ -137,3 +137,4 @@ Second

137137\end{tabular}

138138\end{center}

139139

140+

tests/tables.man+1−1

@@ -202,4 +202,4 @@ T}@T{

202202T}@T{

203203Here\[aq]s another one\. Note the blank line between rows\.

204204T}

205−.TE

205+.TE

tests/tables.markdown+1

@@ -57,3 +57,4 @@ Multiline table without caption:

5757 --------------------------------------------------------------

5858

5959

60+

tests/tables.native+1

@@ -81,3 +81,4 @@ Pandoc (Meta [] [] "")

8181 , [ Plain [Str "row"] ]

8282 , [ Plain [Str "5",Str ".",Str "0"] ]

8383 , [ 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 "."] ] ] ] ]

84+

tests/tables.rst+1

@@ -69,3 +69,4 @@ Multiline table without caption:

6969+-------------+------------+--------------+----------------------------+

7070

7171

72+

tests/tables.rtf+1

@@ -278,3 +278,4 @@

278278}

279279\intbl\row}

280280{\pard \ql \f0 \sa180 \li0 \fi0 \par}

281+

tests/testsuite.native+3−2

@@ -341,10 +341,10 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

341341, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]

342342, 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 "."]

343343, Header 2 [Str "Autolinks"]

344−, 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","")]

344+, 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","")]

345345, BulletList

346346 [ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ]

347− , [ Plain [Link [Str "http://example.com/"] ("http://example.com/","")] ]

347+ , [ Plain [Link [Code "http://example.com/"] ("http://example.com/","")] ]

348348 , [ Plain [Str "It",Space,Str "should",Str "."] ] ]

349349, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Code "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]

350350, BlockQuote

@@ -367,3 +367,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

367367 [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ]

368368 ]

369369, 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 "."] ]

370+

tests/writer.context+2−1

@@ -7,7 +7,7 @@

77\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in,

88 height=middle, header=0.75in, footer=0.75in] % page layout

99\setuppagenumbering[location={footer,center}] % number pages

10−\setupbodyfont[12pt] % 12pt font

10+\setupbodyfont[11pt] % 11pt font

1111\setupwhitespace[medium] % inter-paragraph spacing

1212

1313\setuphead[section][style=\tfc]

@@ -721,3 +721,4 @@ This paragraph should not be part of the note, as it is not indented.

721721

722722

723723\stoptext

724+

tests/writer.docbook+5−4

@@ -979,7 +979,7 @@ Cat & 1 \\ \hline

979979 <ulink url="/url/with_underscore">with_underscore</ulink>

980980 </para>

981981 <para>

982− <email>nobody@nowhere.net</email>

982+ Email link (<email>nobody@nowhere.net</email>)

983983 </para>

984984 <para>

985985 <ulink url="">Empty</ulink>.

@@ -1046,7 +1046,7 @@ Cat & 1 \\ \hline

10461046 <title>Autolinks</title>

10471047 <para>

10481048 With an ampersand:

1049− <ulink url="http://example.com/?foo=1&bar=2">http://example.com/?foo=1&bar=2</ulink>

1049+ <ulink url="http://example.com/?foo=1&bar=2"><literal>http://example.com/?foo=1&bar=2</literal></ulink>

10501050 </para>

10511051 <itemizedlist>

10521052 <listitem>

@@ -1056,7 +1056,7 @@ Cat & 1 \\ \hline

10561056 </listitem>

10571057 <listitem>

10581058 <para>

1059− <ulink url="http://example.com/">http://example.com/</ulink>

1059+ <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>

10601060 </para>

10611061 </listitem>

10621062 <listitem>

@@ -1071,7 +1071,7 @@ Cat & 1 \\ \hline

10711071 <blockquote>

10721072 <para>

10731073 Blockquoted:

1074− <ulink url="http://example.com/">http://example.com/</ulink>

1074+ <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>

10751075 </para>

10761076 </blockquote>

10771077 <para>

@@ -1176,3 +1176,4 @@ or here: <http://example.com/>

11761176 </para>

11771177 </section>

11781178</article>

1179+

tests/writer.html+11−4

@@ -913,14 +913,18 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

913913 >Autolinks</h2

914914 ><p

915915 >With an ampersand: <a href="http://example.com/?foo=1&bar=2"

916− >http://example.com/?foo=1&bar=2</a

916+ ><code

917+ >http://example.com/?foo=1&bar=2</code

918+ ></a

917919 ></p

918920 ><ul

919921 ><li

920922 >In a list?</li

921923 ><li

922924 ><a href="http://example.com/"

923− >http://example.com/</a

925+ ><code

926+ >http://example.com/</code

927+ ></a

924928 ></li

925929 ><li

926930 >It should.</li

@@ -930,7 +934,7 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

930934 >

931935<!--

932936h='nowhere.net';a='@';n='nobody';e=n+a+h;

933−document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');

937+document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+'a'+'>');

934938// -->

935939</script

936940 ><noscript

@@ -939,7 +943,9 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');

939943 ><blockquote

940944 ><p

941945 >Blockquoted: <a href="http://example.com/"

942− >http://example.com/</a

946+ ><code

947+ >http://example.com/</code

948+ ></a

943949 ></p

944950 ></blockquote

945951 ><p

@@ -1042,3 +1048,4 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');

10421048 ></body

10431049 ></html

10441050>

1051+

tests/writer.latex+11−11

@@ -1,7 +1,6 @@

11\documentclass{article}

22\usepackage{ucs}

33\usepackage[utf8x]{inputenc}

4−\usepackage[Q=yes,verbatimenv=yes,pverb-linebreak=no]{examplep}

54\setlength{\parindent}{0pt}

65\setlength{\parskip}{6pt plus 2pt minus 1pt}

76\newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}

@@ -413,7 +412,7 @@ So is \textbf{\emph{this}} word.

413412

414413So is \textbf{\emph{this}} word.

415414

416−This is code: \Q{\>}, \Q{\$}, \Q{\\}, \Q{\\\$}, \Q{\<html\>}.

415+This is code: \verb!>!, \verb!$!, \verb!\!, \verb!\$!, \verb!<html>!.

417416

418417\sout{This is \emph{strikeout}.}

419418

@@ -435,7 +434,7 @@ These should not be superscripts or subscripts, because of the unescaped spaces:

435434

436435`He said, ``I want to go.''\,' Were you alive in the 70's?

437436

438−Here is some quoted `\Q{code}' and a ``\href{http://example.com/?foo=1&bar=2}{quoted link}''.

437+Here is some quoted `\verb!code!' and a ``\href{http://example.com/?foo=1&bar=2}{quoted link}''.

439438

440439Some dashes: one---two---three---four---five.

441440

@@ -461,9 +460,9 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.

461460These shouldn't be math:

462461

463462\begin{itemize}

464−\item To get the famous equation, write \Q{\$e\ \=\ mc\^2\$}.

463+\item To get the famous equation, write \verb!$e = mc^2$!.

465464\item \$22,000 is a \emph{lot} of money. So is \$34,000. (It worked if ``lot'' is emphasized.)

466−\item Escaped \Q{\$}: \$73 \emph{this should be emphasized} 23\$.

465+\item Escaped \verb!$!: \$73 \emph{this should be emphasized} 23\$.

467466\end{itemize}

468467Here's a LaTeX table:

469468

@@ -591,20 +590,20 @@ Here's an \href{/script?foo=1&bar=2}{inline link in pointy braces}.

591590

592591\subsection{Autolinks}

593592

594−With an ampersand: \href{http://example.com/?foo=1&bar=2}{http://example.com/?foo=1\&bar=2}

593+With an ampersand: \href{http://example.com/?foo=1&bar=2}{\texttt{http://example.com/?foo=1\&bar=2}}

595594

596595\begin{itemize}

597596\item In a list?

598−\item \href{http://example.com/}{http://example.com/}

597+\item \href{http://example.com/}{\texttt{http://example.com/}}

599598\item It should.

600599\end{itemize}

601−An e-mail address: \href{mailto:nobody@nowhere.net}{nobody@nowhere.net}

600+An e-mail address: \href{mailto:nobody@nowhere.net}{\texttt{nobody@nowhere.net}}

602601

603602\begin{quote}

604−Blockquoted: \href{http://example.com/}{http://example.com/}

603+Blockquoted: \href{http://example.com/}{\texttt{http://example.com/}}

605604

606605\end{quote}

607−Auto-links should not occur here: \Q{\<http\:\/\/example\.com\/\>}

606+Auto-links should not occur here: \verb!<http://example.com/>!

608607

609608\begin{verbatim}

610609or here: <http://example.com/>

@@ -630,7 +629,7 @@ Subsequent blocks are indented to show that they belong to the footnote (as with

630629\begin{Verbatim}

631630 { <code> }

632631\end{Verbatim}

633−If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.} This should \emph{not} be a footnote reference, because it contains a space.[\^{}my note] Here is an inline note.\footnote{This is \emph{easier} to type. Inline notes may contain \href{http://google.com}{links} and \Q{\]} verbatim characters, as well as [bracketed text].}

632+If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.} This should \emph{not} be a footnote reference, because it contains a space.[\^{}my note] Here is an inline note.\footnote{This is \emph{easier} to type. Inline notes may contain \href{http://google.com}{links} and \verb!]! verbatim characters, as well as [bracketed text].}

634633

635634\begin{quote}

636635Notes can go in quotes.\footnote{In quote.}

@@ -643,3 +642,4 @@ This paragraph should not be part of the note, as it is not indented.

643642

644643

645644\end{document}

645+

tests/writer.man+1−1

@@ -756,4 +756,4 @@ In quote\.

756756.PP

757757In list\.

758758.SH AUTHORS

759−John MacFarlane, Anonymous

759+John MacFarlane, Anonymous

tests/writer.markdown+1

@@ -683,3 +683,4 @@ indented.

683683

684684[^5]: In list.

685685

686+

tests/writer.native+5−4

@@ -341,14 +341,14 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

341341, Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]

342342, 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 "."]

343343, Header 2 [Str "Autolinks"]

344−, 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","")]

344+, 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","")]

345345, BulletList

346346 [ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ]

347− , [ Plain [Link [Str "http://example.com/"] ("http://example.com/","")] ]

347+ , [ Plain [Link [Code "http://example.com/"] ("http://example.com/","")] ]

348348 , [ Plain [Str "It",Space,Str "should",Str "."] ] ]

349−, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]

349+, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Code "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]

350350, BlockQuote

351− [ Para [Str "Blockquoted:",Space,Link [Str "http://example.com/"] ("http://example.com/","")] ]

351+ [ Para [Str "Blockquoted:",Space,Link [Code "http://example.com/"] ("http://example.com/","")] ]

352352

353353, Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code "<http://example.com/>"]

354354, CodeBlock "or here: <http://example.com/>"

@@ -367,3 +367,4 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

367367 [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ]

368368 ]

370+

tests/writer.rst+5−7

@@ -727,17 +727,15 @@ Here's an `inline link in pointy braces </script?foo=1&bar=2>`_.

727727Autolinks

728728---------

729729

730−With an ampersand:

731−`http://example.com/?foo=1&bar=2 <http://example.com/?foo=1&bar=2>`_

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

732731

733732- In a list?

734−- `http://example.com/ <http://example.com/>`_

733+- http://example.com/

735734- It should.

736735

737−An e-mail address:

738−`nobody@nowhere.net <mailto:nobody@nowhere.net>`_

736+An e-mail address: nobody@nowhere.net

739737

740− Blockquoted: `http://example.com/ <http://example.com/>`_

738+ Blockquoted: http://example.com/

741739

742740

743741Auto-links should not occur here: ``<http://example.com/>``

@@ -802,4 +800,4 @@ indented.

802800

803801

804802.. |lalune| image:: lalune.jpg

805−.. |movie| image:: movie.jpg

803+.. |movie| image:: movie.jpg

tests/writer.rtf+5−4

@@ -379,21 +379,21 @@ inline link in pointy braces

379379.\par}

380380{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 Autolinks\par}

381381{\pard \ql \f0 \sa180 \li0 \fi0 With an ampersand: {\field{\*\fldinst{HYPERLINK "http://example.com/?foo=1&bar=2"}}{\fldrslt{\ul

382−http://example.com/?foo=1&bar=2

382+{\f1 http://example.com/?foo=1&bar=2}

383383}}}

384384\par}

385385{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab In a list?\par}

386386{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "http://example.com/"}}{\fldrslt{\ul

387−http://example.com/

387+{\f1 http://example.com/}

388388}}}

389389\par}

390390{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab It should.\sa180\par}

391391{\pard \ql \f0 \sa180 \li0 \fi0 An e-mail address: {\field{\*\fldinst{HYPERLINK "mailto:nobody@nowhere.net"}}{\fldrslt{\ul

392−nobody@nowhere.net

392+{\f1 nobody@nowhere.net}

393393}}}

394394\par}

395395{\pard \ql \f0 \sa180 \li720 \fi0 Blockquoted: {\field{\*\fldinst{HYPERLINK "http://example.com/"}}{\fldrslt{\ul

396−http://example.com/

396+{\f1 http://example.com/}

397397}}}

398398\par}

399399{\pard \ql \f0 \sa180 \li0 \fi0 Auto-links should not occur here: {\f1 <http://example.com/>} \par}

@@ -422,3 +422,4 @@ links

422422{\pard \ql \f0 \sa180 \li0 \fi0 This paragraph should not be part of the note, as it is not indented.\par}

423423

424424}

425+