From 1ee6e0e0878bcd655f31deb0caf6a4766e500cc6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 14 Aug 2019 22:11:05 -0700 Subject: Use new doctemplates, doclayout. + Remove Text.Pandoc.Pretty; use doclayout instead. [API change] + Text.Pandoc.Writers.Shared: remove metaToJSON, metaToJSON' [API change]. + Text.Pandoc.Writers.Shared: modify `addVariablesToContext`, `defField`, `setField`, `getField`, `resetField` to work with Context rather than JSON values. [API change] + Text.Pandoc.Writers.Shared: export new function `endsWithPlain` [API change]. + Use new templates and doclayout in writers. + Use Doc-based templates in all writers. + Adjust three tests for minor template rendering differences. + Added indentation to body in docbook4, docbook5 templates. The main impact of this change is better reflowing of content interpolated into templates. Previously, interpolated variables were rendered independently and intepolated as strings, which could lead to overly long lines. Now the templates interpolated as Doc values which may include breaking spaces, and reflowing occurs after template interpolation rather than before. --- test/command/3531.md | 1 - test/command/3824.md | 1 - test/command/4794.md | 1 - test/command/5107.md | 2 - test/tables.custom | 1 - test/tables.dokuwiki | 1 - test/tables.fb2 | 1 - test/tables.jira | 1 - test/tables.mediawiki | 1 - test/tables.rtf | 1 - test/tables.textile | 1 - test/tables.txt | 1 - test/tables.xwiki | 1 - test/tables.zimwiki | 1 - test/writer.custom | 1 - test/writer.docbook4 | 2526 +++++++++++++++++++++++++------------------------ test/writer.docbook5 | 2453 +++++++++++++++++++++++------------------------ test/writer.rst | 1 - test/writer.textile | 1 + 19 files changed, 2493 insertions(+), 2504 deletions(-) (limited to 'test') diff --git a/test/command/3531.md b/test/command/3531.md index 2a4901a97..778e93d3a 100644 --- a/test/command/3531.md +++ b/test/command/3531.md @@ -17,5 +17,4 @@ without being broken into pieces. A paragraph can span multiple lines without being broken into pieces. - ``` diff --git a/test/command/3824.md b/test/command/3824.md index e479e9e2f..590f8718c 100644 --- a/test/command/3824.md +++ b/test/command/3824.md @@ -10,5 +10,4 @@ * ok - ``` diff --git a/test/command/4794.md b/test/command/4794.md index 8356d2157..7330a60d0 100644 --- a/test/command/4794.md +++ b/test/command/4794.md @@ -14,5 +14,4 @@ | text |} - ``` diff --git a/test/command/5107.md b/test/command/5107.md index 89f3e7a05..cdbc82654 100644 --- a/test/command/5107.md +++ b/test/command/5107.md @@ -8,7 +8,6 @@ - bar * baz - ``` ``` % pandoc -f muse -t dokuwiki @@ -20,6 +19,5 @@ - bar - baz - ``` diff --git a/test/tables.custom b/test/tables.custom index 61560ef9d..ce0268edf 100644 --- a/test/tables.custom +++ b/test/tables.custom @@ -198,4 +198,3 @@ multiple lines. the blank line between rows. - diff --git a/test/tables.dokuwiki b/test/tables.dokuwiki index 23c0d22cb..35d5f88a1 100644 --- a/test/tables.dokuwiki +++ b/test/tables.dokuwiki @@ -44,4 +44,3 @@ Multiline table without column headers: | First |row | 12.0|Example of a row that spans multiple lines. | | Second |row | 5.0|Here’s another one. Note the blank line between rows.| - diff --git a/test/tables.fb2 b/test/tables.fb2 index 6be553df9..a36378ccc 100644 --- a/test/tables.fb2 +++ b/test/tables.fb2 @@ -13,4 +13,3 @@ multiple lines.Secondrow< the blank line between rows.

Table without column headers:

12121212
123123123123
1111

Multiline table without column headers:

Firstrow12.0Example of a row that spans multiple lines.
Secondrow5.0Here’s another one. Note the blank line between rows.

