diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-12-12 20:09:14 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-12-17 13:39:17 -0800 |
| commit | 543aa28c3895d4dc7d3d659b652237efb41661b0 (patch) | |
| tree | f3186cc78a5235d0ead022ca0a5abed2c7a5ace0 /tests | |
| parent | 2a075e9d7a31303efa823f1779c2b32f9fb8a14f (diff) | |
| download | pandoc-543aa28c3895d4dc7d3d659b652237efb41661b0.tar.gz | |
Added new prettyprinting module.
* Added Text.Pandoc.Pretty.
This is better suited for pandoc than the 'pretty' package.
One advantage is that we now get proper wrapping; Emph [Inline]
is no longer treated as a big unwrappable unit. Previously
we only got breaks for spaces at the "outer level." We can also
more easily avoid doubled blank lines. Performance is
significantly better as well.
* Removed Text.Pandoc.Blocks.
Text.Pandoc.Pretty allows you to define blocks and concatenate
them.
* Modified markdown, RST, org readers to use Text.Pandoc.Pretty
instead of Text.PrettyPrint.HughesPJ.
* Text.Pandoc.Shared: Added writerColumns to WriterOptions.
* Markdown, RST, Org writers now break text at writerColumns.
* Added --columns command-line option, which sets stColumns
and writerColumns.
* Table parsing: If the size of the header > stColumns,
use the header size as 100% for purposes of calculating
relative widths of columns.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/biblatex-citations.latex | 10 | ||||
| -rw-r--r-- | tests/markdown-citations.chicago-author-date.txt | 10 | ||||
| -rw-r--r-- | tests/markdown-citations.ieee.txt | 10 | ||||
| -rw-r--r-- | tests/markdown-citations.mhra.txt | 39 | ||||
| -rw-r--r-- | tests/markdown-citations.txt | 14 | ||||
| -rw-r--r-- | tests/natbib-citations.latex | 20 | ||||
| -rw-r--r-- | tests/tables.markdown | 17 | ||||
| -rw-r--r-- | tests/tables.plain | 17 | ||||
| -rw-r--r-- | tests/writer.markdown | 117 | ||||
| -rw-r--r-- | tests/writer.org | 282 | ||||
| -rw-r--r-- | tests/writer.plain | 118 | ||||
| -rw-r--r-- | tests/writer.rst | 207 |
12 files changed, 278 insertions, 583 deletions
diff --git a/tests/biblatex-citations.latex b/tests/biblatex-citations.latex index 7ac680fa4..c975d5bcb 100644 --- a/tests/biblatex-citations.latex +++ b/tests/biblatex-citations.latex @@ -34,8 +34,7 @@ \textcites{item1}[p.~30]{item2}[see also][]{item3} says blah. \item - In a note.% - \footnote{A citation without locators \autocite{item3}.} + In a note.\footnote{A citation without locators \autocite{item3}.} \item A citation group @@ -45,8 +44,7 @@ Another one \autocite[see][p.~34--35]{item1}. \item - And another one in a note.% - \footnote{Some citations \autocites[see][chap. 3]{item2}{item3}{item1}.} + And another one in a note.\footnote{Some citations \autocites[see][chap. 3]{item2}{item3}{item1}.} \item Citation with a suffix and locator @@ -56,9 +54,7 @@ Citation with suffix only \autocite[and nowhere else]{item1}. \item - Now some modifiers.% - \footnote{Like a citation without author: \autocite*{item1}, and now Doe with -a locator \autocite*[p.~44]{item2}.} + Now some modifiers.\footnote{Like a citation without author: \autocite*{item1}, and now Doe with a locator \autocite*[p.~44]{item2}.} \item With some markup \autocite[\emph{see}][p. \textbf{32}]{item1}. diff --git a/tests/markdown-citations.chicago-author-date.txt b/tests/markdown-citations.chicago-author-date.txt index dd89b786f..93cf6ce7c 100644 --- a/tests/markdown-citations.chicago-author-date.txt +++ b/tests/markdown-citations.chicago-author-date.txt @@ -28,7 +28,6 @@ - With some markup (*see* Doe 2005, 32). - # References Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. @@ -37,11 +36,8 @@ Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. Doe, John, and Jenny Roe. 2007. Why Water Is Wet. In *Third Book*, ed. Sam Smith. Oxford: Oxford University Press. -[^1]: - A citation without locators (Doe and Roe 2007). +[^1]: A citation without locators (Doe and Roe 2007). -[^2]: - Some citations (see Doe 2006, chap. 3; Doe and Roe 2007; Doe 2005). +[^2]: Some citations (see Doe 2006, chap. 3; Doe and Roe 2007; Doe 2005). -[^3]: - Like a citation without author: (2005), and now Doe with a locator (2006, 44). +[^3]: Like a citation without author: (2005), and now Doe with a locator (2006, 44).
\ No newline at end of file diff --git a/tests/markdown-citations.ieee.txt b/tests/markdown-citations.ieee.txt index 53f0995a4..0fd9335ad 100644 --- a/tests/markdown-citations.ieee.txt +++ b/tests/markdown-citations.ieee.txt @@ -28,7 +28,6 @@ - With some markup [1]. - # References [1] J. Doe, *First Book*, Cambridge: Cambridge University Press, 2005. @@ -37,11 +36,8 @@ [3] J. Doe and J. Roe, “Why Water Is Wet,” *Third Book*, Smith, S., Ed., Oxford: Oxford University Press, 2007. -[^1]: - A citation without locators [3]. +[^1]: A citation without locators [3]. -[^2]: - Some citations [1]-[3]. +[^2]: Some citations [1]-[3]. -[^3]: - Like a citation without author: [1], and now Doe with a locator [2]. +[^3]: Like a citation without author: [1], and now Doe with a locator [2]. diff --git a/tests/markdown-citations.mhra.txt b/tests/markdown-citations.mhra.txt index a05db2a54..3add1cfdd 100644 --- a/tests/markdown-citations.mhra.txt +++ b/tests/markdown-citations.mhra.txt @@ -28,7 +28,6 @@ - With some markup.[^12] - # References Doe, John, ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34. @@ -37,38 +36,28 @@ Doe, John, ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34. Doe, John, and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed by Sam Smith (Oxford: Oxford University Press, 2007). -[^1]: - *First Book* (Cambridge: Cambridge University Press, 2005). +[^1]: *First Book* (Cambridge: Cambridge University Press, 2005). + +[^2]: First Book, p. 30. -[^2]: - First Book, p. 30. +[^3]: First Book, p. 30, with suffix. -[^3]: - First Book, p. 30, with suffix. +[^4]: First Book; ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34 (p. 30); see also John Doe and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed by Sam Smith (Oxford: Oxford University Press, 2007). -[^4]: - First Book; ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34 (p. 30); see also John Doe and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed by Sam Smith (Oxford: Oxford University Press, 2007). +[^5]: A citation without locators Doe and Roe. -[^5]: - A citation without locators Doe and Roe. +[^6]: See Doe, First Book, pp. 34-35; also Doe and Roe, chap. 3. -[^6]: - See Doe, First Book, pp. 34-35; also Doe and Roe, chap. 3. +[^7]: See Doe, First Book, pp. 34-35. -[^7]: - See Doe, First Book, pp. 34-35. +[^8]: Some citations see Doe, Article, 33-34 (chap. 3); Doe and Roe; Doe, First Book. -[^8]: - Some citations see Doe, Article, 33-34 (chap. 3); Doe and Roe; Doe, First Book. +[^9]: Doe, First Book, pp. 33, 35-37, and nowhere else. -[^9]: - Doe, First Book, pp. 33, 35-37, and nowhere else. +[^10]: Doe, First Book, and nowhere else. -[^10]: - Doe, First Book, and nowhere else. +[^11]: Like a citation without author: First Book, and now Doe with a locator Article, 33-34 (p. 44). -[^11]: - Like a citation without author: First Book, and now Doe with a locator Article, 33-34 (p. 44). +[^11]: Like a citation without author: First Book, and now Doe with a locator Article, 33-34 (p. 44). -[^12]: - *See* Doe, First Book, p. 32. +[^12]: *See* Doe, First Book, p. 32. diff --git a/tests/markdown-citations.txt b/tests/markdown-citations.txt index 0944b1101..0e75e0b90 100644 --- a/tests/markdown-citations.txt +++ b/tests/markdown-citations.txt @@ -20,8 +20,7 @@ - And another one in a note.[^2] -- Citation with a suffix and locator - [@item1 pp. 33, 35-37, and nowhere else]. +- Citation with a suffix and locator [@item1 pp. 33, 35-37, and nowhere else]. - Citation with suffix only [@item1 and nowhere else]. @@ -32,12 +31,9 @@ # References -[^1]: - A citation without locators [@item3]. +[^1]: A citation without locators [@item3]. -[^2]: - Some citations [see @item2 chap. 3; @item3; @item1]. +[^2]: Some citations [see @item2 chap. 3; @item3; @item1]. + +[^3]: Like a citation without author: [-@item1], and now Doe with a locator [-@item2 p. 44]. -[^3]: - Like a citation without author: [-@item1], and now Doe with a - locator [-@item2 p. 44]. diff --git a/tests/natbib-citations.latex b/tests/natbib-citations.latex index 373ccc2e6..2e21f38b1 100644 --- a/tests/natbib-citations.latex +++ b/tests/natbib-citations.latex @@ -31,36 +31,28 @@ \citet[p.~30, with suffix]{item1} says blah. \item - \citeauthor{item1} \citetext{\citeyear{item1}; \citeyear[p.~30]{item2}; \citealp[see also][]{item3}} - says blah. + \citeauthor{item1} \citetext{\citeyear{item1}; \citeyear[p.~30]{item2}; \citealp[see also][]{item3}} says blah. \item - In a note.% - \footnote{A citation without locators \citep{item3}.} + In a note.\footnote{A citation without locators \citep{item3}.} \item - A citation group - \citetext{\citealp[see][p.~34--35]{item1}; \citealp[also][chap. 3]{item3}}. + A citation group \citetext{\citealp[see][p.~34--35]{item1}; \citealp[also][chap. 3]{item3}}. \item Another one \citep[see][p.~34--35]{item1}. \item - And another one in a note.% - \footnote{Some citations -\citetext{\citealp[see][chap. 3]{item2}; \citealp{item3}; \citealp{item1}}.} + And another one in a note.\footnote{Some citations \citetext{\citealp[see][chap. 3]{item2}; \citealp{item3}; \citealp{item1}}.} \item - Citation with a suffix and locator - \citep[pp.~33, 35--37, and nowhere else]{item1}. + Citation with a suffix and locator \citep[pp.~33, 35--37, and nowhere else]{item1}. \item Citation with suffix only \citep[and nowhere else]{item1}. \item - Now some modifiers.% - \footnote{Like a citation without author: \citeyearpar{item1}, and now Doe -with a locator \citeyearpar[p.~44]{item2}.} + Now some modifiers.\footnote{Like a citation without author: \citeyearpar{item1}, and now Doe with a locator \citeyearpar[p.~44]{item2}.} \item With some markup \citep[\emph{see}][p. \textbf{32}]{item1}. diff --git a/tests/tables.markdown b/tests/tables.markdown index 95bcc667e..d1bbf168f 100644 --- a/tests/tables.markdown +++ b/tests/tables.markdown @@ -5,7 +5,7 @@ Simple table with caption: 12 12 12 12 123 123 123 123 1 1 1 1 - + : Demonstration of simple table syntax. Simple table without caption: @@ -23,34 +23,34 @@ Simple table indented two spaces: 12 12 12 12 123 123 123 123 1 1 1 1 - + : Demonstration of simple table syntax. Multiline table with caption: -------------------------------------------------------------- Centered Left Right Default aligned - Header Aligned Aligned + Header Aligned Aligned ----------- ---------- ------------ -------------------------- 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. -------------------------------------------------------------- - + : Here's the caption. It may span multiple lines. Multiline table without caption: -------------------------------------------------------------- Centered Left Right Default aligned - Header Aligned Aligned + Header Aligned Aligned ----------- ---------- ------------ -------------------------- 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. @@ -69,8 +69,9 @@ 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/tests/tables.plain b/tests/tables.plain index 95bcc667e..d1bbf168f 100644 --- a/tests/tables.plain +++ b/tests/tables.plain @@ -5,7 +5,7 @@ Simple table with caption: 12 12 12 12 123 123 123 123 1 1 1 1 - + : Demonstration of simple table syntax. Simple table without caption: @@ -23,34 +23,34 @@ Simple table indented two spaces: 12 12 12 12 123 123 123 123 1 1 1 1 - + : Demonstration of simple table syntax. Multiline table with caption: -------------------------------------------------------------- Centered Left Right Default aligned - Header Aligned Aligned + Header Aligned Aligned ----------- ---------- ------------ -------------------------- 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. -------------------------------------------------------------- - + : Here's the caption. It may span multiple lines. Multiline table without caption: -------------------------------------------------------------- Centered Left Right Default aligned - Header Aligned Aligned + Header Aligned Aligned ----------- ---------- ------------ -------------------------- 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. @@ -69,8 +69,9 @@ 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/tests/writer.markdown b/tests/writer.markdown index b417a8fee..992bcd020 100644 --- a/tests/writer.markdown +++ b/tests/writer.markdown @@ -2,9 +2,8 @@ % 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. - +This is a set of tests for pandoc. Most of them are adapted from John Gruber’s +markdown test suite. * * * * * @@ -30,23 +29,21 @@ with no blank line 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. +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 @@ -56,27 +53,26 @@ E-mail style: > This is a block quote. It is pretty short. > Code in a block quote: -> +> > sub status { > print "working"; > } -> +> > A list: -> +> > 1. item one > 2. item two -> +> > Nested block quotes: -> +> > > nested -> +> > > nested This should not be a block quote: 2 \> 1. And a following paragraph. - * * * * * # Code Blocks @@ -84,19 +80,18 @@ And a following paragraph. Code: ---- (should be four hyphens) - + sub status { print "working"; } - + this code block is indented by one tab And: this code block is indented by two tabs - - These should not be escaped: \$ \\ \> \[ \{ + These should not be escaped: \$ \\ \> \[ \{ * * * * * @@ -118,7 +113,6 @@ Asterisks loose: - asterisk 3 - Pluses tight: - Plus 1 @@ -133,7 +127,6 @@ Pluses loose: - Plus 3 - Minuses tight: - Minus 1 @@ -148,7 +141,6 @@ Minuses loose: - Minus 3 - ## Ordered Tight: @@ -171,7 +163,6 @@ Loose using tabs: 3. Third - and using spaces: 1. One @@ -180,27 +171,22 @@ and using spaces: 3. Three - Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. 3. Item 3. - ## Nested - Tab - Tab - Tab - - Here’s another: 1. First @@ -223,7 +209,6 @@ Same thing but with paragraphs: 3. Third - ## Tabs and spaces - this is a list item indented with tabs @@ -234,8 +219,6 @@ Same thing but with paragraphs: - this is an example list item indented with spaces - - ## Fancy list markers (2) begins with 2 @@ -248,8 +231,6 @@ Same thing but with paragraphs: (A) a subsublist (B) a subsublist - - Nesting: A. Upper Alpha @@ -257,23 +238,18 @@ A. Upper Alpha (6) Decimal start with 6 c) Lower alpha with paren - - - Autonumbering: 1. Autonumber. 2. More. 1. Nested. - Should not be a list item: M.A. 2007 B. Williams - * * * * * # Definition Lists @@ -307,7 +283,6 @@ orange banana ~ yellow fruit - Multiple blocks with italics: *apple* @@ -322,7 +297,6 @@ Multiple blocks with italics: > orange block quote - Multiple definitions, tight: apple @@ -344,7 +318,6 @@ orange ~ bank - Blank line after term, indented marker, alternate markers: apple @@ -358,7 +331,6 @@ orange 1. sublist 2. sublist - # HTML Blocks Simple block on one line: @@ -470,7 +442,6 @@ Hr’s: <hr class="foo" id="bar"> - * * * * * # Inline Markup @@ -497,9 +468,8 @@ Superscripts: a^bc^d a^*hello*^ a^hello there^. Subscripts: H~2~O, H~23~O, H~many of them~O. -These should not be superscripts or subscripts, because of the -unescaped spaces: a\^b c\^d, a\~b c\~d. - +These should not be superscripts or subscripts, because of the unescaped +spaces: a\^b c\^d, a\~b c\~d. * * * * * @@ -513,8 +483,8 @@ unescaped spaces: a\^b c\^d, a\~b c\~d. ‘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. @@ -522,7 +492,6 @@ Dashes between numbers: 5–7, 255–66, 1987–1999. Ellipses…and…and…. - * * * * * # LaTeX @@ -535,14 +504,13 @@ Ellipses…and…and…. - $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: - $\alpha + \omega \times x^2$. +- Here’s one that has a line break in it: $\alpha + \omega \times x^2$. 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.) +- $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$. @@ -554,7 +522,6 @@ Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} - * * * * * # Special Characters @@ -609,7 +576,6 @@ Plus: + Minus: - - * * * * * # Links @@ -662,8 +628,7 @@ Foo [biz](/url/ "Title with "quote" inside"). ## With ampersands -Here’s a -[link with an ampersand in the URL](http://example.com/?foo=1&bar=2). +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: [AT&T](http://att.com/ "AT&T"). @@ -688,7 +653,6 @@ Auto-links should not occur here: `<http://example.com/>` or here: <http://example.com/> - * * * * * # Images @@ -699,44 +663,37 @@ From “Voyage dans la Lune” by Georges Melies (1902): Here is a movie  icon. - * * * * * # Footnotes -Here is a footnote reference,[^1] and another.[^2] This should -*not* 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 *not* be a +footnote reference, because it contains a space.[\^my note] Here is an inline +note.[^3] > Notes can go in quotes.[^4] 1. And in list items.[^5] -This paragraph should not be part of the note, as it is not -indented. +This paragraph should not be part of the note, as it is not indented. -[^1]: - Here is the footnote. It can go anywhere after the footnote - reference. It need not be placed at the end of the document. +[^1]: Here is the footnote. It can go anywhere after the footnote reference. + It need not be placed at the end of the document. -[^2]: - Here’s the long note. This one contains multiple blocks. +[^2]: 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). + 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. + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. -[^3]: - This is *easier* to type. Inline notes may contain +[^3]: This is *easier* to type. Inline notes may contain [links](http://google.com) and `]` verbatim characters, as well as [bracketed text]. -[^4]: - In quote. +[^4]: In quote. -[^5]: - In list. +[^5]: In list. diff --git a/tests/writer.org b/tests/writer.org index 59f27acfc..642b2a3ef 100644 --- a/tests/writer.org +++ b/tests/writer.org @@ -3,8 +3,8 @@ #+AUTHOR: John MacFarlane; Anonymous #+DATE: July 17, 2006 -This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +This is a set of tests for pandoc. Most of them are adapted from John Gruber's +markdown test suite. -------------- @@ -36,9 +36,9 @@ with no blank line 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. +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. @@ -51,17 +51,11 @@ here. E-mail style: - #+BEGIN_QUOTE - This is a block quote. It is pretty short. - - #+END_QUOTE - #+BEGIN_QUOTE - Code in a block quote: #+BEGIN_EXAMPLE @@ -69,31 +63,21 @@ E-mail style: print "working"; } #+END_EXAMPLE + A list: - 1. item one 2. item two Nested block quotes: - -#+BEGIN_QUOTE - + #+BEGIN_QUOTE nested + #+END_QUOTE - -#+END_QUOTE - - -#+BEGIN_QUOTE - + #+BEGIN_QUOTE nested - - -#+END_QUOTE - - + #+END_QUOTE #+END_QUOTE This should not be a block quote: 2 > 1. @@ -108,20 +92,22 @@ Code: #+BEGIN_EXAMPLE ---- (should be four hyphens) - + sub status { print "working"; } - + this code block is indented by one tab #+END_EXAMPLE + And: #+BEGIN_EXAMPLE this code block is indented by two tabs - + These should not be escaped: \$ \\ \> \[ \{ #+END_EXAMPLE + -------------- * Lists @@ -130,121 +116,99 @@ And: 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: - 1. First 2. Second 3. Third and: - 1. One 2. Two 3. Three Loose using tabs: - 1. First 2. Second 3. Third - and using spaces: - 1. One 2. Two 3. Three - Multiple paragraphs: - 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's - back. + Item 1. graf two. The quick brown fox jumped over the lazy dog's back. 2. Item 2. 3. Item 3. - ** Nested - - Tab - - - Tab - - - Tab + - Tab + - Tab Here's another: - 1. First 2. Second: - + - Fee - Fie - Foe @@ -253,72 +217,55 @@ Here's another: Same thing but with paragraphs: - 1. First 2. Second: - - Fee - Fie - Foe 3. 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 +2) begins with 2 +3) and now 3 -(2) begins with 2 -(3) and now 3 - - with a continuation - - - iv. sublist with roman numerals, starting with 4 - v. more items - - (A) a subsublist - (B) a subsublist + with a continuation + 4. sublist with roman numerals, starting with 4 + 5. more items + 1) a subsublist + 2) a subsublist Nesting: +1. Upper Alpha -A. Upper Alpha - - I. Upper Roman. - - (6) Decimal start with 6 - - c) Lower alpha with paren - + 1. Upper Roman. + 6) Decimal start with 6 + 3) Lower alpha with paren Autonumbering: - 1. Autonumber. 2. More. - - 1. Nested. + 1. Nested. Should not be a list item: @@ -350,155 +297,123 @@ Loose: - banana :: yellow fruit - Multiple blocks with italics: - /apple/ :: red fruit - contains seeds, crisp, pleasant to taste + contains seeds, crisp, pleasant to taste - /orange/ :: orange fruit - #+BEGIN_EXAMPLE - { orange code block } - #+END_EXAMPLE - -#+BEGIN_QUOTE - - orange block quote - - -#+END_QUOTE + #+BEGIN_EXAMPLE + { orange code block } + #+END_EXAMPLE + #+BEGIN_QUOTE + orange block quote + #+END_QUOTE Multiple definitions, tight: - apple :: red fruit - computer + computer - orange :: orange fruit - bank + bank Multiple definitions, loose: - apple :: red fruit - computer + computer - orange :: orange fruit - bank - + bank Blank line after term, indented marker, alternate markers: - apple :: red fruit - computer + computer - orange :: orange fruit - - 1. sublist - 2. sublist - + 1. sublist + 2. sublist * HTML Blocks Simple block on one line: - #+BEGIN_HTML - <div> - #+END_HTML foo #+BEGIN_HTML - </div> - #+END_HTML And nested without indentation: - #+BEGIN_HTML - <div> <div> <div> - #+END_HTML foo #+BEGIN_HTML - </div> </div> <div> - #+END_HTML bar #+BEGIN_HTML - </div> </div> - #+END_HTML Interpreted markdown in a table: - #+BEGIN_HTML - <table> <tr> <td> - #+END_HTML This is /emphasized/ #+BEGIN_HTML - </td> <td> - #+END_HTML And this is *strong* #+BEGIN_HTML - </td> </tr> </table> - - <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> + <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> #+END_HTML Here's a simple block: - #+BEGIN_HTML - <div> - #+END_HTML foo #+BEGIN_HTML - </div> - #+END_HTML This should be a code block, though: @@ -508,56 +423,47 @@ This should be a code block, though: foo </div> #+END_EXAMPLE + As should this: #+BEGIN_EXAMPLE <div>foo</div> #+END_EXAMPLE -Now, nested: +Now, nested: #+BEGIN_HTML - <div> <div> <div> - #+END_HTML foo #+BEGIN_HTML - </div> </div> </div> - #+END_HTML This should just be an HTML comment: - #+BEGIN_HTML - <!-- Comment --> - #+END_HTML Multiline: - #+BEGIN_HTML - <!-- Blah Blah --> - + <!-- This is another comment. --> - #+END_HTML Code block: @@ -565,13 +471,11 @@ Code block: #+BEGIN_EXAMPLE <!-- Comment --> #+END_EXAMPLE -Just plain comment, with trailing spaces on the line: +Just plain comment, with trailing spaces on the line: #+BEGIN_HTML - <!-- foo --> - #+END_HTML Code: @@ -579,29 +483,27 @@ Code: #+BEGIN_EXAMPLE <hr /> #+END_EXAMPLE -Hr's: +Hr's: #+BEGIN_HTML - <hr> - + <hr /> - + <hr /> - + <hr> - + <hr /> - + <hr /> - + <hr class="foo" id="bar" /> - + <hr class="foo" id="bar" /> - - <hr class="foo" id="bar"> + <hr class="foo" id="bar"> #+END_HTML -------------- @@ -630,8 +532,8 @@ Superscripts: a^{bc}d a^{/hello/} a^{hello there}. Subscripts: H_{2}O, H_{23}O, H_{many of them}O. -These should not be superscripts or subscripts, because of the -unescaped spaces: a\^b c\^d, a~b c~d. +These should not be superscripts or subscripts, because of the unescaped +spaces: a\^b c\^d, a~b c~d. -------------- @@ -645,8 +547,8 @@ unescaped spaces: a\^b c\^d, a~b c~d. 'He said, "I want to go."' Were you alive in the 70's? -Here is some quoted '=code=' and a -"[[http://example.com/?foo=1&bar=2][quoted link]]". +Here is some quoted '=code=' and a "[[http://example.com/?foo=1&bar=2][quoted +link]]". Some dashes: one---two --- three---four --- five. @@ -658,7 +560,6 @@ Ellipses...and...and.... * LaTeX - - \cite[22-23]{smith.1899} - $2+2=4$ - $x \in y$ @@ -667,15 +568,13 @@ Ellipses...and...and.... - $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: - $\alpha + \omega \times x^2$. +- Here's one that has a line break in it: $\alpha + \omega \times x^2$. 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.) +- $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$. @@ -693,7 +592,6 @@ Cat & 1 \\ \hline Here is some unicode: - - I hat: Î - o umlaut: ö - section: § @@ -789,17 +687,17 @@ This should [not][] be a link. #+BEGIN_EXAMPLE [not]: /url #+END_EXAMPLE + Foo [[/url/][bar]]. Foo [[/url/][biz]]. ** With ampersands -Here's a -[[http://example.com/?foo=1&bar=2][link with an ampersand in the URL]]. +Here's a [[http://example.com/?foo=1&bar=2][link with an ampersand in the +URL]]. -Here's a link with an amersand in the link text: -[[http://att.com/][AT&T]]. +Here's a link with an amersand in the link text: [[http://att.com/][AT&T]]. Here's an [[/script?foo=1&bar=2][inline link]]. @@ -809,20 +707,14 @@ Here's an [[/script?foo=1&bar=2][inline link in pointy braces]]. With an ampersand: [[http://example.com/?foo=1&bar=2]] - - In a list? - [[http://example.com/]] - It should. -An e-mail address: -[[mailto:nobody@nowhere.net][=nobody@nowhere.net=]] - +An e-mail address: [[mailto:nobody@nowhere.net][=nobody@nowhere.net=]] #+BEGIN_QUOTE - Blockquoted: [[http://example.com/]] - - #+END_QUOTE Auto-links should not occur here: =<http://example.com/>= @@ -830,6 +722,7 @@ Auto-links should not occur here: =<http://example.com/>= #+BEGIN_EXAMPLE or here: <http://example.com/> #+END_EXAMPLE + -------------- * Images @@ -845,41 +738,36 @@ Here is a movie [[movie.jpg]] icon. * Footnotes -Here is a footnote reference, [1] and another. [2] This should -/not/ 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 /not/ be a +footnote reference, because it contains a space.[\^my note] Here is an inline +note. [3] #+BEGIN_QUOTE - Notes can go in quotes. [4] - - #+END_QUOTE - 1. And in list items. [5] -This paragraph should not be part of the note, as it is not -indented. +This paragraph should not be part of the note, as it is not indented. -[1] Here is the footnote. It can go anywhere after the footnote - reference. It need not be placed at the end of the document. +[1] Here is the footnote. It can go anywhere after the footnote reference. It + need not be placed at the end of the document. [2] 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). + Subsequent blocks are indented to show that they belong to the footnote + (as with list items). #+BEGIN_EXAMPLE { <code> } #+END_EXAMPLE - If you want, you can indent every line, but you can also be lazy - and just indent the first line of each block. + + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. [3] This is /easier/ to type. Inline notes may contain - [[http://google.com][links]] and =]= verbatim characters, as well - as [bracketed text]. + [[http://google.com][links]] and =]= verbatim characters, as well as + [bracketed text]. [4] In quote. diff --git a/tests/writer.plain b/tests/writer.plain index bc6d25467..cc61916d2 100644 --- a/tests/writer.plain +++ b/tests/writer.plain @@ -2,9 +2,8 @@ Pandoc Test Suite 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. - +This is a set of tests for pandoc. Most of them are adapted from John Gruber’s +markdown test suite. * * * * * @@ -35,7 +34,6 @@ Level 2 with no blank line - * * * * * Paragraphs @@ -43,16 +41,15 @@ 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. +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 @@ -63,27 +60,26 @@ E-mail style: This is a block quote. It is pretty short. Code in a block quote: - + sub status { print "working"; } - + A list: - + 1. item one 2. item two - + Nested block quotes: - + nested - + nested This should not be a block quote: 2 > 1. And a following paragraph. - * * * * * Code Blocks @@ -92,19 +88,18 @@ Code Blocks Code: ---- (should be four hyphens) - + sub status { print "working"; } - + this code block is indented by one tab And: this code block is indented by two tabs - - These should not be escaped: \$ \\ \> \[ \{ + These should not be escaped: \$ \\ \> \[ \{ * * * * * @@ -128,7 +123,6 @@ Asterisks loose: - asterisk 3 - Pluses tight: - Plus 1 @@ -143,7 +137,6 @@ Pluses loose: - Plus 3 - Minuses tight: - Minus 1 @@ -158,7 +151,6 @@ Minuses loose: - Minus 3 - Ordered ------- @@ -182,7 +174,6 @@ Loose using tabs: 3. Third - and using spaces: 1. One @@ -191,19 +182,16 @@ and using spaces: 3. Three - Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. 3. Item 3. - Nested ------ @@ -211,8 +199,6 @@ Nested - Tab - Tab - - Here’s another: 1. First @@ -235,7 +221,6 @@ Same thing but with paragraphs: 3. Third - Tabs and spaces --------------- @@ -247,8 +232,6 @@ Tabs and spaces - this is an example list item indented with spaces - - Fancy list markers ------------------ @@ -262,8 +245,6 @@ Fancy list markers (A) a subsublist (B) a subsublist - - Nesting: A. Upper Alpha @@ -271,23 +252,18 @@ A. Upper Alpha (6) Decimal start with 6 c) Lower alpha with paren - - - Autonumbering: 1. Autonumber. 2. More. 1. Nested. - Should not be a list item: M.A. 2007 B. Williams - * * * * * Definition Lists @@ -322,7 +298,6 @@ orange banana yellow fruit - Multiple blocks with italics: apple @@ -337,7 +312,6 @@ orange orange block quote - Multiple definitions, tight: apple @@ -359,7 +333,6 @@ orange bank - Blank line after term, indented marker, alternate markers: apple @@ -373,7 +346,6 @@ orange 1. sublist 2. sublist - HTML Blocks =========== @@ -420,7 +392,6 @@ Code: Hr’s: - * * * * * Inline Markup @@ -448,9 +419,8 @@ 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. - +These should not be superscripts or subscripts, because of the unescaped +spaces: a^b c^d, a~b c~d. * * * * * @@ -473,7 +443,6 @@ Dashes between numbers: 5–7, 255–66, 1987–1999. Ellipses…and…and…. - * * * * * LaTeX @@ -487,22 +456,18 @@ LaTeX - 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: - \alpha + \omega \times x^2. +- Here’s one that has a line break in it: \alpha + \omega \times x^2. 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.) +- $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 @@ -558,7 +523,6 @@ Plus: + Minus: - - * * * * * Links @@ -640,7 +604,6 @@ Auto-links should not occur here: <http://example.com/> or here: <http://example.com/> - * * * * * Images @@ -648,48 +611,41 @@ Images From “Voyage dans la Lune” by Georges Melies (1902): +[lalune] - -Here is a movie icon. - +Here is a movie [movie] icon. * * * * * Footnotes ========= -Here is a footnote reference,[^1] and another.[^2] This should not -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 not be a +footnote reference, because it contains a space.[^my note] Here is an inline +note.[^3] Notes can go in quotes.[^4] 1. And in list items.[^5] -This paragraph should not be part of the note, as it is not -indented. +This paragraph should not be part of the note, as it is not indented. -[^1]: - Here is the footnote. It can go anywhere after the footnote - reference. It need not be placed at the end of the document. +[^1]: Here is the footnote. It can go anywhere after the footnote reference. + It need not be placed at the end of the document. -[^2]: - Here’s the long note. This one contains multiple blocks. +[^2]: 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). + 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. + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. -[^3]: - This is easier to type. Inline notes may contain links and ] - verbatim characters, as well as [bracketed text]. +[^3]: This is easier to type. Inline notes may contain links and ] verbatim + characters, as well as [bracketed text]. -[^4]: - In quote. +[^4]: In quote. -[^5]: - In list. +[^5]: In list. diff --git a/tests/writer.rst b/tests/writer.rst index dff04bc81..79d989915 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -9,8 +9,8 @@ Pandoc Test Suite .. role:: math(raw) :format: html latex -This is a set of tests for pandoc. Most of them are adapted from -John Gruber’s markdown test suite. +This is a set of tests for pandoc. Most of them are adapted from John Gruber’s +markdown test suite. -------------- @@ -52,9 +52,9 @@ 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. +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. @@ -70,7 +70,6 @@ E-mail style: This is a block quote. It is pretty short. - Code in a block quote: :: @@ -81,7 +80,6 @@ E-mail style: A list: - 1. item one 2. item two @@ -89,11 +87,8 @@ E-mail style: nested - nested - - This should not be a block quote: 2 > 1. And a following paragraph. @@ -108,11 +103,11 @@ Code: :: ---- (should be four hyphens) - + sub status { print "working"; } - + this code block is indented by one tab And: @@ -120,7 +115,7 @@ And: :: this code block is indented by two tabs - + These should not be escaped: \$ \\ \> \[ \{ -------------- @@ -133,123 +128,101 @@ 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: - 1. First 2. Second 3. Third and: - 1. One 2. Two 3. Three Loose using tabs: - 1. First 2. Second 3. Third - and using spaces: - 1. One 2. Two 3. Three - Multiple paragraphs: - 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. 3. Item 3. - Nested ------ - - Tab - - - Tab - - - Tab + - Tab + - Tab Here’s another: - 1. First 2. Second: - + - Fee - Fie - Foe @@ -258,74 +231,57 @@ Here’s another: Same thing but with paragraphs: - 1. First 2. Second: - - Fee - Fie - Foe 3. 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 ------------------ - (2) begins with 2 (3) and now 3 with a continuation - iv. sublist with roman numerals, starting with 4 v. more items - + (A) a subsublist (B) a subsublist - - Nesting: - A. Upper Alpha - - I. Upper Roman. - - (6) Decimal start with 6 - - c) Lower alpha with paren + I. Upper Roman. + (6) Decimal start with 6 + c) Lower alpha with paren Autonumbering: - #. Autonumber. #. More. - - #. Nested. + #. Nested. Should not be a list item: @@ -367,7 +323,6 @@ orange banana yellow fruit - Multiple blocks with italics: *apple* @@ -384,8 +339,6 @@ Multiple blocks with italics: orange block quote - - Multiple definitions, tight: apple @@ -407,7 +360,6 @@ orange bank - Blank line after term, indented marker, alternate markers: apple @@ -418,36 +370,32 @@ apple orange orange fruit - 1. sublist 2. sublist - HTML Blocks =========== Simple block on one line: - .. raw:: html <div> - + foo .. raw:: html </div> - -And nested without indentation: +And nested without indentation: .. raw:: html <div> <div> <div> - + foo .. raw:: html @@ -455,30 +403,29 @@ foo </div> </div> <div> - + bar .. raw:: html </div> </div> - -Interpreted markdown in a table: +Interpreted markdown in a table: .. raw:: html <table> <tr> <td> - + This is *emphasized* .. raw:: html </td> <td> - + And this is **strong** .. raw:: html @@ -486,23 +433,22 @@ And this is **strong** </td> </tr> </table> - + <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 <div> - + foo .. raw:: html </div> - + This should be a code block, though: :: @@ -519,14 +465,13 @@ As should this: Now, nested: - .. raw:: html <div> <div> <div> - + foo .. raw:: html @@ -534,16 +479,14 @@ foo </div> </div> </div> - -This should just be an HTML comment: +This should just be an HTML comment: .. raw:: html <!-- Comment --> - -Multiline: +Multiline: .. raw:: html @@ -551,11 +494,11 @@ Multiline: Blah Blah --> - + <!-- This is another comment. --> - + Code block: :: @@ -564,11 +507,10 @@ Code block: Just plain comment, with trailing spaces on the line: - .. raw:: html <!-- foo --> - + Code: :: @@ -577,27 +519,26 @@ Code: Hr’s: - .. raw:: html <hr> - + <hr /> - + <hr /> - + <hr> - + <hr /> - + <hr /> - + <hr class="foo" id="bar" /> - + <hr class="foo" id="bar" /> - + <hr class="foo" id="bar"> - + -------------- Inline Markup @@ -621,14 +562,12 @@ This is code: ``>``, ``$``, ``\``, ``\$``, ``<html>``. [STRIKEOUT:This is *strikeout*.] -Superscripts: a\ :sup:`bc`\ d a\ :sup:`*hello*`\ -a\ :sup:`hello there`\ . +Superscripts: a\ :sup:`bc`\ d a\ :sup:`*hello*`\ a\ :sup:`hello there`\ . -Subscripts: H\ :sub:`2`\ O, H\ :sub:`23`\ O, -H\ :sub:`many of them`\ O. +Subscripts: H\ :sub:`2`\ O, H\ :sub:`23`\ O, H\ :sub:`many of them`\ O. -These should not be superscripts or subscripts, because of the -unescaped spaces: a^b c^d, a~b c~d. +These should not be superscripts or subscripts, because of the unescaped +spaces: a^b c^d, a~b c~d. -------------- @@ -643,8 +582,8 @@ Smart quotes, ellipses, dashes ‘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. @@ -657,7 +596,6 @@ Ellipses…and…and…. LaTeX ===== - - - :math:`$2+2=4$` - :math:`$x \in y$` @@ -671,17 +609,14 @@ LaTeX 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.) +- $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 @@ -689,7 +624,6 @@ Special Characters Here is some unicode: - - I hat: Î - o umlaut: ö - section: § @@ -796,11 +730,10 @@ Foo `biz </url/>`_. With ampersands --------------- -Here’s a -`link with an ampersand in the URL <http://example.com/?foo=1&bar=2>`_. +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: -`AT&T <http://att.com/>`_. +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>`_. @@ -811,7 +744,6 @@ Autolinks With an ampersand: http://example.com/?foo=1&bar=2 - - In a list? - http://example.com/ - It should. @@ -820,7 +752,6 @@ An e-mail address: nobody@nowhere.net Blockquoted: http://example.com/ - Auto-links should not occur here: ``<http://example.com/>`` :: @@ -837,9 +768,8 @@ From “Voyage dans la Lune” by Georges Melies (1902): .. figure:: lalune.jpg :align: center :alt: Voyage dans la Lune - - lalune + lalune Here is a movie |movie| icon. -------------- @@ -847,40 +777,37 @@ Here is a movie |movie| icon. Footnotes ========= -Here is a footnote reference, [1]_ and another. [2]_ This should -*not* 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 *not* be a +footnote reference, because it contains a space.[^my note] Here is an inline +note. [3]_ Notes can go in quotes. [4]_ - - 1. And in list items. [5]_ -This paragraph should not be part of the note, as it is not -indented. +This paragraph should not be part of the note, as it is not indented. .. [1] - Here is the footnote. It can go anywhere after the footnote - reference. It need not be placed at the end of the document. + Here is the footnote. It can go anywhere after the footnote reference. It + need not be placed at the end of the document. .. [2] 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). + 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. + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. .. [3] This is *easier* to type. Inline notes may contain - `links <http://google.com>`_ and ``]`` verbatim characters, as well - as [bracketed text]. + `links <http://google.com>`_ and ``]`` verbatim characters, as well as + [bracketed text]. .. [4] In quote. |