diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Tests/Readers/Muse.hs | 14 | ||||
| -rw-r--r-- | test/command/3568.md | 7 | ||||
| -rw-r--r-- | test/command/ascii.md | 4 | ||||
| -rw-r--r-- | test/tables.man | 8 | ||||
| -rw-r--r-- | test/writer.man | 163 | ||||
| -rw-r--r-- | test/writer.ms | 14 |
6 files changed, 113 insertions, 97 deletions
diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs index bd63236bd..75dd4e7da 100644 --- a/test/Tests/Readers/Muse.hs +++ b/test/Tests/Readers/Muse.hs @@ -459,6 +459,20 @@ tests = , "}}}" ] =?> codeBlock "Example line\n" + , "Indented braces" =: + T.unlines [ " - {{{" + , " Example line" + , " }}}" + ] =?> + bulletList [ codeBlock "Example line" ] + , "Tabs" =: + T.unlines [ "{{{" + , "\t foo" + , "\t\t" + , "\t bar" + , "}}}" + ] =?> + codeBlock " foo\n\t\n bar" -- Amusewiki requires braces to be on separate line, -- this is an extension. , "One line" =: diff --git a/test/command/3568.md b/test/command/3568.md index e77c27b78..f88c2fe9a 100644 --- a/test/command/3568.md +++ b/test/command/3568.md @@ -7,9 +7,10 @@ normal **bold `code` more bold** normal. normal `code` normal. ^D .PP -normal \f[I]italic \f[BI]bold in the middle\f[I] only italic\f[] normal. +normal \f[I]italic \f[BI]bold in the middle\f[I] only italic\f[R] +normal. .PP -normal \f[B]bold \f[BC]code\f[B] more bold\f[] normal. +normal \f[B]bold \f[CB]code\f[B] more bold\f[R] normal. .PP -normal \f[C]code\f[] normal. +normal \f[C]code\f[R] normal. ``` diff --git a/test/command/ascii.md b/test/command/ascii.md index 523baa46c..4956ae14e 100644 --- a/test/command/ascii.md +++ b/test/command/ascii.md @@ -17,7 +17,7 @@ pandoc -t man --ascii äéıå ^D .PP -\[u00E4]\[u00E9]\[u0131]\[u00E5] +\[:a]\['e]\[.i]\[oa] ``` ``` @@ -25,7 +25,7 @@ pandoc -t ms --ascii äéıå ^D .LP -\[u00E4]\[u00E9]\[u0131]\[u00E5] +\[:a]\['e]\[.i]\[oa] ``` ``` diff --git a/test/tables.man b/test/tables.man index 8c9385b4f..7d4d4cd03 100644 --- a/test/tables.man +++ b/test/tables.man @@ -135,7 +135,7 @@ T} .PP Multiline table with caption: .PP -Here's the caption. It may span multiple lines. +Here\[cq]s the caption. It may span multiple lines. .TS tab(@); cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). @@ -165,7 +165,7 @@ row T}@T{ 5.0 T}@T{ -Here's another one. +Here\[cq]s another one. Note the blank line between rows. T} .TE @@ -201,7 +201,7 @@ row T}@T{ 5.0 T}@T{ -Here's another one. +Here\[cq]s another one. Note the blank line between rows. T} .TE @@ -261,7 +261,7 @@ row T}@T{ 5.0 T}@T{ -Here's another one. +Here\[cq]s another one. Note the blank line between rows. T} .TE diff --git a/test/writer.man b/test/writer.man index f6d0deb92..4fb00e87d 100644 --- a/test/writer.man +++ b/test/writer.man @@ -2,16 +2,16 @@ .hy .PP This is a set of tests for pandoc. -Most of them are adapted from John Gruber's markdown test suite. +Most of them are adapted from John Gruber\[cq]s markdown test suite. .PP * * * * * .SH Headers .SS Level 2 with an embedded link (/url) -.SS Level 3 with \f[I]emphasis\f[] +.SS Level 3 with \f[I]emphasis\f[R] .SS Level 4 .SS Level 5 .SH Level 1 -.SS Level 2 with \f[I]emphasis\f[] +.SS Level 2 with \f[I]emphasis\f[R] .SS Level 3 .PP with no blank line @@ -22,15 +22,15 @@ with no blank line * * * * * .SH Paragraphs .PP -Here's a regular paragraph. +Here\[cq]s a regular paragraph. .PP 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 +Because a hard-wrapped line in the middle of a paragraph looked like a list item. .PP -Here's one with a bullet. +Here\[cq]s one with a bullet. * criminey. .PP There should be a hard line break @@ -42,7 +42,7 @@ here. * * * * * .SH Block Quotes .PP -E\-mail style: +E-mail style: .RS .PP This is a block quote. @@ -55,9 +55,9 @@ Code in a block quote: .nf \f[C] sub\ status\ { -\ \ \ \ print\ "working"; +\ \ \ \ print\ \[dq]working\[dq]; } -\f[] +\f[R] .fi .PP A list: @@ -88,14 +88,14 @@ Code: .IP .nf \f[C] -\-\-\-\-\ (should\ be\ four\ hyphens) +----\ (should\ be\ four\ hyphens) sub\ status\ { -\ \ \ \ print\ "working"; +\ \ \ \ print\ \[dq]working\[dq]; } this\ code\ block\ is\ indented\ by\ one\ tab -\f[] +\f[R] .fi .PP And: @@ -104,8 +104,8 @@ And: \f[C] \ \ \ \ this\ code\ block\ is\ indented\ by\ two\ tabs -These\ should\ not\ be\ escaped:\ \ \\$\ \\\\\ \\>\ \\[\ \\{ -\f[] +These\ should\ not\ be\ escaped:\ \ \[rs]$\ \[rs]\[rs]\ \[rs]>\ \[rs][\ \[rs]{ +\f[R] .fi .PP * * * * * @@ -200,7 +200,7 @@ Item 1, graf one. .PP Item 1. graf two. -The quick brown fox jumped over the lazy dog's back. +The quick brown fox jumped over the lazy dog\[cq]s back. .RE .IP "2." 3 Item 2. @@ -218,7 +218,7 @@ Tab .RE .RE .PP -Here's another: +Here\[cq]s another: .IP "1." 3 First .IP "2." 3 @@ -308,7 +308,7 @@ Nested. .PP Should not be a list item: .PP -M.A.\ 2007 +M.A.\~2007 .PP B. Williams @@ -369,21 +369,21 @@ yellow fruit .PP Multiple blocks with italics: .TP -.B \f[I]apple\f[] +.B \f[I]apple\f[R] red fruit .RS .PP contains seeds, crisp, pleasant to taste .RE .TP -.B \f[I]orange\f[] +.B \f[I]orange\f[R] orange fruit .RS .IP .nf \f[C] {\ orange\ code\ block\ } -\f[] +\f[R] .fi .RS .PP @@ -456,10 +456,10 @@ foo bar .PP Interpreted markdown in a table: -This is \f[I]emphasized\f[] -And this is \f[B]strong\f[] +This is \f[I]emphasized\f[R] +And this is \f[B]strong\f[R] .PP -Here's a simple block: +Here\[cq]s a simple block: .PP foo .PP @@ -470,7 +470,7 @@ This should be a code block, though: <div> \ \ \ \ foo </div> -\f[] +\f[R] .fi .PP As should this: @@ -478,7 +478,7 @@ As should this: .nf \f[C] <div>foo</div> -\f[] +\f[R] .fi .PP Now, nested: @@ -492,8 +492,8 @@ Code block: .IP .nf \f[C] -<!\-\-\ Comment\ \-\-> -\f[] +<!--\ Comment\ --> +\f[R] .fi .PP Just plain comment, with trailing spaces on the line: @@ -503,39 +503,39 @@ Code: .nf \f[C] <hr\ /> -\f[] +\f[R] .fi .PP -Hr's: +Hr\[cq]s: .PP * * * * * .SH Inline Markup .PP -This is \f[I]emphasized\f[], and so \f[I]is this\f[]. +This is \f[I]emphasized\f[R], and so \f[I]is this\f[R]. .PP -This is \f[B]strong\f[], and so \f[B]is this\f[]. +This is \f[B]strong\f[R], and so \f[B]is this\f[R]. .PP -An \f[I]emphasized link (/url)\f[]. +An \f[I]emphasized link (/url)\f[R]. .PP -\f[B]\f[BI]This is strong and em.\f[B]\f[] +\f[B]\f[BI]This is strong and em.\f[B]\f[R] .PP -So is \f[B]\f[BI]this\f[B]\f[] word. +So is \f[B]\f[BI]this\f[B]\f[R] word. .PP -\f[B]\f[BI]This is strong and em.\f[B]\f[] +\f[B]\f[BI]This is strong and em.\f[B]\f[R] .PP -So is \f[B]\f[BI]this\f[B]\f[] word. +So is \f[B]\f[BI]this\f[B]\f[R] word. .PP -This is code: \f[C]>\f[], \f[C]$\f[], \f[C]\\\f[], \f[C]\\$\f[], -\f[C]<html>\f[]. +This is code: \f[C]>\f[R], \f[C]$\f[R], \f[C]\[rs]\f[R], \f[C]\[rs]$\f[R], +\f[C]<html>\f[R]. .PP -[STRIKEOUT:This is \f[I]strikeout\f[].] +[STRIKEOUT:This is \f[I]strikeout\f[R].] .PP -Superscripts: a^bc^d a^\f[I]hello\f[]^ a^hello\ there^. +Superscripts: a^bc^d a^\f[I]hello\f[R]^ a^hello\~there^. .PP -Subscripts: H~2~O, H~23~O, H~many\ of\ them~O. +Subscripts: H~2~O, H~23~O, H~many\~of\~them~O. .PP These should not be superscripts or subscripts, because of the unescaped -spaces: a^b c^d, a~b c~d. +spaces: a\[ha]b c\[ha]d, a\[ti]b c\[ti]d. .PP * * * * * .SH Smart quotes, ellipses, dashes @@ -548,9 +548,9 @@ spaces: a^b c^d, a~b c~d. `Oak,' `elm,' and `beech' are names of trees. So is `pine.' .PP -`He said, \[lq]I want to go.\[rq]' Were you alive in the 70's? +`He said, \[lq]I want to go.\[rq]' Were you alive in the 70\[cq]s? .PP -Here is some quoted `\f[C]code\f[]' and a \[lq]quoted +Here is some quoted `\f[C]code\f[R]' and a \[lq]quoted link (http://example.com/?foo=1&bar=2)\[rq]. .PP Some dashes: one\[em]two \[em] three\[em]four \[em] five. @@ -563,52 +563,52 @@ Ellipses\&...and\&...and\&.... .SH LaTeX .IP \[bu] 2 .IP \[bu] 2 -2 + 2 = 4 +2\[u2005]+\[u2005]2\[u2004]=\[u2004]4 .IP \[bu] 2 -\f[I]x\f[] ∈ \f[I]y\f[] +\f[I]x\f[R]\[u2004]\[mo]\[u2004]\f[I]y\f[R] .IP \[bu] 2 -\f[I]α\f[] ∧ \f[I]ω\f[] +\f[I]\[*a]\f[R]\[u2005]\[AN]\[u2005]\f[I]\[*w]\f[R] .IP \[bu] 2 223 .IP \[bu] 2 -\f[I]p\f[]\-Tree +\f[I]p\f[R]-Tree .IP \[bu] 2 -Here's some display math: +Here\[cq]s some display math: .RS -$$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)\-f(x)}{h}$$ +$$\[rs]frac{d}{dx}f(x)=\[rs]lim_{h\[rs]to 0}\[rs]frac{f(x+h)-f(x)}{h}$$ .RE .IP \[bu] 2 -Here's one that has a line break in it: -\f[I]α\f[] + \f[I]ω\f[] × \f[I]x\f[]^2^. +Here\[cq]s one that has a line break in it: +\f[I]\[*a]\f[R]\[u2005]+\[u2005]\f[I]\[*w]\f[R]\[u2005]\[tmu]\[u2005]\f[I]x\f[R]^2^. .PP -These shouldn't be math: +These shouldn\[cq]t be math: .IP \[bu] 2 -To get the famous equation, write \f[C]$e\ =\ mc^2$\f[]. +To get the famous equation, write \f[C]$e\ =\ mc\[ha]2$\f[R]. .IP \[bu] 2 -$22,000 is a \f[I]lot\f[] of money. +$22,000 is a \f[I]lot\f[R] of money. So is $34,000. (It worked if \[lq]lot\[rq] is emphasized.) .IP \[bu] 2 Shoes ($20) and socks ($5). .IP \[bu] 2 -Escaped \f[C]$\f[]: $73 \f[I]this should be emphasized\f[] 23$. +Escaped \f[C]$\f[R]: $73 \f[I]this should be emphasized\f[R] 23$. .PP -Here's a LaTeX table: +Here\[cq]s a LaTeX table: .PP * * * * * .SH Special Characters .PP Here is some unicode: .IP \[bu] 2 -I hat: Î +I hat: \[^I] .IP \[bu] 2 -o umlaut: ö +o umlaut: \[:o] .IP \[bu] 2 -section: § +section: \[sc] .IP \[bu] 2 -set membership: ∈ +set membership: \[mo] .IP \[bu] 2 -copyright: © +copyright: \[co] .PP AT&T has an ampersand in their name. .PP @@ -620,9 +620,9 @@ This & that. .PP 6 > 5. .PP -Backslash: \\ +Backslash: \[rs] .PP -Backtick: ` +Backtick: \[ga] .PP Asterisk: * .PP @@ -640,7 +640,7 @@ Left paren: ( .PP Right paren: ) .PP -Greater\-than: > +Greater-than: > .PP Hash: # .PP @@ -650,7 +650,7 @@ Bang: ! .PP Plus: + .PP -Minus: \- +Minus: - .PP * * * * * .SH Links @@ -692,7 +692,7 @@ This should [not][] be a link. .nf \f[C] [not]:\ /url -\f[] +\f[R] .fi .PP Foo bar (/url/). @@ -700,13 +700,14 @@ Foo bar (/url/). Foo biz (/url/). .SS With ampersands .PP -Here's a link with an ampersand in the URL (http://example.com/?foo=1&bar=2). +Here\[cq]s a link with an ampersand in the +URL (http://example.com/?foo=1&bar=2). .PP -Here's a link with an amersand in the link text: AT&T (http://att.com/). +Here\[cq]s a link with an amersand in the link text: AT&T (http://att.com/). .PP -Here's an inline link (/script?foo=1&bar=2). +Here\[cq]s an inline link (/script?foo=1&bar=2). .PP -Here's an inline link in pointy braces (/script?foo=1&bar=2). +Here\[cq]s an inline link in pointy braces (/script?foo=1&bar=2). .SS Autolinks .PP With an ampersand: <http://example.com/?foo=1&bar=2> @@ -717,18 +718,18 @@ In a list? .IP \[bu] 2 It should. .PP -An e\-mail address: <nobody@nowhere.net> +An e-mail address: <nobody@nowhere.net> .RS .PP Blockquoted: <http://example.com/> .RE .PP -Auto\-links should not occur here: \f[C]<http://example.com/>\f[] +Auto-links should not occur here: \f[C]<http://example.com/>\f[R] .IP .nf \f[C] or\ here:\ <http://example.com/> -\f[] +\f[R] .fi .PP * * * * * @@ -743,9 +744,9 @@ Here is a movie [IMAGE: movie (movie.jpg)] icon. * * * * * .SH Footnotes .PP -Here is a footnote reference,[1] and another.[2] This should \f[I]not\f[] be a -footnote reference, because it contains a space.[^my note] Here is an inline -note.[3] +Here is a footnote reference,[1] and another.[2] This should \f[I]not\f[R] be +a footnote reference, because it contains a space.[\[ha]my note] Here is an +inline note.[3] .RS .PP Notes can go in quotes.[4] @@ -762,7 +763,7 @@ It can go anywhere after the footnote reference. It need not be placed at the end of the document. .SS [2] .PP -Here's the long note. +Here\[cq]s the long note. This one contains multiple blocks. .PP Subsequent blocks are indented to show that they belong to the footnote (as @@ -771,15 +772,15 @@ with list items). .nf \f[C] \ \ {\ <code>\ } -\f[] +\f[R] .fi .PP If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. .SS [3] .PP -This is \f[I]easier\f[] to type. -Inline notes may contain links (http://google.com) and \f[C]]\f[] verbatim +This is \f[I]easier\f[R] to type. +Inline notes may contain links (http://google.com) and \f[C]]\f[R] verbatim characters, as well as [bracketed text]. .SS [4] .PP diff --git a/test/writer.ms b/test/writer.ms index e7ac44bb9..910c76cd4 100644 --- a/test/writer.ms +++ b/test/writer.ms @@ -210,7 +210,7 @@ And: \f[C] \ \ \ \ this\ code\ block\ is\ indented\ by\ two\ tabs -These\ should\ not\ be\ escaped:\ \ \\$\ \\\\\ \\>\ \\[\ \\{ +These\ should\ not\ be\ escaped:\ \ \[rs]$\ \[rs]\[rs]\ \[rs]>\ \[rs][\ \[rs]{ \f[] .fi .HLINE @@ -641,7 +641,7 @@ So is \f[B]\f[BI]this\f[B]\f[R] word. .PP So is \f[B]\f[BI]this\f[B]\f[R] word. .PP -This is code: \f[C]>\f[R], \f[C]$\f[R], \f[C]\\\f[R], \f[C]\\$\f[R], +This is code: \f[C]>\f[R], \f[C]$\f[R], \f[C]\[rs]\f[R], \f[C]\[rs]$\f[R], \f[C]<html>\f[R]. .PP \m[strikecolor]This is \f[I]strikeout\f[R].\m[] @@ -673,9 +673,9 @@ Here is some quoted `\f[C]code\f[R]' and a \[lq]\c -- "quoted link" \&\[rq]. .PP -Some dashes: one\[em]two \[em] three\[em]four \[em] five. +Some dashes: one—two — three—four — five. .PP -Dashes between numbers: 5\[en]7, 255\[en]66, 1987\[en]1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. .PP Ellipses\&...and\&...and\&.... .HLINE @@ -743,9 +743,9 @@ This & that. .PP 6 > 5. .PP -Backslash: \\ +Backslash: \[rs] .PP -Backtick: \` +Backtick: \[ga] .PP Asterisk: * .PP @@ -925,7 +925,7 @@ It should. .LP An e-mail address: \c .pdfhref W -D "mailto:nobody%40nowhere.net" -A "\c" \ - -- "nobody\@nowhere.net" + -- "nobody\[at]nowhere.net" \& .RS .LP |