- diff --git a/test/tables.jira b/test/tables.jira index d04b559cc..52ea3d4f8 100644 --- a/test/tables.jira +++ b/test/tables.jira @@ -41,4 +41,3 @@ Multiline table without column headers: |First|row|12.0|Example of a row that spans multiple lines.| |Second|row|5.0|Here's another one. Note the blank line between rows.| - diff --git a/test/tables.mediawiki b/test/tables.mediawiki index 5402b286b..ccf75f975 100644 --- a/test/tables.mediawiki +++ b/test/tables.mediawiki @@ -143,4 +143,3 @@ Multiline table without column headers: |align="right"| 5.0 | Here’s another one. Note the blank line between rows. |} - diff --git a/test/tables.rtf b/test/tables.rtf index 97ea46bad..09236cb37 100644 --- a/test/tables.rtf +++ b/test/tables.rtf @@ -357,4 +357,3 @@ } \intbl\row} {\pard \ql \f0 \sa180 \li0 \fi0 \par} - diff --git a/test/tables.textile b/test/tables.textile index 9c71ec383..cd784e0b7 100644 --- a/test/tables.textile +++ b/test/tables.textile @@ -164,4 +164,3 @@ Multiline table without column headers: - diff --git a/test/tables.txt b/test/tables.txt index d70492262..e0d6806d4 100644 --- a/test/tables.txt +++ b/test/tables.txt @@ -72,4 +72,3 @@ Multiline table without column headers: Second row 5.0 Here's another one. Note the blank line between rows. ---------- --------- ----------- --------------------------- - diff --git a/test/tables.xwiki b/test/tables.xwiki index e0dc10928..04995c576 100644 --- a/test/tables.xwiki +++ b/test/tables.xwiki @@ -43,4 +43,3 @@ Multiline table without column headers: |= |= |= |= |First |row |12.0 |Example of a row that spans multiple lines. |Second |row |5.0 |Here’s another one. Note the blank line between rows. - diff --git a/test/tables.zimwiki b/test/tables.zimwiki index 2757055f6..3486a02fe 100644 --- a/test/tables.zimwiki +++ b/test/tables.zimwiki @@ -53,4 +53,3 @@ Multiline table without column headers: |:--------:|:----|-----:|-----------------------------------------------------| | First |row | 12.0|Example of a row that spans multiple lines. | | Second |row | 5.0|Here’s another one. Note the blank line between rows.| - diff --git a/test/writer.custom b/test/writer.custom index 595d8f70e..db44b7b0c 100644 --- a/test/writer.custom +++ b/test/writer.custom @@ -780,4 +780,3 @@ as well as [bracketed text]. ↩

  • In quote. ↩

  • In list. ↩

    • - diff --git a/test/writer.docbook4 b/test/writer.docbook4 index 38b3cc1ee..c8a04aca0 100644 --- a/test/writer.docbook4 +++ b/test/writer.docbook4 @@ -16,122 +16,122 @@ July 17, 2006 - - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. - - - Headers - - Level 2 with an <ulink url="/url">embedded link</ulink> - - Level 3 with <emphasis>emphasis</emphasis> - - Level 4 - - Level 5 - - - - - - - - - Level 1 - - Level 2 with <emphasis>emphasis</emphasis> - - Level 3 + + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + + + Headers + + Level 2 with an <ulink url="/url">embedded link</ulink> + + Level 3 with <emphasis>emphasis</emphasis> + + Level 4 + + Level 5 + + + + + + + + + Level 1 + + Level 2 with <emphasis>emphasis</emphasis> + + Level 3 + + with no blank line + + + + + Level 2 with no blank line - - - - Level 2 - - with no blank line - - - - - Paragraphs - - 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. - -There should be a hard line break -here. - - - Block Quotes - - E-mail style: - -
    + + + + Paragraphs - This is a block quote. It is pretty short. + Here’s a regular paragraph. -
    -
    - Code in a block quote: + 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. - -sub status { - print "working"; -} - - A list: + Here’s one with a bullet. * criminey. - - - - item one - - - - - item two - - - +There should be a hard line break +here. + + + Block Quotes - Nested block quotes: + E-mail style:
    - nested + This is a block quote. It is pretty short.
    - nested + Code in a block quote: + +sub status { + print "working"; +} + + + A list: + + + + + item one + + + + + item two + + + + + Nested block quotes: + +
    + + nested + +
    +
    + + nested + +
    -
    - - This should not be a block quote: 2 > 1. - - - And a following paragraph. - -     - - Code Blocks - - Code: - - + + This should not be a block quote: 2 > 1. + + + And a following paragraph. + + + + Code Blocks + + Code: + + ---- (should be four hyphens) sub status { @@ -140,1277 +140,1279 @@ sub status { this code block is indented by one tab - - And: - - + + And: + + this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ - - - Lists - - Unordered - - Asterisks tight: - - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - + + + Lists + + Unordered + + Asterisks tight: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Asterisks loose: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Pluses tight: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Pluses loose: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Minuses tight: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + Minuses loose: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + + Ordered + + Tight: + + + + + First + + + + + Second + + + + + Third + + + + + and: + + + + + One + + + + + Two + + + + + Three + + + + + Loose using tabs: + + + + + First + + + + + Second + + + + + Third + + + + + and using spaces: + + + + + One + + + + + Two + + + + + Three + + + + + Multiple paragraphs: + + + + + Item 1, graf one. + + + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + + + + + Item 2. + + + + + Item 3. + + + + + + Nested + + + + Tab + + + + + Tab + + + + + Tab + + + + + + + + + Here’s another: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + Same thing but with paragraphs: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + + Tabs and spaces + + + + this is a list item indented with tabs + + + + + this is a list item indented with spaces + + + + + this is an example list item indented with tabs + + + + + this is an example list item indented with spaces + + + + + + + + Fancy list markers + + + + begins with 2 + + + + + and now 3 + + + with a continuation + + + + + sublist with roman numerals, starting with 4 + + + + + more items + + + + + a subsublist + + + + + a subsublist + + + + + + + + + Nesting: + + + + + Upper Alpha + + + + + Upper Roman. + + + + + Decimal start with 6 + + + + + Lower alpha with paren + + + + + + + + + + + Autonumbering: + + + + + Autonumber. + + + + + More. + + + + + Nested. + + + + + + + Should not be a list item: + + + M.A. 2007 + + + B. Williams + + + + + Definition Lists - Asterisks loose: + Tight using spaces: - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Pluses tight: + Tight using tabs: - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Pluses loose: + Loose: - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Minuses tight: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - Minuses loose: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - - Ordered - - Tight: - - - - - First - - - - - Second - - - - - Third - - - - - and: - - - - - One - - - - - Two - - - - - Three - - - - - Loose using tabs: - - - - - First - - - - - Second - - - - - Third - - - - - and using spaces: - - - - - One - - - - - Two - - - - - Three - - - - - Multiple paragraphs: - - - - - Item 1, graf one. - - - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - - - - - Item 2. - - - - - Item 3. - - - - - - Nested - - - - Tab - - - - - Tab - - - - - Tab - - - - - - - - - Here’s another: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - - - Same thing but with paragraphs: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - - - - Tabs and spaces - - - - this is a list item indented with tabs - - - - - this is a list item indented with spaces - - - - - this is an example list item indented with tabs - - - - - this is an example list item indented with spaces - - - - - - - - Fancy list markers - - - - begins with 2 - - - - - and now 3 - - - with a continuation - - - - - sublist with roman numerals, starting with 4 - - - - - more items - - - - - a subsublist - - - - - a subsublist - - - - - - - - - Nesting: - - - - - Upper Alpha - - - - - Upper Roman. - - - - - Decimal start with 6 - - - - - Lower alpha with paren - - - - - - - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Autonumbering: + Multiple blocks with italics: - - - - Autonumber. - - - - - More. - - - + + + + apple + + + + red fruit + + + contains seeds, crisp, pleasant to taste + + + + + + orange + + + + orange fruit + + +{ orange code block } + +
    - Nested. + orange block quote - - - - - - Should not be a list item: - +
    +     +     +     - M.A. 2007 + Multiple definitions, tight: + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + - B. Williams + Multiple definitions, loose: -     -     - - Definition Lists - - Tight using spaces: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Tight using tabs: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Loose: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Multiple blocks with italics: - - - - - apple - - - - red fruit - - - contains seeds, crisp, pleasant to taste - - - - - - orange - - - - orange fruit - - -{ orange code block } - -
    + + + + apple + + - orange block quote + red fruit -
    -     -     -     - - Multiple definitions, tight: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Multiple definitions, loose: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Blank line after term, indented marker, alternate markers: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - - - sublist - - - - - sublist - - - - - - -     - - HTML Blocks - - Simple block on one line: - - - foo - - - And nested without indentation: - - - foo - - - bar - - - Interpreted markdown in a table: - - - - - - -
    - This is emphasized - - And this is strong -
    - - - Here’s a simple block: - - - foo - - - This should be a code block, though: - - -<div> - foo -</div> - - - As should this: - - -<div>foo</div> - - - Now, nested: - - - foo - - - This should just be an HTML comment: - - - - Multiline: - - - - - Code block: - - -<!-- Comment --> - - - Just plain comment, with trailing spaces on the line: - - - - Code: - - -<hr /> - - - Hr’s: - -
    -
    -
    -
    -
    -
    -
    -
    -
    -     - - Inline Markup - - This is emphasized, and so is - this. - - - This is strong, and so - is this. - - - An emphasized link. - - - This is strong and - em. - - - So is this word. - - - This is strong and - em. - - - So is this word. - - - This is code: >, $, - \, \$, - <html>. - - - This is - strikeout. - - - Superscripts: abcd - ahello - ahello there. - - - Subscripts: H2O, H23O, - Hmany of themO. - - - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - - - - Smart quotes, ellipses, dashes - - Hello, said the spider. Shelob is my - name. - - - A, B, and C are letters. - - - Oak, elm, and beech are names - of trees. So is pine. - - - He said, I want to go. Were you alive in the - 70’s? - - - Here is some quoted code and a - quoted - link. - - - Some dashes: one—two — three—four — five. - - - Dashes between numbers: 5–7, 255–66, 1987–1999. - - - Ellipses…and…and…. - - - - LaTeX - - - - - - - - 2 + 2 = 4 - - - - - x ∈ y - - - - - α ∧ ω - - - - - 223 - - - - - p-Tree - - - - - 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: - α + ω × x2. - - - - - 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 is emphasized.) - - - - - Shoes ($20) and socks ($5). - - - - - Escaped $: $73 this should be - emphasized 23$. - - - - - Here’s a LaTeX table: - - - - Special Characters - - Here is some unicode: - - - - - I hat: Î - - - - - o umlaut: ö - - - - - section: § - - - - - set membership: ∈ - - - - - copyright: © - - - - - AT&T has an ampersand in their name. - - - AT&T is another way to write it. - - - This & that. - - - 4 < 5. - - - 6 > 5. - - - Backslash: \ - - - Backtick: ` - - - Asterisk: * - - - Underscore: _ - - - Left brace: { - - - Right brace: } - - - Left bracket: [ - - - Right bracket: ] - - - Left paren: ( - - - Right paren: ) - - - Greater-than: > - - - Hash: # - - - Period: . - - - Bang: ! - - - Plus: + - - - Minus: - - - - - Links - - Explicit + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + + + Blank line after term, indented marker, alternate markers: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + + + sublist + + + + + sublist + + + + + + + + + HTML Blocks - Just a URL. + Simple block on one line: - URL and title. + foo - URL and title. + And nested without indentation: - URL and title. + foo - URL and title + bar - URL and title + Interpreted markdown in a table: + + + + + +
    + This is emphasized + + And this is strong +
    + - with_underscore + Here’s a simple block: - Email link (nobody@nowhere.net) + foo - Empty. + This should be a code block, though: + + +<div> + foo +</div> + + + As should this: - - - Reference + +<div>foo</div> + - Foo bar. + Now, nested: - With embedded [brackets]. + foo - b by itself should be a link. + This should just be an HTML comment: + - Indented once. + Multiline: + + - Indented twice. + Code block: + +<!-- Comment --> + - Indented thrice. + Just plain comment, with trailing spaces on the line: + - This should [not][] be a link. + Code: -[not]: /url +<hr /> - Foo bar. + Hr’s: + +
    +
    +
    +
    +
    +
    +
    +
    +
    +     + + Inline Markup + + This is emphasized, and so is + this. + + + This is strong, and so + is this. + + + An emphasized link. + + + This is strong and + em. + + + So is this word. + + + This is strong and + em. + + + So is this word. + + + This is code: >, $, + \, \$, + <html>. + + + This is + strikeout. + + + Superscripts: abcd + ahello + ahello there. + + + Subscripts: H2O, H23O, + Hmany of themO. + + + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d. + + + + Smart quotes, ellipses, dashes + + Hello, said the spider. Shelob is + my name. + + + A, B, and C are letters. - Foo biz. + Oak, elm, and beech are + names of trees. So is pine. - - - With ampersands - Here’s a link with an - ampersand in the URL. + He said, I want to go. Were you alive in + the 70’s? - Here’s a link with an amersand in the link text: - AT&T. + Here is some quoted code and a + quoted + link. - Here’s an inline link. + Some dashes: one—two — three—four — five. - Here’s an inline link in pointy - braces. + Dashes between numbers: 5–7, 255–66, 1987–1999. - - - Autolinks - With an ampersand: - http://example.com/?foo=1&bar=2 + Ellipses…and…and…. + + + LaTeX - In a list? - http://example.com/ + 2 + 2 = 4 + + + + + x ∈ y + + + + + α ∧ ω - It should. + 223 + + + + + p-Tree + + + + + 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: + α + ω × x2. - An e-mail address: nobody@nowhere.net + These shouldn’t be math: -
    - - Blockquoted: - http://example.com/ - -
    + + + + To get the famous equation, write $e = mc^2$. + + + + + $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$. + + + - Auto-links should not occur here: - <http://example.com/> + Here’s a LaTeX table: - -or here: <http://example.com/> - - -     - - Images - - From Voyage dans la Lune by Georges Melies (1902): - -
    - lalune - - - - - lalune - -
    - - Here is a movie - - - - icon. - -     - - Footnotes - - Here is a footnote reference, + + + Special Characters + + Here is some unicode: + + + + + I hat: Î + + + + + o umlaut: ö + + + + + section: § + + + + + set membership: ∈ + + + + + copyright: © + + + + + AT&T has an ampersand in their name. + + + AT&T is another way to write it. + + + This & that. + + + 4 < 5. + + + 6 > 5. + + + Backslash: \ + + + Backtick: ` + + + Asterisk: * + + + Underscore: _ + + + Left brace: { + + + Right brace: } + + + Left bracket: [ + + + Right bracket: ] + + + Left paren: ( + + + Right paren: ) + + + Greater-than: > + + + Hash: # + + + Period: . + + + Bang: ! + + + Plus: + + + + Minus: - + + + + Links + + Explicit + + Just a URL. + + + URL and title. + + + URL and title. + + + URL and title. + + + URL and title + + + URL and title + + + with_underscore + + + Email link (nobody@nowhere.net) + + + Empty. + + + + Reference + + Foo bar. + - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. + With embedded [brackets]. - and another. - Here’s the long note. This one contains multiple blocks. + b by itself should be a link. - Subsequent blocks are indented to show that they belong to the - footnote (as with list items). + Indented once. + + + Indented twice. + + + Indented thrice. + + + This should [not][] be a link. - { <code> } +[not]: /url - If you want, you can indent every line, but you can also be lazy and - just indent the first line of each block. + Foo bar. - This should not be a footnote reference, - because it contains a space.[^my note] Here is an inline note. - This is easier to type. Inline notes may contain - links and ] - verbatim characters, as well as [bracketed text]. + Foo biz. - - -
    + + + With ampersands + + 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 an inline link. + + + Here’s an inline link in pointy + braces. + + + + Autolinks + + With an ampersand: + http://example.com/?foo=1&bar=2 + + + + + In a list? + + + + + http://example.com/ + + + + + It should. + + + + + An e-mail address: nobody@nowhere.net + +
    + + Blockquoted: + http://example.com/ + +
    + + Auto-links should not occur here: + <http://example.com/> + + +or here: <http://example.com/> + +     + + + Images + + From Voyage dans la Lune by Georges Melies (1902): + +
    + lalune + + + + + lalune + +
    + + Here is a movie + + + + icon. + +     + + Footnotes - Notes can go in quotes. + Here is a footnote reference, + + Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. + + and another. + + 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). + + + { <code> } + - In quote. + 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 not be a footnote + reference, because it contains a space.[^my note] Here is an inline + note. + + This is easier to type. Inline notes may + contain links and + ] verbatim characters, as well as [bracketed + text]. -
    - - +
    - And in list items. + Notes can go in quotes. - In list. + In quote. - - - - This paragraph should not be part of the note, as it is not indented. - - +
    + + + + And in list items. + + In list. + + + + + + + This paragraph should not be part of the note, as it is not indented. + +     diff --git a/test/writer.docbook5 b/test/writer.docbook5 index 9a9eff0c5..afc37e5a7 100644 --- a/test/writer.docbook5 +++ b/test/writer.docbook5 @@ -17,123 +17,123 @@ July 17, 2006 - - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. - -
    - Headers -
    - Level 2 with an <link xlink:href="/url">embedded - link</link> -
    - Level 3 with <emphasis>emphasis</emphasis> -
    - Level 4 -
    - Level 5 - - + + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + +
    + Headers +
    + Level 2 with an <link xlink:href="/url">embedded + link</link> +
    + Level 3 with <emphasis>emphasis</emphasis> +
    + Level 4 +
    + Level 5 + + +
    -
    -
    - Level 1 -
    - Level 2 with <emphasis>emphasis</emphasis> -
    - Level 3 +
    + Level 1 +
    + Level 2 with <emphasis>emphasis</emphasis> +
    + Level 3 + + with no blank line + +
    +
    +
    + Level 2 with no blank line
    -
    - Level 2 - - with no blank line - -
    -
    -
    - Paragraphs - - 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. - -There should be a hard line break -here. -
    -
    - Block Quotes - - E-mail style: - -
    +
    + Paragraphs - This is a block quote. It is pretty short. + Here’s a regular paragraph. -
    -
    - Code in a block quote: + 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. - -sub status { - print "working"; -} - - A list: + Here’s one with a bullet. * criminey. - - - - item one - - - - - item two - - - +There should be a hard line break +here. +
    +
    + Block Quotes - Nested block quotes: + E-mail style:
    - nested + This is a block quote. It is pretty short.
    - nested + Code in a block quote: + + +sub status { + print "working"; +} + + + A list: + + + + + item one + + + + + item two + + + + + Nested block quotes: +
    + + nested + +
    +
    + + nested + +
    - - - This should not be a block quote: 2 > 1. - - - And a following paragraph. - -
    -
    - Code Blocks - - Code: - - + + This should not be a block quote: 2 > 1. + + + And a following paragraph. + +
    +
    + Code Blocks + + Code: + + ---- (should be four hyphens) sub status { @@ -142,1250 +142,1253 @@ sub status { this code block is indented by one tab - - And: - - + + And: + + this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ -
    -
    - Lists -
    - Unordered +
    +
    + Lists +
    + Unordered + + Asterisks tight: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Asterisks loose: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Pluses tight: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Pluses loose: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Minuses tight: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + Minuses loose: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + +
    +
    + Ordered + + Tight: + + + + + First + + + + + Second + + + + + Third + + + + + and: + + + + + One + + + + + Two + + + + + Three + + + + + Loose using tabs: + + + + + First + + + + + Second + + + + + Third + + + + + and using spaces: + + + + + One + + + + + Two + + + + + Three + + + + + Multiple paragraphs: + + + + + Item 1, graf one. + + + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + + + + + Item 2. + + + + + Item 3. + + + +
    +
    + Nested + + + + Tab + + + + + Tab + + + + + Tab + + + + + + + + + Here’s another: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + Same thing but with paragraphs: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + +
    +
    + Tabs and spaces + + + + this is a list item indented with tabs + + + + + this is a list item indented with spaces + + + + + this is an example list item indented with tabs + + + + + this is an example list item indented with spaces + + + + + +
    +
    + Fancy list markers + + + + begins with 2 + + + + + and now 3 + + + with a continuation + + + + + sublist with roman numerals, starting with 4 + + + + + more items + + + + + a subsublist + + + + + a subsublist + + + + + + + + + Nesting: + + + + + Upper Alpha + + + + + Upper Roman. + + + + + Decimal start with 6 + + + + + Lower alpha with paren + + + + + + + + + + + Autonumbering: + + + + + Autonumber. + + + + + More. + + + + + Nested. + + + + + + + Should not be a list item: + + + M.A. 2007 + + + B. Williams + +
    +
    +
    + Definition Lists - Asterisks tight: + Tight using spaces: - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Asterisks loose: + Tight using tabs: - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Pluses tight: + Loose: - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Pluses loose: - - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Minuses tight: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - Minuses loose: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - -
    -
    - Ordered - - Tight: - - - - - First - - - - - Second - - - - - Third - - - - - and: - - - - - One - - - - - Two - - - - - Three - - - - - Loose using tabs: - - - - - First - - - - - Second - - - - - Third - - - - - and using spaces: - - - - - One - - - - - Two - - - - - Three - - - - - Multiple paragraphs: - - - - - Item 1, graf one. - - - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - - - - - Item 2. - - - - - Item 3. - - - -
    -
    - Nested - - - - Tab - - - - - Tab - - - - - Tab - - - - - - - + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + - Here’s another: + Multiple blocks with italics: - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - + + + + apple + + + + red fruit + + + contains seeds, crisp, pleasant to taste + + + + + + orange + + + + orange fruit + + +{ orange code block } + +
    - Foe + orange block quote - - - - - - Third - - - +
    +     +     +     - Same thing but with paragraphs: + Multiple definitions, tight: - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - -
    -
    - Tabs and spaces - - - - this is a list item indented with tabs - - - - - this is a list item indented with spaces - - - - - this is an example list item indented with tabs - - - - - this is an example list item indented with spaces - - - - - -
    -
    - Fancy list markers - - - - begins with 2 - - - - - and now 3 - - - with a continuation - - - - - sublist with roman numerals, starting with 4 - - - - - more items - - - - - a subsublist - - - - - a subsublist - - - - - - - + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + - Nesting: + Multiple definitions, loose: - - - - Upper Alpha - - - - - Upper Roman. - - - - - Decimal start with 6 - - - - - Lower alpha with paren - - - - - - - - - + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + - Autonumbering: + Blank line after term, indented marker, alternate markers: - - - - Autonumber. - - - - - More. - - - - - Nested. - - - - - - - Should not be a list item: - - - M.A. 2007 - - - B. Williams - -
    -
    -
    - Definition Lists - - Tight using spaces: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Tight using tabs: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Loose: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Multiple blocks with italics: - - - - - apple - - - - red fruit - - - contains seeds, crisp, pleasant to taste - - - - - - orange - - - - orange fruit - - -{ orange code block } - -
    + + + + apple + + - orange block quote + red fruit -
    -     -     -     - - Multiple definitions, tight: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Multiple definitions, loose: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Blank line after term, indented marker, alternate markers: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - - - sublist - - - - - sublist - - - - - - -
    -
    - HTML Blocks - - Simple block on one line: - - - foo - - - And nested without indentation: - - - foo - - - bar - - - Interpreted markdown in a table: - - This is emphasized - And this is strong - - Here’s a simple block: - - - foo - - - This should be a code block, though: - - -<div> - foo -</div> - - - As should this: - - -<div>foo</div> - - - Now, nested: - - - foo - - - This should just be an HTML comment: - - - Multiline: - - - Code block: - - -<!-- Comment --> - - - Just plain comment, with trailing spaces on the line: - - - Code: - - -<hr /> - - - Hr’s: - -
    -
    - Inline Markup - - This is emphasized, and so is - this. - - - This is strong, and so - is this. - - - An emphasized link. - - - This is strong and - em. - - - So is this word. - - - This is strong and - em. - - - So is this word. - - - This is code: >, $, - \, \$, - <html>. - - - This is - strikeout. - - - Superscripts: abcd - ahello - ahello there. - - - Subscripts: H2O, H23O, - Hmany of themO. - - - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - -
    -
    - Smart quotes, ellipses, dashes - - Hello, said the spider. Shelob is my - name. - - - A, B, and C are letters. - - - Oak, elm, and beech are names - of trees. So is pine. - - - He said, I want to go. Were you alive in the - 70’s? - - - Here is some quoted code and a - quoted - link. - - - Some dashes: one—two — three—four — five. - - - Dashes between numbers: 5–7, 255–66, 1987–1999. - - - Ellipses…and…and…. - -
    -
    - LaTeX - - - - - - - - 2 + 2 = 4 - - - - - x ∈ y - - - - - α ∧ ω - - - - - 223 - - - - - p-Tree - - - - - 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: - α + ω × x2. - - - - - 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 is emphasized.) - - - - - Shoes ($20) and socks ($5). - - - - - Escaped $: $73 this should be - emphasized 23$. - - - - - Here’s a LaTeX table: - -
    -
    - Special Characters - - Here is some unicode: - - - - - I hat: Î - - - - - o umlaut: ö - - - - - section: § - - - - - set membership: ∈ - - - - - copyright: © - - - - - AT&T has an ampersand in their name. - - - AT&T is another way to write it. - - - This & that. - - - 4 < 5. - - - 6 > 5. - - - Backslash: \ - - - Backtick: ` - - - Asterisk: * - - - Underscore: _ - - - Left brace: { - - - Right brace: } - - - Left bracket: [ - - - Right bracket: ] - - - Left paren: ( - - - Right paren: ) - - - Greater-than: > - - - Hash: # - - - Period: . - - - Bang: ! - - - Plus: + - - - Minus: - - -
    -
    - Links -
    - Explicit + + computer + + + + + + orange + + + + orange fruit + + + + + sublist + + + + + sublist + + + + + + +
    +
    + HTML Blocks - Just a URL. + Simple block on one line: - URL and title. + foo - URL and title. + And nested without indentation: - URL and title. + foo - URL and title + bar - URL and title + Interpreted markdown in a table: + This is emphasized + And this is strong - with_underscore + Here’s a simple block: - Email link (nobody@nowhere.net) + foo - Empty. + This should be a code block, though: -
    -
    - Reference + +<div> + foo +</div> + - Foo bar. + As should this: + + +<div>foo</div> + + + Now, nested: - With embedded [brackets]. + foo - b by itself should be a link. + This should just be an HTML comment: - Indented once. + Multiline: - Indented twice. + Code block: + +<!-- Comment --> + - Indented thrice. + Just plain comment, with trailing spaces on the line: - This should [not][] be a link. + Code: -[not]: /url +<hr /> - Foo bar. + Hr’s: + +
    +
    + Inline Markup + + This is emphasized, and so is + this. + + + This is strong, and so + is this. + + + An emphasized link. + + + This is strong and + em. + + + So is this word. + + + This is strong and + em. + + + So is this word. + + + This is code: >, $, + \, \$, + <html>. + + + This is + strikeout. + + + Superscripts: abcd + ahello + ahello there. + + + Subscripts: H2O, H23O, + Hmany of themO. - Foo biz. + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d.
    -
    - With ampersands +
    + Smart quotes, ellipses, dashes + + Hello, said the spider. Shelob is + my name. + + + A, B, and C are letters. + + + Oak, elm, and beech are + names of trees. So is pine. + + + He said, I want to go. Were you alive in + the 70’s? + + + Here is some quoted code and a + quoted + link. + + + Some dashes: one—two — three—four — five. + - Here’s a link - with an ampersand in the URL. + Dashes between numbers: 5–7, 255–66, 1987–1999. - Here’s a link with an amersand in the link text: - AT&T. + Ellipses…and…and…. +
    +
    + LaTeX + + + + + + + + 2 + 2 = 4 + + + + + x ∈ y + + + + + α ∧ ω + + + + + 223 + + + + + p-Tree + + + + + 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: + α + ω × x2. + + + - Here’s an inline link. + 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 is emphasized.) + + + + + Shoes ($20) and socks ($5). + + + + + Escaped $: $73 this should be + emphasized 23$. + + + - Here’s an inline link in - pointy braces. + Here’s a LaTeX table:
    -
    - Autolinks +
    + Special Characters - With an ampersand: - http://example.com/?foo=1&bar=2 + Here is some unicode: - In a list? + I hat: Î - http://example.com/ + o umlaut: ö + + + + + section: § + + + + + set membership: ∈ - It should. + copyright: © - An e-mail address: nobody@nowhere.net + AT&T has an ampersand in their name. -
    - - Blockquoted: - http://example.com/ - -
    - Auto-links should not occur here: - <http://example.com/> + AT&T is another way to write it. + + + This & that. + + + 4 < 5. + + + 6 > 5. + + + Backslash: \ + + + Backtick: ` + + + Asterisk: * + + + Underscore: _ + + + Left brace: { + + + Right brace: } + + + Left bracket: [ + + + Right bracket: ] + + + Left paren: ( + + + Right paren: ) + + + Greater-than: > + + + Hash: # + + + Period: . + + + Bang: ! + + + Plus: + + + + Minus: - - -or here: <http://example.com/> -
    -
    -
    - Images - - From Voyage dans la Lune by Georges Melies (1902): - -
    - lalune - - - - - lalune - -
    - - Here is a movie - - - - icon. - -
    -
    - Footnotes - - Here is a footnote reference, +
    + Links +
    + Explicit + + Just a URL. + + + URL and title. + + + URL and title. + + + URL and title. + + + URL and title + + + URL and title + + + with_underscore + + + Email link (nobody@nowhere.net) + + + Empty. + +
    +
    + Reference + + Foo bar. + + + With embedded [brackets]. + + + b by itself should be a link. + + + Indented once. + - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. + Indented twice. - and another. - Here’s the long note. This one contains multiple blocks. + Indented thrice. - Subsequent blocks are indented to show that they belong to the - footnote (as with list items). + This should [not][] be a link. - { <code> } +[not]: /url - If you want, you can indent every line, but you can also be lazy and - just indent the first line of each block. + Foo bar. - This should not be a footnote reference, - because it contains a space.[^my note] Here is an inline note. - This is easier to type. Inline notes may contain - links and - ] verbatim characters, as well as [bracketed text]. + Foo biz. - - -
    +
    +
    + With ampersands + + 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 an inline + link. + + + Here’s an inline link in + pointy braces. + +
    +
    + Autolinks + + With an ampersand: + http://example.com/?foo=1&bar=2 + + + + + In a list? + + + + + http://example.com/ + + + + + It should. + + + + + An e-mail address: nobody@nowhere.net + +
    + + Blockquoted: + http://example.com/ + +
    + + Auto-links should not occur here: + <http://example.com/> + + +or here: <http://example.com/> + +
    +
    +
    + Images + + From Voyage dans la Lune by Georges Melies (1902): + +
    + lalune + + + + + lalune + +
    + + Here is a movie + + + + icon. + +
    +
    + Footnotes - Notes can go in quotes. + Here is a footnote reference, + + Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. + + and another. + + 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). + + + { <code> } + + + 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 not be a footnote + reference, because it contains a space.[^my note] Here is an inline + note. - In quote. + This is easier to type. Inline notes may + contain links and + ] verbatim characters, as well as [bracketed + text]. - - - +
    - And in list items. + Notes can go in quotes. - In list. + In quote. - - - - This paragraph should not be part of the note, as it is not indented. - -
    + + + + + And in list items. + + In list. + + + + + + + This paragraph should not be part of the note, as it is not indented. + +
    diff --git a/test/writer.rst b/test/writer.rst index 683a41f30..8d68f7ed5 100644 --- a/test/writer.rst +++ b/test/writer.rst @@ -619,7 +619,6 @@ LaTeX - 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: :math:`\alpha + \omega \times x^2`. These shouldn’t be math: diff --git a/test/writer.textile b/test/writer.textile index b184506b6..40a47b8f0 100644 --- a/test/writer.textile +++ b/test/writer.textile @@ -717,3 +717,4 @@ fn4. In quote. fn5. In list. + -- cgit v1.2.3