diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RunTests.hs | 15 | ||||
| -rw-r--r-- | tests/s5.basic.html | 26 | ||||
| -rw-r--r-- | tests/s5.fragment.html | 26 | ||||
| -rw-r--r-- | tests/s5.inserts.html | 26 | ||||
| -rw-r--r-- | tests/tables.markdown | 6 | ||||
| -rw-r--r-- | tests/tables.plain | 6 | ||||
| -rw-r--r-- | tests/tables.txt | 8 | ||||
| -rw-r--r-- | tests/writer.docbook | 10 | ||||
| -rw-r--r-- | tests/writer.html | 34 | ||||
| -rw-r--r-- | tests/writer.latex | 9 | ||||
| -rw-r--r-- | tests/writer.man | 15 | ||||
| -rw-r--r-- | tests/writer.markdown | 54 | ||||
| -rw-r--r-- | tests/writer.opendocument | 37 | ||||
| -rw-r--r-- | tests/writer.plain | 52 | ||||
| -rw-r--r-- | tests/writer.rst | 54 | ||||
| -rw-r--r-- | tests/writer.rtf | 10 |
16 files changed, 145 insertions, 243 deletions
diff --git a/tests/RunTests.hs b/tests/RunTests.hs index 0b5555ed1..1715400fd 100644 --- a/tests/RunTests.hs +++ b/tests/RunTests.hs @@ -13,9 +13,7 @@ -- cabal install Diff module Main where -import System.IO.UTF8 import System.IO ( openTempFile, stderr, stdout, hFlush ) -import Prelude hiding ( putStrLn, putStr, readFile ) import System.Process ( runProcess, waitForProcess ) import System.FilePath ( (</>), (<.>) ) import System.Directory @@ -23,6 +21,12 @@ import System.Environment import System.Exit import Text.Printf import Data.Algorithm.Diff +import Prelude hiding ( readFile ) +import qualified Data.ByteString.Lazy as B +import Data.ByteString.Lazy.UTF8 (toString, fromString) + +readFileUTF8 :: FilePath -> IO String +readFileUTF8 f = B.readFile f >>= return . toString pandocPath :: FilePath pandocPath = ".." </> "dist" </> "build" </> "pandoc" </> "pandoc" @@ -127,7 +131,7 @@ main = do -- makes sure file is fully closed after reading readFile' :: FilePath -> IO String -readFile' f = do s <- readFile f +readFile' f = do s <- readFileUTF8 f return $! (length s `seq` s) runLhsWriterTest :: String -> IO Bool @@ -161,8 +165,7 @@ runTest testname opts inp norm = do let normPath = norm hFlush stdout -- Note: COLUMNS must be set for markdown table reader - -- and we need LANG set for ghc 6.12 - ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing (Just [("COLUMNS", "80"),("LANG","en_US.UTF-8")]) Nothing (Just hOut) (Just stderr) + ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing (Just [("COLUMNS", "80")]) Nothing (Just hOut) (Just stderr) ec <- waitForProcess ph result <- if ec == ExitSuccess then do @@ -174,5 +177,5 @@ runTest testname opts inp norm = do else return $ TestFailed $ getDiff (lines outputContents) (lines normContents) else return $ TestError ec removeFile outputPath - putStrLn (show result) + B.putStrLn (fromString $ show result) return (result == TestPassed) diff --git a/tests/s5.basic.html b/tests/s5.basic.html index 253bcab2f..659fc065a 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -309,31 +309,7 @@ ><ul ><li ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span ></li ></ul ></div> diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html index 6ab704d41..32346a331 100644 --- a/tests/s5.fragment.html +++ b/tests/s5.fragment.html @@ -14,31 +14,7 @@ ><ul ><li ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span ></li ></ul ></div diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index efce03868..0af12ffaa 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -29,31 +29,7 @@ STUFF INSERTED ><ul ><li ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span ></li ></ul ></div diff --git a/tests/tables.markdown b/tests/tables.markdown index a605137d1..ab20e76c9 100644 --- a/tests/tables.markdown +++ b/tests/tables.markdown @@ -6,7 +6,7 @@ Simple table with caption: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Simple table without caption: @@ -24,7 +24,7 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: @@ -40,7 +40,7 @@ Multiline table with caption: rows. -------------------------------------------------------------- - Table: Here's the caption. It may span multiple lines. + : Here's the caption. It may span multiple lines. Multiline table without caption: diff --git a/tests/tables.plain b/tests/tables.plain index a605137d1..ab20e76c9 100644 --- a/tests/tables.plain +++ b/tests/tables.plain @@ -6,7 +6,7 @@ Simple table with caption: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Simple table without caption: @@ -24,7 +24,7 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: @@ -40,7 +40,7 @@ Multiline table with caption: rows. -------------------------------------------------------------- - Table: Here's the caption. It may span multiple lines. + : Here's the caption. It may span multiple lines. Multiline table without caption: diff --git a/tests/tables.txt b/tests/tables.txt index 62d431597..d70492262 100644 --- a/tests/tables.txt +++ b/tests/tables.txt @@ -24,10 +24,13 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: +: Here's the caption. +It may span multiple lines. + --------------------------------------------------------------- Centered Left Right Header Aligned Aligned Default aligned @@ -39,9 +42,6 @@ Multiline table with caption: the blank line between rows. --------------------------------------------------------------- -Table: Here's the caption. -It may span multiple lines. - Multiline table without caption: --------------------------------------------------------------- diff --git a/tests/writer.docbook b/tests/writer.docbook index f771bf4af..2d86cfe0e 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -1077,17 +1077,17 @@ Blah </listitem> <listitem> <para> - 2+2=4 + 2 + 2 = 4 </para> </listitem> <listitem> <para> - <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> + <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> </para> </listitem> <listitem> <para> - α ∧ ω + α ∧ ω </para> </listitem> <listitem> @@ -1103,13 +1103,13 @@ Blah <listitem> <para> Here's some display math: - \frac{<emphasis>d</emphasis>}{<emphasis>dx</emphasis>}<emphasis>f</emphasis>(<emphasis>x</emphasis>)=\lim<subscript><emphasis>h</emphasis> → 0</subscript>\frac{<emphasis>f</emphasis>(<emphasis>x</emphasis>+<emphasis>h</emphasis>)-<emphasis>f</emphasis>(<emphasis>x</emphasis>)}{<emphasis>h</emphasis>} + $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$ </para> </listitem> <listitem> <para> Here's one that has a line break in it: - α+ω × <emphasis>x</emphasis><superscript>2</superscript>. + α + ω × <emphasis>x</emphasis><superscript>2</superscript>. </para> </listitem> </itemizedlist> diff --git a/tests/writer.html b/tests/writer.html index f41a8e60a..b8296a536 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -830,19 +830,19 @@ Blah ></li ><li ><span class="math" - >2+2=4</span + >2 + 2 = 4</span ></li ><li ><span class="math" ><em >x</em - > ∈ <em + > ∈ <em >y</em ></span ></li ><li ><span class="math" - >α ∧ ω</span + >α ∧ ω</span ></li ><li ><span class="math" @@ -856,35 +856,11 @@ Blah >-Tree</li ><li >Here’s some display math: <span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span ></li ><li >Here’s one that has a line break in it: <span class="math" - >α+ω × <em + >α + ω × <em >x</em ><sup >2</sup diff --git a/tests/writer.latex b/tests/writer.latex index dbefdb8fd..4b54b9d07 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -14,6 +14,15 @@ \newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} \usepackage{url} \usepackage{graphicx} +% We will generate all images so they have a width \maxwidth. This means +% that they will get their normal width if they fit onto the page, but +% are scaled down if they would overflow the margins. +\makeatletter +\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth +\else\Gin@nat@width\fi} +\makeatother +\let\Oldincludegraphics\includegraphics +\renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} \usepackage[breaklinks=true,unicode=true]{hyperref} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} diff --git a/tests/writer.man b/tests/writer.man index 1048bc701..e9d950bc4 100644 --- a/tests/writer.man +++ b/tests/writer.man @@ -544,23 +544,22 @@ Ellipses\&...and\&...and\&.... .SH LaTeX .IP \[bu] 2 .IP \[bu] 2 -\f[B]2+2=4\f[] +2 + 2 = 4 .IP \[bu] 2 -\f[B]x\ \\in\ y\f[] +\f[I]x\f[] ∈ \f[I]y\f[] .IP \[bu] 2 -\f[B]\\alpha\ \\wedge\ \\omega\f[] +α ∧ ω .IP \[bu] 2 -\f[B]223\f[] +223 .IP \[bu] 2 -\f[B]p\f[]-Tree +\f[I]p\f[]-Tree .IP \[bu] 2 Here's some display math: .RS -\f[B]\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h}\f[] +$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$ .RE .IP \[bu] 2 -Here's one that has a line break in it: -\f[B]\\alpha\ +\ \\omega\ \\times\ x^2\f[]. +Here's one that has a line break in it: α + ω × \f[I]x\f[]^2^. .PP These shouldn't be math: .IP \[bu] 2 diff --git a/tests/writer.markdown b/tests/writer.markdown index 1bc9b76f0..c3f3fcc26 100644 --- a/tests/writer.markdown +++ b/tests/writer.markdown @@ -3,7 +3,7 @@ % July 17, 2006 This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. * * * * * @@ -35,13 +35,13 @@ with no blank line # Paragraphs -Here's a regular paragraph. +Here’s a regular paragraph. 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. -Here's one with a bullet. \* criminey. +Here’s one with a bullet. \* criminey. There should be a hard line break here. @@ -185,7 +185,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -201,7 +201,7 @@ Multiple paragraphs: -Here's another: +Here’s another: 1. First 2. Second: @@ -395,7 +395,7 @@ And this is **strong** <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> -Here's a simple block: +Here’s a simple block: <div> @@ -450,7 +450,7 @@ Code: <hr /> -Hr's: +Hr’s: <hr> @@ -505,22 +505,22 @@ unescaped spaces: a\^b c\^d, a\~b c\~d. # 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. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted '`code`' and a -"[quoted link](http://example.com/?foo=1&bar=2)". +Here is some quoted ‘`code`’ and a +“[quoted link](http://example.com/?foo=1&bar=2)”. -Some dashes: one--two -- three--four -- five. +Some dashes: one—two — three—four — five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. * * * * * @@ -533,20 +533,20 @@ Ellipses...and...and.... - $\alpha \wedge \omega$ - $223$ - $p$-Tree -- Here's some display math: +- Here’s some display math: $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ -- Here's one that has a line break in it: +- Here’s one that has a line break in it: $\alpha + \omega \times x^2$. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write `$e = mc^2$`. -- $22,000 is a *lot* of money. So is $34,000. (It worked if "lot" +- $22,000 is a *lot* of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped `$`: $73 *this should be emphasized* 23$. -Here's a LaTeX table: +Here’s a LaTeX table: \begin{tabular}{|l|l|}\hline Animal & Number \\ \hline @@ -662,15 +662,15 @@ Foo [biz](/url/ "Title with "quote" inside"). ## With ampersands -Here's a +Here’s a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2). -Here's a link with an amersand in the link text: +Here’s a link with an amersand in the link text: [AT&T](http://att.com/ "AT&T"). -Here's an [inline link](/script?foo=1&bar=2). +Here’s an [inline link](/script?foo=1&bar=2). -Here's an [inline link in pointy braces](/script?foo=1&bar=2). +Here’s an [inline link in pointy braces](/script?foo=1&bar=2). ## Autolinks @@ -693,7 +693,7 @@ Auto-links should not occur here: `<http://example.com/>` # Images -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902):  @@ -721,7 +721,7 @@ indented. reference. It need not be placed at the end of the document. [^2]: - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). diff --git a/tests/writer.opendocument b/tests/writer.opendocument index b10c5bef1..039118659 100644 --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -689,30 +689,17 @@ <style:style style:name="T59" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T60" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T61" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T62" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T62" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style> <style:style style:name="T63" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T64" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-position="sub 58%" /></style:style> - <style:style style:name="T66" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style> - <style:style style:name="T67" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style> + <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T66" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T67" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T68" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T69" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T70" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T71" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T72" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T73" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T74" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T75" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style> - <style:style style:name="T76" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T77" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T78" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T79" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T80" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T81" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T82" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T83" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T84" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T85" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Quotations"> <style:paragraph-properties fo:margin-left="0.5in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" /> </style:style> @@ -1317,13 +1304,13 @@ <text:p text:style-name="P51"><text:span text:style-name="Teletype">\cite[22-23]{smith.1899}</text:span></text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">2+2=4</text:p> + <text:p text:style-name="P51">2 + 2 = 4</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51"><text:span text:style-name="T58">x</text:span> ∈ <text:span text:style-name="T59">y</text:span></text:p> + <text:p text:style-name="P51"><text:span text:style-name="T58">x</text:span> ∈ <text:span text:style-name="T59">y</text:span></text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">α ∧ ω</text:p> + <text:p text:style-name="P51">α ∧ ω</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P51">223</text:p> @@ -1332,10 +1319,10 @@ <text:p text:style-name="P51"><text:span text:style-name="T60">p</text:span>-Tree</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s some display math: \frac{<text:span text:style-name="T61">d</text:span>}{<text:span text:style-name="T62">dx</text:span>}<text:span text:style-name="T63">f</text:span>(<text:span text:style-name="T64">x</text:span>)=\lim<text:span text:style-name="T65">h</text:span><text:span text:style-name="T66"> → </text:span><text:span text:style-name="T67">0</text:span>\frac{<text:span text:style-name="T68">f</text:span>(<text:span text:style-name="T69">x</text:span>+<text:span text:style-name="T70">h</text:span>)-<text:span text:style-name="T71">f</text:span>(<text:span text:style-name="T72">x</text:span>)}{<text:span text:style-name="T73">h</text:span>}</text:p> + <text:p text:style-name="P51">Here’s some display math: $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s one that has a line break in it: α+ω × <text:span text:style-name="T74">x</text:span><text:span text:style-name="T75">2</text:span>.</text:p> + <text:p text:style-name="P51">Here’s one that has a line break in it: α + ω × <text:span text:style-name="T61">x</text:span><text:span text:style-name="T62">2</text:span>.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">These shouldn’t be math:</text:p> @@ -1344,13 +1331,13 @@ <text:p text:style-name="P52">To get the famous equation, write <text:span text:style-name="Teletype">$e = mc^2$</text:span>.</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">$22,000 is a <text:span text:style-name="T76">lot</text:span> of money. So is $34,000. (It worked if “lot” is emphasized.)</text:p> + <text:p text:style-name="P52">$22,000 is a <text:span text:style-name="T63">lot</text:span> of money. So is $34,000. (It worked if “lot” is emphasized.)</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P52">Shoes ($20) and socks ($5).</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">Escaped <text:span text:style-name="Teletype">$</text:span>: $73 <text:span text:style-name="T77">this</text:span><text:span text:style-name="T78"> </text:span><text:span text:style-name="T79">should</text:span><text:span text:style-name="T80"> </text:span><text:span text:style-name="T81">be</text:span><text:span text:style-name="T82"> </text:span><text:span text:style-name="T83">emphasized</text:span> 23$.</text:p> + <text:p text:style-name="P52">Escaped <text:span text:style-name="Teletype">$</text:span>: $73 <text:span text:style-name="T64">this</text:span><text:span text:style-name="T65"> </text:span><text:span text:style-name="T66">should</text:span><text:span text:style-name="T67"> </text:span><text:span text:style-name="T68">be</text:span><text:span text:style-name="T69"> </text:span><text:span text:style-name="T70">emphasized</text:span> 23$.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">Here’s a LaTeX table:</text:p> @@ -1454,7 +1441,7 @@ Cat <text:s text:c="3" />& 1 <text:s text:c="5" />\\ \hline <text:p text:style-name="Text_20_body">Here is a movie <draw:frame><draw:image xlink:href="movie.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" /></draw:frame> icon.</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Footnotes</text:h> -<text:p text:style-name="Text_20_body">Here is a footnote reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.</text:p></text:note-body></text:note> and another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s the long note. This one contains multiple blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are indented to show that they belong to the footnote (as with list items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</text:p></text:note-body></text:note> This should <text:span text:style-name="T84">not</text:span> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This is <text:span text:style-name="T85">easier</text:span> to type. Inline notes may contain <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> and <text:span text:style-name="Teletype">]</text:span> verbatim characters, as well as [bracketed text].</text:p></text:note-body></text:note></text:p> +<text:p text:style-name="Text_20_body">Here is a footnote reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.</text:p></text:note-body></text:note> and another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s the long note. This one contains multiple blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are indented to show that they belong to the footnote (as with list items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</text:p></text:note-body></text:note> This should <text:span text:style-name="T71">not</text:span> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This is <text:span text:style-name="T72">easier</text:span> to type. Inline notes may contain <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> and <text:span text:style-name="Teletype">]</text:span> verbatim characters, as well as [bracketed text].</text:p></text:note-body></text:note></text:p> <text:p text:style-name="P59">Notes can go in quotes.<text:note text:id="ftn3" text:note-class="footnote"><text:note-citation>4</text:note-citation><text:note-body><text:p text:style-name="Footnote">In quote.</text:p></text:note-body></text:note></text:p> <text:list text:style-name="L30"> <text:list-item> diff --git a/tests/writer.plain b/tests/writer.plain index 27ed0add9..bd7d3a3dc 100644 --- a/tests/writer.plain +++ b/tests/writer.plain @@ -3,7 +3,7 @@ John MacFarlane; Anonymous July 17, 2006 This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. * * * * * @@ -41,13 +41,13 @@ with no blank line Paragraphs ========== -Here's a regular paragraph. +Here’s a regular paragraph. 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. -Here's one with a bullet. * criminey. +Here’s one with a bullet. * criminey. There should be a hard line break here. @@ -196,7 +196,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -213,7 +213,7 @@ Nested -Here's another: +Here’s another: 1. First 2. Second: @@ -388,7 +388,7 @@ Interpreted markdown in a table: This is emphasized And this is strong -Here's a simple block: +Here’s a simple block: foo This should be a code block, though: @@ -418,7 +418,7 @@ Code: <hr /> -Hr's: +Hr’s: * * * * * @@ -457,21 +457,21 @@ unescaped spaces: a^b c^d, a~b c~d. 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. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted 'code' and a "quoted link". +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. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. * * * * * @@ -485,20 +485,20 @@ LaTeX - \alpha \wedge \omega - 223 - p-Tree -- Here's some display math: +- Here’s some display math: \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} -- Here's one that has a line break in it: +- Here’s one that has a line break in it: \alpha + \omega \times x^2. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write $e = mc^2$. -- $22,000 is a lot of money. So is $34,000. (It worked if "lot" +- $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped $: $73 this should be emphasized 23$. -Here's a LaTeX table: +Here’s a LaTeX table: @@ -615,13 +615,13 @@ Foo biz. With ampersands --------------- -Here's a link with an ampersand in the URL. +Here’s a link with an ampersand in the URL. -Here's a link with an amersand in the link text: AT&T. +Here’s a link with an amersand in the link text: AT&T. -Here's an inline link. +Here’s an inline link. -Here's an inline link in pointy braces. +Here’s an inline link in pointy braces. Autolinks --------- @@ -646,7 +646,7 @@ Auto-links should not occur here: <http://example.com/> Images ====== -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902): @@ -675,7 +675,7 @@ indented. reference. It need not be placed at the end of the document. [^2]: - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). diff --git a/tests/writer.rst b/tests/writer.rst index e68343b01..35df8002a 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -10,7 +10,7 @@ Pandoc Test Suite :format: html latex This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. -------------- @@ -50,13 +50,13 @@ with no blank line Paragraphs ========== -Here's a regular paragraph. +Here’s a regular paragraph. 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. -Here's one with a bullet. \* criminey. +Here’s one with a bullet. \* criminey. There should be a hard line break here. @@ -224,7 +224,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -244,7 +244,7 @@ Nested -Here's another: +Here’s another: 1. First @@ -489,7 +489,7 @@ And this is **strong** <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> -Here's a simple block: +Here’s a simple block: .. raw:: html @@ -575,7 +575,7 @@ Code: <hr /> -Hr's: +Hr’s: .. raw:: html @@ -635,22 +635,22 @@ unescaped spaces: a^b c^d, a~b c~d. 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. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted '``code``' and a -"`quoted link <http://example.com/?foo=1&bar=2>`_". +Here is some quoted ‘``code``’ and a +“`quoted link <http://example.com/?foo=1&bar=2>`_”. -Some dashes: one--two -- three--four -- five. +Some dashes: one—two — three—four — five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. -------------- @@ -664,21 +664,21 @@ LaTeX - :math:`$\alpha \wedge \omega$` - :math:`$223$` - :math:`$p$`-Tree -- Here's some display math: +- Here’s some display math: :math:`$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$` -- Here's one that has a line break in it: +- Here’s one that has a line break in it: :math:`$\alpha + \omega \times x^2$`. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write ``$e = mc^2$``. -- $22,000 is a *lot* of money. So is $34,000. (It worked if "lot" +- $22,000 is a *lot* of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped ``$``: $73 *this should be emphasized* 23$. -Here's a LaTeX table: +Here’s a LaTeX table: @@ -796,15 +796,15 @@ Foo `biz </url/>`_. With ampersands --------------- -Here's a +Here’s a `link with an ampersand in the URL <http://example.com/?foo=1&bar=2>`_. -Here's a link with an amersand in the link text: +Here’s a link with an amersand in the link text: `AT&T <http://att.com/>`_. -Here's an `inline link </script?foo=1&bar=2>`_. +Here’s an `inline link </script?foo=1&bar=2>`_. -Here's an `inline link in pointy braces </script?foo=1&bar=2>`_. +Here’s an `inline link in pointy braces </script?foo=1&bar=2>`_. Autolinks --------- @@ -832,7 +832,7 @@ Auto-links should not occur here: ``<http://example.com/>`` Images ====== -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902): .. figure:: lalune.jpg :align: center @@ -865,7 +865,7 @@ indented. reference. It need not be placed at the end of the document. .. [2] - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). diff --git a/tests/writer.rtf b/tests/writer.rtf index ae3776261..9bb6547cb 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -264,13 +264,13 @@ quoted link {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par} {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 LaTeX\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 2+2=4\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x}\u8201?\u8712?\u8201?{\i y}\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8201?\u8743?\u8201?\u969?\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 2\u8197?+\u8197?2\u8196?=\u8196?4\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x}\u8196?\u8712?\u8196?{\i y}\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8197?\u8743?\u8197?\u969?\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 223\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i p}-Tree\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's some display math: \\frac\{{\i d}\}\{{\i dx}\}{\i f}({\i x})=\\lim{\sub {\i h}\u8201?\u8594?\u8201?0}\\frac\{{\i f}({\i x}+{\i h})-{\i f}({\i x})\}\{{\i h}\}\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?+\u969?\u8201?\u215?\u8201?{\i x}{\super 2}.\sa180\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's some display math: $\\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}$\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?\u8197?+\u8197?\u969?\u8197?\u215?\u8197?{\i x}{\super 2}.\sa180\par} {\pard \ql \f0 \sa180 \li0 \fi0 These shouldn\u8217't be math:\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab To get the famous equation, write {\f1 $e = mc^2$}.\par} {\pard \ql \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} |