diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-08-14 22:11:05 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-08-25 14:24:31 -0700 |
| commit | 1ee6e0e0878bcd655f31deb0caf6a4766e500cc6 (patch) | |
| tree | 5f11cadde103d1cb72e9b1cbf6eeb2b61a570e9b /test | |
| parent | 8959c44e6ae2a2f79ca55c2c173f84bf8d3abfc7 (diff) | |
| download | pandoc-1ee6e0e0878bcd655f31deb0caf6a4766e500cc6.tar.gz | |
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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/command/3531.md | 1 | ||||
| -rw-r--r-- | test/command/3824.md | 1 | ||||
| -rw-r--r-- | test/command/4794.md | 1 | ||||
| -rw-r--r-- | test/command/5107.md | 2 | ||||
| -rw-r--r-- | test/tables.custom | 1 | ||||
| -rw-r--r-- | test/tables.dokuwiki | 1 | ||||
| -rw-r--r-- | test/tables.fb2 | 1 | ||||
| -rw-r--r-- | test/tables.jira | 1 | ||||
| -rw-r--r-- | test/tables.mediawiki | 1 | ||||
| -rw-r--r-- | test/tables.rtf | 1 | ||||
| -rw-r--r-- | test/tables.textile | 1 | ||||
| -rw-r--r-- | test/tables.txt | 1 | ||||
| -rw-r--r-- | test/tables.xwiki | 1 | ||||
| -rw-r--r-- | test/tables.zimwiki | 1 | ||||
| -rw-r--r-- | test/writer.custom | 1 | ||||
| -rw-r--r-- | test/writer.docbook4 | 2394 | ||||
| -rw-r--r-- | test/writer.docbook5 | 2321 | ||||
| -rw-r--r-- | test/writer.rst | 1 | ||||
| -rw-r--r-- | test/writer.textile | 1 |
19 files changed, 2361 insertions, 2372 deletions
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 @@ </code> * 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.</td> the blank line between rows.</td> </tr> </table> - 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.</td></tr><tr><td align="center">Second</td><td align="left">row< the blank line between rows.</td></tr></table><p><emphasis /></p><p>Table without column headers:</p><table><tr><th align="right" /><th align="left" /><th align="center" /><th align="right" /></tr><tr><td align="right">12</td><td align="left">12</td><td align="center">12</td><td align="right">12</td></tr><tr><td align="right">123</td><td align="left">123</td><td align="center">123</td><td align="right">123</td></tr><tr><td align="right">1</td><td align="left">1</td><td align="center">1</td><td align="right">1</td></tr></table><p><emphasis /></p><p>Multiline table without column headers:</p><table><tr><th align="center" /><th align="left" /><th align="right" /><th align="left" /></tr><tr><td align="center">First</td><td align="left">row</td><td align="right">12.0</td><td align="left">Example of a row that spans multiple lines.</td></tr><tr><td align="center">Second</td><td align="left">row</td><td align="right">5.0</td><td align="left">Here’s another one. Note the blank line between rows.</td></tr></table><p><emphasis /></p></section></body></FictionBook> - 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: </tr> </tbody> </table> - 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]. <a href="#fnref3">↩</a></p></li> <li id="fn4"><p>In quote. <a href="#fnref4">↩</a></p></li> <li id="fn5"><p>In list. <a href="#fnref5">↩</a></p></li> </ol> - 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 @@ </authorgroup> <date>July 17, 2006</date> </articleinfo> -<para> - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. -</para> -<sect1 id="headers"> - <title>Headers</title> - <sect2 id="level-2-with-an-embedded-link"> - <title>Level 2 with an <ulink url="/url">embedded link</ulink></title> - <sect3 id="level-3-with-emphasis"> - <title>Level 3 with <emphasis>emphasis</emphasis></title> - <sect4 id="level-4"> - <title>Level 4</title> - <sect5 id="level-5"> - <title>Level 5</title> - <para> - </para> - </sect5> - </sect4> - </sect3> - </sect2> -</sect1> -<sect1 id="level-1"> - <title>Level 1</title> - <sect2 id="level-2-with-emphasis"> - <title>Level 2 with <emphasis>emphasis</emphasis></title> - <sect3 id="level-3"> - <title>Level 3</title> + <para> + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + </para> + <sect1 id="headers"> + <title>Headers</title> + <sect2 id="level-2-with-an-embedded-link"> + <title>Level 2 with an <ulink url="/url">embedded link</ulink></title> + <sect3 id="level-3-with-emphasis"> + <title>Level 3 with <emphasis>emphasis</emphasis></title> + <sect4 id="level-4"> + <title>Level 4</title> + <sect5 id="level-5"> + <title>Level 5</title> + <para> + </para> + </sect5> + </sect4> + </sect3> + </sect2> + </sect1> + <sect1 id="level-1"> + <title>Level 1</title> + <sect2 id="level-2-with-emphasis"> + <title>Level 2 with <emphasis>emphasis</emphasis></title> + <sect3 id="level-3"> + <title>Level 3</title> + <para> + with no blank line + </para> + </sect3> + </sect2> + <sect2 id="level-2"> + <title>Level 2</title> <para> with no blank line </para> - </sect3> - </sect2> - <sect2 id="level-2"> - <title>Level 2</title> + </sect2> + </sect1> + <sect1 id="paragraphs"> + <title>Paragraphs</title> <para> - with no blank line + Here’s a regular paragraph. </para> - </sect2> -</sect1> -<sect1 id="paragraphs"> - <title>Paragraphs</title> - <para> - Here’s a regular paragraph. - </para> - <para> - 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. - </para> - <para> - Here’s one with a bullet. * criminey. - </para> -<literallayout>There should be a hard line break -here.</literallayout> -</sect1> -<sect1 id="block-quotes"> - <title>Block Quotes</title> - <para> - E-mail style: - </para> - <blockquote> <para> - This is a block quote. It is pretty short. + 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. </para> - </blockquote> - <blockquote> <para> - Code in a block quote: + Here’s one with a bullet. * criminey. </para> - <programlisting> -sub status { - print "working"; -} -</programlisting> - <para> - A list: - </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - item one - </para> - </listitem> - <listitem> - <para> - item two - </para> - </listitem> - </orderedlist> +<literallayout>There should be a hard line break +here.</literallayout> + </sect1> + <sect1 id="block-quotes"> + <title>Block Quotes</title> <para> - Nested block quotes: + E-mail style: </para> <blockquote> <para> - nested + This is a block quote. It is pretty short. </para> </blockquote> <blockquote> <para> - nested + Code in a block quote: + </para> + <programlisting> +sub status { + print "working"; +} +</programlisting> + <para> + A list: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + item one + </para> + </listitem> + <listitem> + <para> + item two + </para> + </listitem> + </orderedlist> + <para> + Nested block quotes: </para> + <blockquote> + <para> + nested + </para> + </blockquote> + <blockquote> + <para> + nested + </para> + </blockquote> </blockquote> - </blockquote> - <para> - This should not be a block quote: 2 > 1. - </para> - <para> - And a following paragraph. - </para> -</sect1> -<sect1 id="code-blocks"> - <title>Code Blocks</title> - <para> - Code: - </para> - <programlisting> + <para> + This should not be a block quote: 2 > 1. + </para> + <para> + And a following paragraph. + </para> + </sect1> + <sect1 id="code-blocks"> + <title>Code Blocks</title> + <para> + Code: + </para> + <programlisting> ---- (should be four hyphens) sub status { @@ -140,1277 +140,1279 @@ sub status { this code block is indented by one tab </programlisting> - <para> - And: - </para> - <programlisting> + <para> + And: + </para> + <programlisting> this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ </programlisting> -</sect1> -<sect1 id="lists"> - <title>Lists</title> - <sect2 id="unordered"> - <title>Unordered</title> + </sect1> + <sect1 id="lists"> + <title>Lists</title> + <sect2 id="unordered"> + <title>Unordered</title> + <para> + Asterisks tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + asterisk 1 + </para> + </listitem> + <listitem> + <para> + asterisk 2 + </para> + </listitem> + <listitem> + <para> + asterisk 3 + </para> + </listitem> + </itemizedlist> + <para> + Asterisks loose: + </para> + <itemizedlist> + <listitem> + <para> + asterisk 1 + </para> + </listitem> + <listitem> + <para> + asterisk 2 + </para> + </listitem> + <listitem> + <para> + asterisk 3 + </para> + </listitem> + </itemizedlist> + <para> + Pluses tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Plus 1 + </para> + </listitem> + <listitem> + <para> + Plus 2 + </para> + </listitem> + <listitem> + <para> + Plus 3 + </para> + </listitem> + </itemizedlist> + <para> + Pluses loose: + </para> + <itemizedlist> + <listitem> + <para> + Plus 1 + </para> + </listitem> + <listitem> + <para> + Plus 2 + </para> + </listitem> + <listitem> + <para> + Plus 3 + </para> + </listitem> + </itemizedlist> + <para> + Minuses tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Minus 1 + </para> + </listitem> + <listitem> + <para> + Minus 2 + </para> + </listitem> + <listitem> + <para> + Minus 3 + </para> + </listitem> + </itemizedlist> + <para> + Minuses loose: + </para> + <itemizedlist> + <listitem> + <para> + Minus 1 + </para> + </listitem> + <listitem> + <para> + Minus 2 + </para> + </listitem> + <listitem> + <para> + Minus 3 + </para> + </listitem> + </itemizedlist> + </sect2> + <sect2 id="ordered"> + <title>Ordered</title> + <para> + Tight: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second + </para> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + and: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + One + </para> + </listitem> + <listitem> + <para> + Two + </para> + </listitem> + <listitem> + <para> + Three + </para> + </listitem> + </orderedlist> + <para> + Loose using tabs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second + </para> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + and using spaces: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + One + </para> + </listitem> + <listitem> + <para> + Two + </para> + </listitem> + <listitem> + <para> + Three + </para> + </listitem> + </orderedlist> + <para> + Multiple paragraphs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Item 1, graf one. + </para> + <para> + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + </para> + </listitem> + <listitem> + <para> + Item 2. + </para> + </listitem> + <listitem> + <para> + Item 3. + </para> + </listitem> + </orderedlist> + </sect2> + <sect2 id="nested"> + <title>Nested</title> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <para> + Here’s another: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Fee + </para> + </listitem> + <listitem> + <para> + Fie + </para> + </listitem> + <listitem> + <para> + Foe + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + Same thing but with paragraphs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Fee + </para> + </listitem> + <listitem> + <para> + Fie + </para> + </listitem> + <listitem> + <para> + Foe + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + </sect2> + <sect2 id="tabs-and-spaces"> + <title>Tabs and spaces</title> + <itemizedlist> + <listitem> + <para> + this is a list item indented with tabs + </para> + </listitem> + <listitem> + <para> + this is a list item indented with spaces + </para> + <itemizedlist> + <listitem> + <para> + this is an example list item indented with tabs + </para> + </listitem> + <listitem> + <para> + this is an example list item indented with spaces + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </sect2> + <sect2 id="fancy-list-markers"> + <title>Fancy list markers</title> + <orderedlist numeration="arabic"> + <listitem override="2"> + <para> + begins with 2 + </para> + </listitem> + <listitem> + <para> + and now 3 + </para> + <para> + with a continuation + </para> + <orderedlist numeration="lowerroman" spacing="compact"> + <listitem override="4"> + <para> + sublist with roman numerals, starting with 4 + </para> + </listitem> + <listitem> + <para> + more items + </para> + <orderedlist numeration="upperalpha" spacing="compact"> + <listitem> + <para> + a subsublist + </para> + </listitem> + <listitem> + <para> + a subsublist + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Nesting: + </para> + <orderedlist numeration="upperalpha" spacing="compact"> + <listitem> + <para> + Upper Alpha + </para> + <orderedlist numeration="upperroman" spacing="compact"> + <listitem> + <para> + Upper Roman. + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem override="6"> + <para> + Decimal start with 6 + </para> + <orderedlist numeration="loweralpha" spacing="compact"> + <listitem override="3"> + <para> + Lower alpha with paren + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Autonumbering: + </para> + <orderedlist spacing="compact"> + <listitem> + <para> + Autonumber. + </para> + </listitem> + <listitem> + <para> + More. + </para> + <orderedlist spacing="compact"> + <listitem> + <para> + Nested. + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Should not be a list item: + </para> + <para> + M.A. 2007 + </para> + <para> + B. Williams + </para> + </sect2> + </sect1> + <sect1 id="definition-lists"> + <title>Definition Lists</title> <para> - Asterisks tight: + Tight using spaces: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - asterisk 1 - </para> - </listitem> - <listitem> - <para> - asterisk 2 - </para> - </listitem> - <listitem> - <para> - asterisk 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Asterisks loose: + Tight using tabs: </para> - <itemizedlist> - <listitem> - <para> - asterisk 1 - </para> - </listitem> - <listitem> - <para> - asterisk 2 - </para> - </listitem> - <listitem> - <para> - asterisk 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Pluses tight: + Loose: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Plus 1 - </para> - </listitem> - <listitem> - <para> - Plus 2 - </para> - </listitem> - <listitem> - <para> - Plus 3 - </para> - </listitem> - </itemizedlist> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Pluses loose: + Multiple blocks with italics: </para> - <itemizedlist> - <listitem> - <para> - Plus 1 - </para> - </listitem> - <listitem> - <para> - Plus 2 - </para> - </listitem> - <listitem> - <para> - Plus 3 - </para> - </listitem> - </itemizedlist> + <variablelist> + <varlistentry> + <term> + <emphasis>apple</emphasis> + </term> + <listitem> + <para> + red fruit + </para> + <para> + contains seeds, crisp, pleasant to taste + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <emphasis>orange</emphasis> + </term> + <listitem> + <para> + orange fruit + </para> + <programlisting> +{ orange code block } +</programlisting> + <blockquote> + <para> + orange block quote + </para> + </blockquote> + </listitem> + </varlistentry> + </variablelist> <para> - Minuses tight: + Multiple definitions, tight: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Minus 1 - </para> - </listitem> - <listitem> - <para> - Minus 2 - </para> - </listitem> - <listitem> - <para> - Minus 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <para> + bank + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Minuses loose: + Multiple definitions, loose: </para> - <itemizedlist> - <listitem> - <para> - Minus 1 - </para> - </listitem> - <listitem> - <para> - Minus 2 - </para> - </listitem> - <listitem> - <para> - Minus 3 - </para> - </listitem> - </itemizedlist> - </sect2> - <sect2 id="ordered"> - <title>Ordered</title> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <para> + bank + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Tight: + Blank line after term, indented marker, alternate markers: </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second - </para> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + sublist + </para> + </listitem> + <listitem> + <para> + sublist + </para> + </listitem> + </orderedlist> + </listitem> + </varlistentry> + </variablelist> + </sect1> + <sect1 id="html-blocks"> + <title>HTML Blocks</title> <para> - and: + Simple block on one line: </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - One - </para> - </listitem> - <listitem> - <para> - Two - </para> - </listitem> - <listitem> - <para> - Three - </para> - </listitem> - </orderedlist> <para> - Loose using tabs: + foo </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second - </para> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> <para> - and using spaces: + And nested without indentation: </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - One - </para> - </listitem> - <listitem> - <para> - Two - </para> - </listitem> - <listitem> - <para> - Three - </para> - </listitem> - </orderedlist> <para> - Multiple paragraphs: + foo </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Item 1, graf one. - </para> - <para> - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - </para> - </listitem> - <listitem> - <para> - Item 2. - </para> - </listitem> - <listitem> - <para> - Item 3. - </para> - </listitem> - </orderedlist> - </sect2> - <sect2 id="nested"> - <title>Nested</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> <para> - Here’s another: + bar </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Fee - </para> - </listitem> - <listitem> - <para> - Fie - </para> - </listitem> - <listitem> - <para> - Foe - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> <para> - Same thing but with paragraphs: + Interpreted markdown in a table: </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Fee - </para> - </listitem> - <listitem> - <para> - Fie - </para> - </listitem> - <listitem> - <para> - Foe - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> - </sect2> - <sect2 id="tabs-and-spaces"> - <title>Tabs and spaces</title> - <itemizedlist> - <listitem> - <para> - this is a list item indented with tabs - </para> - </listitem> - <listitem> - <para> - this is a list item indented with spaces - </para> - <itemizedlist> - <listitem> - <para> - this is an example list item indented with tabs - </para> - </listitem> - <listitem> - <para> - this is an example list item indented with spaces - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </sect2> - <sect2 id="fancy-list-markers"> - <title>Fancy list markers</title> - <orderedlist numeration="arabic"> - <listitem override="2"> - <para> - begins with 2 - </para> - </listitem> - <listitem> - <para> - and now 3 - </para> - <para> - with a continuation - </para> - <orderedlist numeration="lowerroman" spacing="compact"> - <listitem override="4"> - <para> - sublist with roman numerals, starting with 4 - </para> - </listitem> - <listitem> - <para> - more items - </para> - <orderedlist numeration="upperalpha" spacing="compact"> - <listitem> - <para> - a subsublist - </para> - </listitem> - <listitem> - <para> - a subsublist - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> + <table> + <tr> + <td> + This is <emphasis>emphasized</emphasis> + </td> + <td> + And this is <emphasis role="strong">strong</emphasis> + </td> + </tr> + </table> + <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> <para> - Nesting: + Here’s a simple block: </para> - <orderedlist numeration="upperalpha" spacing="compact"> - <listitem> - <para> - Upper Alpha - </para> - <orderedlist numeration="upperroman" spacing="compact"> - <listitem> - <para> - Upper Roman. - </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem override="6"> - <para> - Decimal start with 6 - </para> - <orderedlist numeration="loweralpha" spacing="compact"> - <listitem override="3"> - <para> - Lower alpha with paren - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> <para> - Autonumbering: + foo </para> - <orderedlist spacing="compact"> - <listitem> - <para> - Autonumber. - </para> - </listitem> - <listitem> - <para> - More. - </para> - <orderedlist spacing="compact"> - <listitem> - <para> - Nested. - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> <para> - Should not be a list item: + This should be a code block, though: + </para> + <programlisting> +<div> + foo +</div> +</programlisting> + <para> + As should this: </para> + <programlisting> +<div>foo</div> +</programlisting> <para> - M.A. 2007 + Now, nested: </para> <para> - B. Williams + foo </para> - </sect2> -</sect1> -<sect1 id="definition-lists"> - <title>Definition Lists</title> - <para> - Tight using spaces: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> + <para> + This should just be an HTML comment: + </para> + <!-- Comment --> + <para> + Multiline: + </para> + <!-- + Blah + Blah + --> + <!-- + This is another comment. + --> + <para> + Code block: + </para> + <programlisting> +<!-- Comment --> +</programlisting> + <para> + Just plain comment, with trailing spaces on the line: + </para> + <!-- foo --> + <para> + Code: + </para> + <programlisting> +<hr /> +</programlisting> + <para> + Hr’s: + </para> + <hr> + <hr /> + <hr /> + <hr> + <hr /> + <hr /> + <hr class="foo" id="bar" /> + <hr class="foo" id="bar" /> + <hr class="foo" id="bar"> + </sect1> + <sect1 id="inline-markup"> + <title>Inline Markup</title> + <para> + This is <emphasis>emphasized</emphasis>, and so <emphasis>is + this</emphasis>. + </para> + <para> + This is <emphasis role="strong">strong</emphasis>, and so + <emphasis role="strong">is this</emphasis>. + </para> + <para> + An <emphasis><ulink url="/url">emphasized link</ulink></emphasis>. + </para> + <para> + <emphasis role="strong"><emphasis>This is strong and + em.</emphasis></emphasis> + </para> + <para> + So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. + </para> + <para> + <emphasis role="strong"><emphasis>This is strong and + em.</emphasis></emphasis> + </para> + <para> + So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. + </para> + <para> + This is code: <literal>></literal>, <literal>$</literal>, + <literal>\</literal>, <literal>\$</literal>, + <literal><html></literal>. + </para> + <para> + <emphasis role="strikethrough">This is + <emphasis>strikeout</emphasis>.</emphasis> + </para> + <para> + Superscripts: a<superscript>bc</superscript>d + a<superscript><emphasis>hello</emphasis></superscript> + a<superscript>hello there</superscript>. + </para> + <para> + Subscripts: H<subscript>2</subscript>O, H<subscript>23</subscript>O, + H<subscript>many of them</subscript>O. + </para> + <para> + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d. + </para> + </sect1> + <sect1 id="smart-quotes-ellipses-dashes"> + <title>Smart quotes, ellipses, dashes</title> + <para> + <quote>Hello,</quote> said the spider. <quote><quote>Shelob</quote> is + my name.</quote> + </para> + <para> + <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are letters. + </para> + <para> + <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote> are + names of trees. So is <quote>pine.</quote> + </para> + <para> + <quote>He said, <quote>I want to go.</quote></quote> Were you alive in + the 70’s? + </para> + <para> + Here is some quoted <quote><literal>code</literal></quote> and a + <quote><ulink url="http://example.com/?foo=1&bar=2">quoted + link</ulink></quote>. + </para> + <para> + Some dashes: one—two — three—four — five. + </para> + <para> + Dashes between numbers: 5–7, 255–66, 1987–1999. + </para> + <para> + Ellipses…and…and…. + </para> + </sect1> + <sect1 id="latex"> + <title>LaTeX</title> + <itemizedlist spacing="compact"> <listitem> <para> - red fruit </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + 2 + 2 = 4 </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> <listitem> <para> - yellow fruit + <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> </para> </listitem> - </varlistentry> - </variablelist> - <para> - Tight using tabs: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit + <emphasis>α</emphasis> ∧ <emphasis>ω</emphasis> </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + 223 </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> <listitem> <para> - yellow fruit + <emphasis>p</emphasis>-Tree </para> </listitem> - </varlistentry> - </variablelist> - <para> - Loose: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit + Here’s some display math: + $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + Here’s one that has a line break in it: + <emphasis>α</emphasis> + <emphasis>ω</emphasis> × <emphasis>x</emphasis><superscript>2</superscript>. </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> + </itemizedlist> + <para> + These shouldn’t be math: + </para> + <itemizedlist spacing="compact"> <listitem> <para> - yellow fruit + To get the famous equation, write <literal>$e = mc^2$</literal>. </para> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple blocks with italics: - </para> - <variablelist> - <varlistentry> - <term> - <emphasis>apple</emphasis> - </term> <listitem> <para> - red fruit - </para> - <para> - contains seeds, crisp, pleasant to taste + $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It + worked if <quote>lot</quote> is emphasized.) </para> </listitem> - </varlistentry> - <varlistentry> - <term> - <emphasis>orange</emphasis> - </term> <listitem> <para> - orange fruit + Shoes ($20) and socks ($5). </para> - <programlisting> -{ orange code block } -</programlisting> - <blockquote> - <para> - orange block quote - </para> - </blockquote> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple definitions, tight: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + Escaped <literal>$</literal>: $73 <emphasis>this should be + emphasized</emphasis> 23$. </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> + </itemizedlist> + <para> + Here’s a LaTeX table: + </para> + </sect1> + <sect1 id="special-characters"> + <title>Special Characters</title> + <para> + Here is some unicode: + </para> + <itemizedlist spacing="compact"> <listitem> <para> - orange fruit - </para> - <para> - bank + I hat: Î </para> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple definitions, loose: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + o umlaut: ö </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit - </para> - <para> - bank + section: § </para> </listitem> - </varlistentry> - </variablelist> - <para> - Blank line after term, indented marker, alternate markers: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + set membership: ∈ </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + copyright: © </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - sublist - </para> - </listitem> - <listitem> - <para> - sublist - </para> - </listitem> - </orderedlist> </listitem> - </varlistentry> - </variablelist> -</sect1> -<sect1 id="html-blocks"> - <title>HTML Blocks</title> - <para> - Simple block on one line: - </para> - <para> - foo - </para> - <para> - And nested without indentation: - </para> - <para> - foo - </para> - <para> - bar - </para> - <para> - Interpreted markdown in a table: - </para> - <table> - <tr> - <td> - This is <emphasis>emphasized</emphasis> - </td> - <td> - And this is <emphasis role="strong">strong</emphasis> - </td> - </tr> - </table> - <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> - <para> - Here’s a simple block: - </para> - <para> - foo - </para> - <para> - This should be a code block, though: - </para> - <programlisting> -<div> - foo -</div> -</programlisting> - <para> - As should this: - </para> - <programlisting> -<div>foo</div> -</programlisting> - <para> - Now, nested: - </para> - <para> - foo - </para> - <para> - This should just be an HTML comment: - </para> - <!-- Comment --> - <para> - Multiline: - </para> - <!-- - Blah - Blah - --> - <!-- - This is another comment. - --> - <para> - Code block: - </para> - <programlisting> -<!-- Comment --> -</programlisting> - <para> - Just plain comment, with trailing spaces on the line: - </para> - <!-- foo --> - <para> - Code: - </para> - <programlisting> -<hr /> -</programlisting> - <para> - Hr’s: - </para> - <hr> - <hr /> - <hr /> - <hr> - <hr /> - <hr /> - <hr class="foo" id="bar" /> - <hr class="foo" id="bar" /> - <hr class="foo" id="bar"> -</sect1> -<sect1 id="inline-markup"> - <title>Inline Markup</title> - <para> - This is <emphasis>emphasized</emphasis>, and so <emphasis>is - this</emphasis>. - </para> - <para> - This is <emphasis role="strong">strong</emphasis>, and so - <emphasis role="strong">is this</emphasis>. - </para> - <para> - An <emphasis><ulink url="/url">emphasized link</ulink></emphasis>. - </para> - <para> - <emphasis role="strong"><emphasis>This is strong and - em.</emphasis></emphasis> - </para> - <para> - So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. - </para> - <para> - <emphasis role="strong"><emphasis>This is strong and - em.</emphasis></emphasis> - </para> - <para> - So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. - </para> - <para> - This is code: <literal>></literal>, <literal>$</literal>, - <literal>\</literal>, <literal>\$</literal>, - <literal><html></literal>. - </para> - <para> - <emphasis role="strikethrough">This is - <emphasis>strikeout</emphasis>.</emphasis> - </para> - <para> - Superscripts: a<superscript>bc</superscript>d - a<superscript><emphasis>hello</emphasis></superscript> - a<superscript>hello there</superscript>. - </para> - <para> - Subscripts: H<subscript>2</subscript>O, H<subscript>23</subscript>O, - H<subscript>many of them</subscript>O. - </para> - <para> - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - </para> -</sect1> -<sect1 id="smart-quotes-ellipses-dashes"> - <title>Smart quotes, ellipses, dashes</title> - <para> - <quote>Hello,</quote> said the spider. <quote><quote>Shelob</quote> is my - name.</quote> - </para> - <para> - <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are letters. - </para> - <para> - <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote> are names - of trees. So is <quote>pine.</quote> - </para> - <para> - <quote>He said, <quote>I want to go.</quote></quote> Were you alive in the - 70’s? - </para> - <para> - Here is some quoted <quote><literal>code</literal></quote> and a - <quote><ulink url="http://example.com/?foo=1&bar=2">quoted - link</ulink></quote>. - </para> - <para> - Some dashes: one—two — three—four — five. - </para> - <para> - Dashes between numbers: 5–7, 255–66, 1987–1999. - </para> - <para> - Ellipses…and…and…. - </para> -</sect1> -<sect1 id="latex"> - <title>LaTeX</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - </para> - </listitem> - <listitem> - <para> - 2 + 2 = 4 - </para> - </listitem> - <listitem> - <para> - <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> - </para> - </listitem> - <listitem> - <para> - <emphasis>α</emphasis> ∧ <emphasis>ω</emphasis> - </para> - </listitem> - <listitem> - <para> - 223 - </para> - </listitem> - <listitem> - <para> - <emphasis>p</emphasis>-Tree - </para> - </listitem> - <listitem> - <para> - Here’s some display math: - $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ - </para> - </listitem> - <listitem> - <para> - Here’s one that has a line break in it: - <emphasis>α</emphasis> + <emphasis>ω</emphasis> × <emphasis>x</emphasis><superscript>2</superscript>. - </para> - </listitem> - </itemizedlist> - <para> - These shouldn’t be math: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - To get the famous equation, write <literal>$e = mc^2$</literal>. - </para> - </listitem> - <listitem> - <para> - $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It - worked if <quote>lot</quote> is emphasized.) - </para> - </listitem> - <listitem> - <para> - Shoes ($20) and socks ($5). - </para> - </listitem> - <listitem> - <para> - Escaped <literal>$</literal>: $73 <emphasis>this should be - emphasized</emphasis> 23$. - </para> - </listitem> - </itemizedlist> - <para> - Here’s a LaTeX table: - </para> -</sect1> -<sect1 id="special-characters"> - <title>Special Characters</title> - <para> - Here is some unicode: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - I hat: Î - </para> - </listitem> - <listitem> - <para> - o umlaut: ö - </para> - </listitem> - <listitem> - <para> - section: § - </para> - </listitem> - <listitem> - <para> - set membership: ∈ - </para> - </listitem> - <listitem> - <para> - copyright: © - </para> - </listitem> - </itemizedlist> - <para> - AT&T has an ampersand in their name. - </para> - <para> - AT&T is another way to write it. - </para> - <para> - This & that. - </para> - <para> - 4 < 5. - </para> - <para> - 6 > 5. - </para> - <para> - Backslash: \ - </para> - <para> - Backtick: ` - </para> - <para> - Asterisk: * - </para> - <para> - Underscore: _ - </para> - <para> - Left brace: { - </para> - <para> - Right brace: } - </para> - <para> - Left bracket: [ - </para> - <para> - Right bracket: ] - </para> - <para> - Left paren: ( - </para> - <para> - Right paren: ) - </para> - <para> - Greater-than: > - </para> - <para> - Hash: # - </para> - <para> - Period: . - </para> - <para> - Bang: ! - </para> - <para> - Plus: + - </para> - <para> - Minus: - - </para> -</sect1> -<sect1 id="links"> - <title>Links</title> - <sect2 id="explicit"> - <title>Explicit</title> - <para> - Just a <ulink url="/url/">URL</ulink>. - </para> - <para> - <ulink url="/url/">URL and title</ulink>. - </para> - <para> - <ulink url="/url/">URL and title</ulink>. - </para> + </itemizedlist> <para> - <ulink url="/url/">URL and title</ulink>. + AT&T has an ampersand in their name. </para> <para> - <ulink url="/url/">URL and title</ulink> + AT&T is another way to write it. </para> <para> - <ulink url="/url/">URL and title</ulink> + This & that. </para> <para> - <ulink url="/url/with_underscore">with_underscore</ulink> + 4 < 5. </para> <para> - Email link (<email>nobody@nowhere.net</email>) + 6 > 5. </para> <para> - <ulink url="">Empty</ulink>. + Backslash: \ </para> - </sect2> - <sect2 id="reference"> - <title>Reference</title> <para> - Foo <ulink url="/url/">bar</ulink>. + Backtick: ` </para> <para> - With <ulink url="/url/">embedded [brackets]</ulink>. + Asterisk: * </para> <para> - <ulink url="/url/">b</ulink> by itself should be a link. + Underscore: _ </para> <para> - Indented <ulink url="/url">once</ulink>. + Left brace: { </para> <para> - Indented <ulink url="/url">twice</ulink>. + Right brace: } </para> <para> - Indented <ulink url="/url">thrice</ulink>. + Left bracket: [ </para> <para> - This should [not][] be a link. + Right bracket: ] </para> - <programlisting> -[not]: /url -</programlisting> <para> - Foo <ulink url="/url/">bar</ulink>. + Left paren: ( </para> <para> - Foo <ulink url="/url/">biz</ulink>. + Right paren: ) </para> - </sect2> - <sect2 id="with-ampersands"> - <title>With ampersands</title> <para> - Here’s a <ulink url="http://example.com/?foo=1&bar=2">link with an - ampersand in the URL</ulink>. + Greater-than: > </para> <para> - Here’s a link with an amersand in the link text: - <ulink url="http://att.com/">AT&T</ulink>. + Hash: # </para> <para> - Here’s an <ulink url="/script?foo=1&bar=2">inline link</ulink>. + Period: . </para> <para> - Here’s an <ulink url="/script?foo=1&bar=2">inline link in pointy - braces</ulink>. + Bang: ! </para> - </sect2> - <sect2 id="autolinks"> - <title>Autolinks</title> <para> - With an ampersand: - <ulink url="http://example.com/?foo=1&bar=2" role="uri">http://example.com/?foo=1&bar=2</ulink> + Plus: + </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - In a list? - </para> - </listitem> - <listitem> - <para> - <ulink url="http://example.com/" role="uri">http://example.com/</ulink> - </para> - </listitem> - <listitem> - <para> - It should. - </para> - </listitem> - </itemizedlist> <para> - An e-mail address: <email>nobody@nowhere.net</email> + Minus: - </para> - <blockquote> + </sect1> + <sect1 id="links"> + <title>Links</title> + <sect2 id="explicit"> + <title>Explicit</title> <para> - Blockquoted: - <ulink url="http://example.com/" role="uri">http://example.com/</ulink> + Just a <ulink url="/url/">URL</ulink>. + </para> + <para> + <ulink url="/url/">URL and title</ulink>. + </para> + <para> + <ulink url="/url/">URL and title</ulink>. + </para> + <para> + <ulink url="/url/">URL and title</ulink>. + </para> + <para> + <ulink url="/url/">URL and title</ulink> + </para> + <para> + <ulink url="/url/">URL and title</ulink> + </para> + <para> + <ulink url="/url/with_underscore">with_underscore</ulink> </para> - </blockquote> - <para> - Auto-links should not occur here: - <literal><http://example.com/></literal> - </para> - <programlisting> -or here: <http://example.com/> -</programlisting> - </sect2> -</sect1> -<sect1 id="images"> - <title>Images</title> - <para> - From <quote>Voyage dans la Lune</quote> by Georges Melies (1902): - </para> - <figure> - <title>lalune</title> - <mediaobject> - <imageobject> - <imagedata fileref="lalune.jpg" /> - </imageobject> - <textobject><phrase>lalune</phrase></textobject> - </mediaobject> - </figure> - <para> - Here is a movie <inlinemediaobject> - <imageobject> - <imagedata fileref="movie.jpg" /> - </imageobject> - </inlinemediaobject> icon. - </para> -</sect1> -<sect1 id="footnotes"> - <title>Footnotes</title> - <para> - Here is a footnote reference,<footnote> <para> - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. + Email link (<email>nobody@nowhere.net</email>) </para> - </footnote> and another.<footnote> <para> - Here’s the long note. This one contains multiple blocks. + <ulink url="">Empty</ulink>. </para> + </sect2> + <sect2 id="reference"> + <title>Reference</title> <para> - Subsequent blocks are indented to show that they belong to the - footnote (as with list items). + Foo <ulink url="/url/">bar</ulink>. + </para> + <para> + With <ulink url="/url/">embedded [brackets]</ulink>. + </para> + <para> + <ulink url="/url/">b</ulink> by itself should be a link. + </para> + <para> + Indented <ulink url="/url">once</ulink>. + </para> + <para> + Indented <ulink url="/url">twice</ulink>. + </para> + <para> + Indented <ulink url="/url">thrice</ulink>. + </para> + <para> + This should [not][] be a link. </para> <programlisting> - { <code> } +[not]: /url </programlisting> <para> - If you want, you can indent every line, but you can also be lazy and - just indent the first line of each block. + Foo <ulink url="/url/">bar</ulink>. </para> - </footnote> This should <emphasis>not</emphasis> be a footnote reference, - because it contains a space.[^my note] Here is an inline note.<footnote> <para> - This is <emphasis>easier</emphasis> to type. Inline notes may contain - <ulink url="http://google.com">links</ulink> and <literal>]</literal> - verbatim characters, as well as [bracketed text]. + Foo <ulink url="/url/">biz</ulink>. </para> - </footnote> - </para> - <blockquote> + </sect2> + <sect2 id="with-ampersands"> + <title>With ampersands</title> + <para> + Here’s a <ulink url="http://example.com/?foo=1&bar=2">link with an + ampersand in the URL</ulink>. + </para> + <para> + Here’s a link with an amersand in the link text: + <ulink url="http://att.com/">AT&T</ulink>. + </para> + <para> + Here’s an <ulink url="/script?foo=1&bar=2">inline link</ulink>. + </para> + <para> + Here’s an <ulink url="/script?foo=1&bar=2">inline link in pointy + braces</ulink>. + </para> + </sect2> + <sect2 id="autolinks"> + <title>Autolinks</title> + <para> + With an ampersand: + <ulink url="http://example.com/?foo=1&bar=2" role="uri">http://example.com/?foo=1&bar=2</ulink> + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + In a list? + </para> + </listitem> + <listitem> + <para> + <ulink url="http://example.com/" role="uri">http://example.com/</ulink> + </para> + </listitem> + <listitem> + <para> + It should. + </para> + </listitem> + </itemizedlist> + <para> + An e-mail address: <email>nobody@nowhere.net</email> + </para> + <blockquote> + <para> + Blockquoted: + <ulink url="http://example.com/" role="uri">http://example.com/</ulink> + </para> + </blockquote> + <para> + Auto-links should not occur here: + <literal><http://example.com/></literal> + </para> + <programlisting> +or here: <http://example.com/> +</programlisting> + </sect2> + </sect1> + <sect1 id="images"> + <title>Images</title> + <para> + From <quote>Voyage dans la Lune</quote> by Georges Melies (1902): + </para> + <figure> + <title>lalune</title> + <mediaobject> + <imageobject> + <imagedata fileref="lalune.jpg" /> + </imageobject> + <textobject><phrase>lalune</phrase></textobject> + </mediaobject> + </figure> + <para> + Here is a movie <inlinemediaobject> + <imageobject> + <imagedata fileref="movie.jpg" /> + </imageobject> + </inlinemediaobject> icon. + </para> + </sect1> + <sect1 id="footnotes"> + <title>Footnotes</title> <para> - Notes can go in quotes.<footnote> + Here is a footnote reference,<footnote> + <para> + Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. + </para> + </footnote> and another.<footnote> + <para> + Here’s the long note. This one contains multiple blocks. + </para> + <para> + Subsequent blocks are indented to show that they belong to the + footnote (as with list items). + </para> + <programlisting> + { <code> } +</programlisting> + <para> + If you want, you can indent every line, but you can also be lazy and + just indent the first line of each block. + </para> + </footnote> This should <emphasis>not</emphasis> be a footnote + reference, because it contains a space.[^my note] Here is an inline + note.<footnote> <para> - In quote. + This is <emphasis>easier</emphasis> to type. Inline notes may + contain <ulink url="http://google.com">links</ulink> and + <literal>]</literal> verbatim characters, as well as [bracketed + text]. </para> </footnote> </para> - </blockquote> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> + <blockquote> <para> - And in list items.<footnote> + Notes can go in quotes.<footnote> <para> - In list. + In quote. </para> </footnote> </para> - </listitem> - </orderedlist> - <para> - This paragraph should not be part of the note, as it is not indented. - </para> -</sect1> + </blockquote> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + And in list items.<footnote> + <para> + In list. + </para> + </footnote> + </para> + </listitem> + </orderedlist> + <para> + This paragraph should not be part of the note, as it is not indented. + </para> + </sect1> </article> 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 @@ </authorgroup> <date>July 17, 2006</date> </info> -<para> - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. -</para> -<section xml:id="headers"> - <title>Headers</title> - <section xml:id="level-2-with-an-embedded-link"> - <title>Level 2 with an <link xlink:href="/url">embedded - link</link></title> - <section xml:id="level-3-with-emphasis"> - <title>Level 3 with <emphasis>emphasis</emphasis></title> - <section xml:id="level-4"> - <title>Level 4</title> - <section xml:id="level-5"> - <title>Level 5</title> - <para> - </para> + <para> + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + </para> + <section xml:id="headers"> + <title>Headers</title> + <section xml:id="level-2-with-an-embedded-link"> + <title>Level 2 with an <link xlink:href="/url">embedded + link</link></title> + <section xml:id="level-3-with-emphasis"> + <title>Level 3 with <emphasis>emphasis</emphasis></title> + <section xml:id="level-4"> + <title>Level 4</title> + <section xml:id="level-5"> + <title>Level 5</title> + <para> + </para> + </section> </section> </section> </section> </section> -</section> -<section xml:id="level-1"> - <title>Level 1</title> - <section xml:id="level-2-with-emphasis"> - <title>Level 2 with <emphasis>emphasis</emphasis></title> - <section xml:id="level-3"> - <title>Level 3</title> + <section xml:id="level-1"> + <title>Level 1</title> + <section xml:id="level-2-with-emphasis"> + <title>Level 2 with <emphasis>emphasis</emphasis></title> + <section xml:id="level-3"> + <title>Level 3</title> + <para> + with no blank line + </para> + </section> + </section> + <section xml:id="level-2"> + <title>Level 2</title> <para> with no blank line </para> </section> </section> - <section xml:id="level-2"> - <title>Level 2</title> + <section xml:id="paragraphs"> + <title>Paragraphs</title> <para> - with no blank line + Here’s a regular paragraph. </para> - </section> -</section> -<section xml:id="paragraphs"> - <title>Paragraphs</title> - <para> - Here’s a regular paragraph. - </para> - <para> - 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. - </para> - <para> - Here’s one with a bullet. * criminey. - </para> -<literallayout>There should be a hard line break -here.</literallayout> -</section> -<section xml:id="block-quotes"> - <title>Block Quotes</title> - <para> - E-mail style: - </para> - <blockquote> - <para> - This is a block quote. It is pretty short. - </para> - </blockquote> - <blockquote> <para> - 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. </para> - <programlisting> -sub status { - print "working"; -} -</programlisting> <para> - A list: + Here’s one with a bullet. * criminey. </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - item one - </para> - </listitem> - <listitem> - <para> - item two - </para> - </listitem> - </orderedlist> +<literallayout>There should be a hard line break +here.</literallayout> + </section> + <section xml:id="block-quotes"> + <title>Block Quotes</title> <para> - Nested block quotes: + E-mail style: </para> <blockquote> <para> - nested + This is a block quote. It is pretty short. </para> </blockquote> <blockquote> <para> - nested + Code in a block quote: </para> + <programlisting> +sub status { + print "working"; +} +</programlisting> + <para> + A list: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + item one + </para> + </listitem> + <listitem> + <para> + item two + </para> + </listitem> + </orderedlist> + <para> + Nested block quotes: + </para> + <blockquote> + <para> + nested + </para> + </blockquote> + <blockquote> + <para> + nested + </para> + </blockquote> </blockquote> - </blockquote> - <para> - This should not be a block quote: 2 > 1. - </para> - <para> - And a following paragraph. - </para> -</section> -<section xml:id="code-blocks"> - <title>Code Blocks</title> - <para> - Code: - </para> - <programlisting> + <para> + This should not be a block quote: 2 > 1. + </para> + <para> + And a following paragraph. + </para> + </section> + <section xml:id="code-blocks"> + <title>Code Blocks</title> + <para> + Code: + </para> + <programlisting> ---- (should be four hyphens) sub status { @@ -142,1250 +142,1253 @@ sub status { this code block is indented by one tab </programlisting> - <para> - And: - </para> - <programlisting> + <para> + And: + </para> + <programlisting> this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ </programlisting> -</section> -<section xml:id="lists"> - <title>Lists</title> - <section xml:id="unordered"> - <title>Unordered</title> + </section> + <section xml:id="lists"> + <title>Lists</title> + <section xml:id="unordered"> + <title>Unordered</title> + <para> + Asterisks tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + asterisk 1 + </para> + </listitem> + <listitem> + <para> + asterisk 2 + </para> + </listitem> + <listitem> + <para> + asterisk 3 + </para> + </listitem> + </itemizedlist> + <para> + Asterisks loose: + </para> + <itemizedlist> + <listitem> + <para> + asterisk 1 + </para> + </listitem> + <listitem> + <para> + asterisk 2 + </para> + </listitem> + <listitem> + <para> + asterisk 3 + </para> + </listitem> + </itemizedlist> + <para> + Pluses tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Plus 1 + </para> + </listitem> + <listitem> + <para> + Plus 2 + </para> + </listitem> + <listitem> + <para> + Plus 3 + </para> + </listitem> + </itemizedlist> + <para> + Pluses loose: + </para> + <itemizedlist> + <listitem> + <para> + Plus 1 + </para> + </listitem> + <listitem> + <para> + Plus 2 + </para> + </listitem> + <listitem> + <para> + Plus 3 + </para> + </listitem> + </itemizedlist> + <para> + Minuses tight: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Minus 1 + </para> + </listitem> + <listitem> + <para> + Minus 2 + </para> + </listitem> + <listitem> + <para> + Minus 3 + </para> + </listitem> + </itemizedlist> + <para> + Minuses loose: + </para> + <itemizedlist> + <listitem> + <para> + Minus 1 + </para> + </listitem> + <listitem> + <para> + Minus 2 + </para> + </listitem> + <listitem> + <para> + Minus 3 + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="ordered"> + <title>Ordered</title> + <para> + Tight: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second + </para> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + and: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + One + </para> + </listitem> + <listitem> + <para> + Two + </para> + </listitem> + <listitem> + <para> + Three + </para> + </listitem> + </orderedlist> + <para> + Loose using tabs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second + </para> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + and using spaces: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + One + </para> + </listitem> + <listitem> + <para> + Two + </para> + </listitem> + <listitem> + <para> + Three + </para> + </listitem> + </orderedlist> + <para> + Multiple paragraphs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Item 1, graf one. + </para> + <para> + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + </para> + </listitem> + <listitem> + <para> + Item 2. + </para> + </listitem> + <listitem> + <para> + Item 3. + </para> + </listitem> + </orderedlist> + </section> + <section xml:id="nested"> + <title>Nested</title> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Tab + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <para> + Here’s another: + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Fee + </para> + </listitem> + <listitem> + <para> + Fie + </para> + </listitem> + <listitem> + <para> + Foe + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + <para> + Same thing but with paragraphs: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + First + </para> + </listitem> + <listitem> + <para> + Second: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Fee + </para> + </listitem> + <listitem> + <para> + Fie + </para> + </listitem> + <listitem> + <para> + Foe + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Third + </para> + </listitem> + </orderedlist> + </section> + <section xml:id="tabs-and-spaces"> + <title>Tabs and spaces</title> + <itemizedlist> + <listitem> + <para> + this is a list item indented with tabs + </para> + </listitem> + <listitem> + <para> + this is a list item indented with spaces + </para> + <itemizedlist> + <listitem> + <para> + this is an example list item indented with tabs + </para> + </listitem> + <listitem> + <para> + this is an example list item indented with spaces + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section xml:id="fancy-list-markers"> + <title>Fancy list markers</title> + <orderedlist numeration="arabic"> + <listitem override="2"> + <para> + begins with 2 + </para> + </listitem> + <listitem> + <para> + and now 3 + </para> + <para> + with a continuation + </para> + <orderedlist numeration="lowerroman" spacing="compact"> + <listitem override="4"> + <para> + sublist with roman numerals, starting with 4 + </para> + </listitem> + <listitem> + <para> + more items + </para> + <orderedlist numeration="upperalpha" spacing="compact"> + <listitem> + <para> + a subsublist + </para> + </listitem> + <listitem> + <para> + a subsublist + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Nesting: + </para> + <orderedlist numeration="upperalpha" spacing="compact"> + <listitem> + <para> + Upper Alpha + </para> + <orderedlist numeration="upperroman" spacing="compact"> + <listitem> + <para> + Upper Roman. + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem override="6"> + <para> + Decimal start with 6 + </para> + <orderedlist numeration="loweralpha" spacing="compact"> + <listitem override="3"> + <para> + Lower alpha with paren + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Autonumbering: + </para> + <orderedlist spacing="compact"> + <listitem> + <para> + Autonumber. + </para> + </listitem> + <listitem> + <para> + More. + </para> + <orderedlist spacing="compact"> + <listitem> + <para> + Nested. + </para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> + <para> + Should not be a list item: + </para> + <para> + M.A. 2007 + </para> + <para> + B. Williams + </para> + </section> + </section> + <section xml:id="definition-lists"> + <title>Definition Lists</title> <para> - Asterisks tight: + Tight using spaces: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - asterisk 1 - </para> - </listitem> - <listitem> - <para> - asterisk 2 - </para> - </listitem> - <listitem> - <para> - asterisk 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Asterisks loose: + Tight using tabs: </para> - <itemizedlist> - <listitem> - <para> - asterisk 1 - </para> - </listitem> - <listitem> - <para> - asterisk 2 - </para> - </listitem> - <listitem> - <para> - asterisk 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Pluses tight: + Loose: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Plus 1 - </para> - </listitem> - <listitem> - <para> - Plus 2 - </para> - </listitem> - <listitem> - <para> - Plus 3 - </para> - </listitem> - </itemizedlist> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + banana + </term> + <listitem> + <para> + yellow fruit + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Pluses loose: + Multiple blocks with italics: </para> - <itemizedlist> - <listitem> - <para> - Plus 1 - </para> - </listitem> - <listitem> - <para> - Plus 2 - </para> - </listitem> - <listitem> - <para> - Plus 3 - </para> - </listitem> - </itemizedlist> + <variablelist> + <varlistentry> + <term> + <emphasis>apple</emphasis> + </term> + <listitem> + <para> + red fruit + </para> + <para> + contains seeds, crisp, pleasant to taste + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <emphasis>orange</emphasis> + </term> + <listitem> + <para> + orange fruit + </para> + <programlisting> +{ orange code block } +</programlisting> + <blockquote> + <para> + orange block quote + </para> + </blockquote> + </listitem> + </varlistentry> + </variablelist> <para> - Minuses tight: + Multiple definitions, tight: </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Minus 1 - </para> - </listitem> - <listitem> - <para> - Minus 2 - </para> - </listitem> - <listitem> - <para> - Minus 3 - </para> - </listitem> - </itemizedlist> + <variablelist spacing="compact"> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <para> + bank + </para> + </listitem> + </varlistentry> + </variablelist> <para> - Minuses loose: + Multiple definitions, loose: </para> - <itemizedlist> - <listitem> - <para> - Minus 1 - </para> - </listitem> - <listitem> - <para> - Minus 2 - </para> - </listitem> - <listitem> - <para> - Minus 3 - </para> - </listitem> - </itemizedlist> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <para> + bank + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + Blank line after term, indented marker, alternate markers: + </para> + <variablelist> + <varlistentry> + <term> + apple + </term> + <listitem> + <para> + red fruit + </para> + <para> + computer + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + orange + </term> + <listitem> + <para> + orange fruit + </para> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + sublist + </para> + </listitem> + <listitem> + <para> + sublist + </para> + </listitem> + </orderedlist> + </listitem> + </varlistentry> + </variablelist> </section> - <section xml:id="ordered"> - <title>Ordered</title> + <section xml:id="html-blocks"> + <title>HTML Blocks</title> <para> - Tight: + Simple block on one line: </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second - </para> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> <para> - and: + foo </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - One - </para> - </listitem> - <listitem> - <para> - Two - </para> - </listitem> - <listitem> - <para> - Three - </para> - </listitem> - </orderedlist> <para> - Loose using tabs: + And nested without indentation: </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second - </para> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> <para> - and using spaces: + foo </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - One - </para> - </listitem> - <listitem> - <para> - Two - </para> - </listitem> - <listitem> - <para> - Three - </para> - </listitem> - </orderedlist> <para> - Multiple paragraphs: + bar </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Item 1, graf one. - </para> - <para> - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - </para> - </listitem> - <listitem> - <para> - Item 2. - </para> - </listitem> - <listitem> - <para> - Item 3. - </para> - </listitem> - </orderedlist> - </section> - <section xml:id="nested"> - <title>Nested</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Tab - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> <para> - Here’s another: + Interpreted markdown in a table: </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Fee - </para> - </listitem> - <listitem> - <para> - Fie - </para> - </listitem> - <listitem> - <para> - Foe - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> + This is <emphasis>emphasized</emphasis> + And this is <emphasis role="strong">strong</emphasis> <para> - Same thing but with paragraphs: + Here’s a simple block: + </para> + <para> + foo + </para> + <para> + This should be a code block, though: + </para> + <programlisting> +<div> + foo +</div> +</programlisting> + <para> + As should this: + </para> + <programlisting> +<div>foo</div> +</programlisting> + <para> + Now, nested: + </para> + <para> + foo + </para> + <para> + This should just be an HTML comment: + </para> + <para> + Multiline: + </para> + <para> + Code block: + </para> + <programlisting> +<!-- Comment --> +</programlisting> + <para> + Just plain comment, with trailing spaces on the line: + </para> + <para> + Code: + </para> + <programlisting> +<hr /> +</programlisting> + <para> + Hr’s: </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - First - </para> - </listitem> - <listitem> - <para> - Second: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Fee - </para> - </listitem> - <listitem> - <para> - Fie - </para> - </listitem> - <listitem> - <para> - Foe - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Third - </para> - </listitem> - </orderedlist> </section> - <section xml:id="tabs-and-spaces"> - <title>Tabs and spaces</title> - <itemizedlist> - <listitem> - <para> - this is a list item indented with tabs - </para> - </listitem> - <listitem> - <para> - this is a list item indented with spaces - </para> - <itemizedlist> - <listitem> - <para> - this is an example list item indented with tabs - </para> - </listitem> - <listitem> - <para> - this is an example list item indented with spaces - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> + <section xml:id="inline-markup"> + <title>Inline Markup</title> + <para> + This is <emphasis>emphasized</emphasis>, and so <emphasis>is + this</emphasis>. + </para> + <para> + This is <emphasis role="strong">strong</emphasis>, and so + <emphasis role="strong">is this</emphasis>. + </para> + <para> + An <emphasis><link xlink:href="/url">emphasized link</link></emphasis>. + </para> + <para> + <emphasis role="strong"><emphasis>This is strong and + em.</emphasis></emphasis> + </para> + <para> + So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. + </para> + <para> + <emphasis role="strong"><emphasis>This is strong and + em.</emphasis></emphasis> + </para> + <para> + So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. + </para> + <para> + This is code: <literal>></literal>, <literal>$</literal>, + <literal>\</literal>, <literal>\$</literal>, + <literal><html></literal>. + </para> + <para> + <emphasis role="strikethrough">This is + <emphasis>strikeout</emphasis>.</emphasis> + </para> + <para> + Superscripts: a<superscript>bc</superscript>d + a<superscript><emphasis>hello</emphasis></superscript> + a<superscript>hello there</superscript>. + </para> + <para> + Subscripts: H<subscript>2</subscript>O, H<subscript>23</subscript>O, + H<subscript>many of them</subscript>O. + </para> + <para> + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d. + </para> </section> - <section xml:id="fancy-list-markers"> - <title>Fancy list markers</title> - <orderedlist numeration="arabic"> - <listitem override="2"> - <para> - begins with 2 - </para> - </listitem> - <listitem> - <para> - and now 3 - </para> - <para> - with a continuation - </para> - <orderedlist numeration="lowerroman" spacing="compact"> - <listitem override="4"> - <para> - sublist with roman numerals, starting with 4 - </para> - </listitem> - <listitem> - <para> - more items - </para> - <orderedlist numeration="upperalpha" spacing="compact"> - <listitem> - <para> - a subsublist - </para> - </listitem> - <listitem> - <para> - a subsublist - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> + <section xml:id="smart-quotes-ellipses-dashes"> + <title>Smart quotes, ellipses, dashes</title> <para> - Nesting: + <quote>Hello,</quote> said the spider. <quote><quote>Shelob</quote> is + my name.</quote> </para> - <orderedlist numeration="upperalpha" spacing="compact"> - <listitem> - <para> - Upper Alpha - </para> - <orderedlist numeration="upperroman" spacing="compact"> - <listitem> - <para> - Upper Roman. - </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem override="6"> - <para> - Decimal start with 6 - </para> - <orderedlist numeration="loweralpha" spacing="compact"> - <listitem override="3"> - <para> - Lower alpha with paren - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> - </listitem> - </orderedlist> <para> - Autonumbering: + <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are letters. </para> - <orderedlist spacing="compact"> - <listitem> - <para> - Autonumber. - </para> - </listitem> - <listitem> - <para> - More. - </para> - <orderedlist spacing="compact"> - <listitem> - <para> - Nested. - </para> - </listitem> - </orderedlist> - </listitem> - </orderedlist> <para> - Should not be a list item: + <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote> are + names of trees. So is <quote>pine.</quote> </para> <para> - M.A. 2007 + <quote>He said, <quote>I want to go.</quote></quote> Were you alive in + the 70’s? </para> <para> - B. Williams + Here is some quoted <quote><literal>code</literal></quote> and a + <quote><link xlink:href="http://example.com/?foo=1&bar=2">quoted + link</link></quote>. + </para> + <para> + Some dashes: one—two — three—four — five. + </para> + <para> + Dashes between numbers: 5–7, 255–66, 1987–1999. + </para> + <para> + Ellipses…and…and…. </para> </section> -</section> -<section xml:id="definition-lists"> - <title>Definition Lists</title> - <para> - Tight using spaces: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> + <section xml:id="latex"> + <title>LaTeX</title> + <itemizedlist spacing="compact"> <listitem> <para> - red fruit </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + 2 + 2 = 4 </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> <listitem> <para> - yellow fruit + <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> </para> </listitem> - </varlistentry> - </variablelist> - <para> - Tight using tabs: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit + <emphasis>α</emphasis> ∧ <emphasis>ω</emphasis> </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + 223 </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> <listitem> <para> - yellow fruit + <emphasis>p</emphasis>-Tree </para> </listitem> - </varlistentry> - </variablelist> - <para> - Loose: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit + Here’s some display math: + $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + Here’s one that has a line break in it: + <emphasis>α</emphasis> + <emphasis>ω</emphasis> × <emphasis>x</emphasis><superscript>2</superscript>. </para> </listitem> - </varlistentry> - <varlistentry> - <term> - banana - </term> + </itemizedlist> + <para> + These shouldn’t be math: + </para> + <itemizedlist spacing="compact"> <listitem> <para> - yellow fruit + To get the famous equation, write <literal>$e = mc^2$</literal>. </para> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple blocks with italics: - </para> - <variablelist> - <varlistentry> - <term> - <emphasis>apple</emphasis> - </term> <listitem> <para> - red fruit - </para> - <para> - contains seeds, crisp, pleasant to taste + $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It + worked if <quote>lot</quote> is emphasized.) </para> </listitem> - </varlistentry> - <varlistentry> - <term> - <emphasis>orange</emphasis> - </term> <listitem> <para> - orange fruit + Shoes ($20) and socks ($5). </para> - <programlisting> -{ orange code block } -</programlisting> - <blockquote> - <para> - orange block quote - </para> - </blockquote> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple definitions, tight: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + Escaped <literal>$</literal>: $73 <emphasis>this should be + emphasized</emphasis> 23$. </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> + </itemizedlist> + <para> + Here’s a LaTeX table: + </para> + </section> + <section xml:id="special-characters"> + <title>Special Characters</title> + <para> + Here is some unicode: + </para> + <itemizedlist spacing="compact"> <listitem> <para> - orange fruit - </para> - <para> - bank + I hat: Î </para> </listitem> - </varlistentry> - </variablelist> - <para> - Multiple definitions, loose: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + o umlaut: ö </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit - </para> - <para> - bank + section: § </para> </listitem> - </varlistentry> - </variablelist> - <para> - Blank line after term, indented marker, alternate markers: - </para> - <variablelist> - <varlistentry> - <term> - apple - </term> <listitem> <para> - red fruit - </para> - <para> - computer + set membership: ∈ </para> </listitem> - </varlistentry> - <varlistentry> - <term> - orange - </term> <listitem> <para> - orange fruit + copyright: © </para> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - sublist - </para> - </listitem> - <listitem> - <para> - sublist - </para> - </listitem> - </orderedlist> </listitem> - </varlistentry> - </variablelist> -</section> -<section xml:id="html-blocks"> - <title>HTML Blocks</title> - <para> - Simple block on one line: - </para> - <para> - foo - </para> - <para> - And nested without indentation: - </para> - <para> - foo - </para> - <para> - bar - </para> - <para> - Interpreted markdown in a table: - </para> - This is <emphasis>emphasized</emphasis> - And this is <emphasis role="strong">strong</emphasis> - <para> - Here’s a simple block: - </para> - <para> - foo - </para> - <para> - This should be a code block, though: - </para> - <programlisting> -<div> - foo -</div> -</programlisting> - <para> - As should this: - </para> - <programlisting> -<div>foo</div> -</programlisting> - <para> - Now, nested: - </para> - <para> - foo - </para> - <para> - This should just be an HTML comment: - </para> - <para> - Multiline: - </para> - <para> - Code block: - </para> - <programlisting> -<!-- Comment --> -</programlisting> - <para> - Just plain comment, with trailing spaces on the line: - </para> - <para> - Code: - </para> - <programlisting> -<hr /> -</programlisting> - <para> - Hr’s: - </para> -</section> -<section xml:id="inline-markup"> - <title>Inline Markup</title> - <para> - This is <emphasis>emphasized</emphasis>, and so <emphasis>is - this</emphasis>. - </para> - <para> - This is <emphasis role="strong">strong</emphasis>, and so - <emphasis role="strong">is this</emphasis>. - </para> - <para> - An <emphasis><link xlink:href="/url">emphasized link</link></emphasis>. - </para> - <para> - <emphasis role="strong"><emphasis>This is strong and - em.</emphasis></emphasis> - </para> - <para> - So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. - </para> - <para> - <emphasis role="strong"><emphasis>This is strong and - em.</emphasis></emphasis> - </para> - <para> - So is <emphasis role="strong"><emphasis>this</emphasis></emphasis> word. - </para> - <para> - This is code: <literal>></literal>, <literal>$</literal>, - <literal>\</literal>, <literal>\$</literal>, - <literal><html></literal>. - </para> - <para> - <emphasis role="strikethrough">This is - <emphasis>strikeout</emphasis>.</emphasis> - </para> - <para> - Superscripts: a<superscript>bc</superscript>d - a<superscript><emphasis>hello</emphasis></superscript> - a<superscript>hello there</superscript>. - </para> - <para> - Subscripts: H<subscript>2</subscript>O, H<subscript>23</subscript>O, - H<subscript>many of them</subscript>O. - </para> - <para> - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - </para> -</section> -<section xml:id="smart-quotes-ellipses-dashes"> - <title>Smart quotes, ellipses, dashes</title> - <para> - <quote>Hello,</quote> said the spider. <quote><quote>Shelob</quote> is my - name.</quote> - </para> - <para> - <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are letters. - </para> - <para> - <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote> are names - of trees. So is <quote>pine.</quote> - </para> - <para> - <quote>He said, <quote>I want to go.</quote></quote> Were you alive in the - 70’s? - </para> - <para> - Here is some quoted <quote><literal>code</literal></quote> and a - <quote><link xlink:href="http://example.com/?foo=1&bar=2">quoted - link</link></quote>. - </para> - <para> - Some dashes: one—two — three—four — five. - </para> - <para> - Dashes between numbers: 5–7, 255–66, 1987–1999. - </para> - <para> - Ellipses…and…and…. - </para> -</section> -<section xml:id="latex"> - <title>LaTeX</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - </para> - </listitem> - <listitem> - <para> - 2 + 2 = 4 - </para> - </listitem> - <listitem> - <para> - <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> - </para> - </listitem> - <listitem> - <para> - <emphasis>α</emphasis> ∧ <emphasis>ω</emphasis> - </para> - </listitem> - <listitem> - <para> - 223 - </para> - </listitem> - <listitem> - <para> - <emphasis>p</emphasis>-Tree - </para> - </listitem> - <listitem> - <para> - Here’s some display math: - $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ - </para> - </listitem> - <listitem> - <para> - Here’s one that has a line break in it: - <emphasis>α</emphasis> + <emphasis>ω</emphasis> × <emphasis>x</emphasis><superscript>2</superscript>. - </para> - </listitem> - </itemizedlist> - <para> - These shouldn’t be math: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - To get the famous equation, write <literal>$e = mc^2$</literal>. - </para> - </listitem> - <listitem> - <para> - $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It - worked if <quote>lot</quote> is emphasized.) - </para> - </listitem> - <listitem> - <para> - Shoes ($20) and socks ($5). - </para> - </listitem> - <listitem> - <para> - Escaped <literal>$</literal>: $73 <emphasis>this should be - emphasized</emphasis> 23$. - </para> - </listitem> - </itemizedlist> - <para> - Here’s a LaTeX table: - </para> -</section> -<section xml:id="special-characters"> - <title>Special Characters</title> - <para> - Here is some unicode: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - I hat: Î - </para> - </listitem> - <listitem> - <para> - o umlaut: ö - </para> - </listitem> - <listitem> - <para> - section: § - </para> - </listitem> - <listitem> - <para> - set membership: ∈ - </para> - </listitem> - <listitem> - <para> - copyright: © - </para> - </listitem> - </itemizedlist> - <para> - AT&T has an ampersand in their name. - </para> - <para> - AT&T is another way to write it. - </para> - <para> - This & that. - </para> - <para> - 4 < 5. - </para> - <para> - 6 > 5. - </para> - <para> - Backslash: \ - </para> - <para> - Backtick: ` - </para> - <para> - Asterisk: * - </para> - <para> - Underscore: _ - </para> - <para> - Left brace: { - </para> - <para> - Right brace: } - </para> - <para> - Left bracket: [ - </para> - <para> - Right bracket: ] - </para> - <para> - Left paren: ( - </para> - <para> - Right paren: ) - </para> - <para> - Greater-than: > - </para> - <para> - Hash: # - </para> - <para> - Period: . - </para> - <para> - Bang: ! - </para> - <para> - Plus: + - </para> - <para> - Minus: - - </para> -</section> -<section xml:id="links"> - <title>Links</title> - <section xml:id="explicit"> - <title>Explicit</title> - <para> - Just a <link xlink:href="/url/">URL</link>. - </para> + </itemizedlist> <para> - <link xlink:href="/url/">URL and title</link>. + AT&T has an ampersand in their name. </para> <para> - <link xlink:href="/url/">URL and title</link>. + AT&T is another way to write it. </para> <para> - <link xlink:href="/url/">URL and title</link>. + This & that. </para> <para> - <link xlink:href="/url/">URL and title</link> + 4 < 5. </para> <para> - <link xlink:href="/url/">URL and title</link> + 6 > 5. </para> <para> - <link xlink:href="/url/with_underscore">with_underscore</link> + Backslash: \ </para> <para> - Email link (<email>nobody@nowhere.net</email>) + Backtick: ` </para> <para> - <link xlink:href="">Empty</link>. + Asterisk: * </para> - </section> - <section xml:id="reference"> - <title>Reference</title> <para> - Foo <link xlink:href="/url/">bar</link>. + Underscore: _ </para> <para> - With <link xlink:href="/url/">embedded [brackets]</link>. + Left brace: { </para> <para> - <link xlink:href="/url/">b</link> by itself should be a link. + Right brace: } </para> <para> - Indented <link xlink:href="/url">once</link>. + Left bracket: [ </para> <para> - Indented <link xlink:href="/url">twice</link>. + Right bracket: ] </para> <para> - Indented <link xlink:href="/url">thrice</link>. + Left paren: ( </para> <para> - This should [not][] be a link. + Right paren: ) </para> - <programlisting> -[not]: /url -</programlisting> <para> - Foo <link xlink:href="/url/">bar</link>. + Greater-than: > </para> <para> - Foo <link xlink:href="/url/">biz</link>. + Hash: # </para> - </section> - <section xml:id="with-ampersands"> - <title>With ampersands</title> <para> - Here’s a <link xlink:href="http://example.com/?foo=1&bar=2">link - with an ampersand in the URL</link>. + Period: . </para> <para> - Here’s a link with an amersand in the link text: - <link xlink:href="http://att.com/">AT&T</link>. + Bang: ! </para> <para> - Here’s an <link xlink:href="/script?foo=1&bar=2">inline link</link>. + Plus: + </para> <para> - Here’s an <link xlink:href="/script?foo=1&bar=2">inline link in - pointy braces</link>. + Minus: - </para> </section> - <section xml:id="autolinks"> - <title>Autolinks</title> - <para> - With an ampersand: - <link xlink:href="http://example.com/?foo=1&bar=2" role="uri">http://example.com/?foo=1&bar=2</link> - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - In a list? - </para> - </listitem> - <listitem> - <para> - <link xlink:href="http://example.com/" role="uri">http://example.com/</link> - </para> - </listitem> - <listitem> - <para> - It should. - </para> - </listitem> - </itemizedlist> - <para> - An e-mail address: <email>nobody@nowhere.net</email> - </para> - <blockquote> + <section xml:id="links"> + <title>Links</title> + <section xml:id="explicit"> + <title>Explicit</title> <para> - Blockquoted: - <link xlink:href="http://example.com/" role="uri">http://example.com/</link> + Just a <link xlink:href="/url/">URL</link>. + </para> + <para> + <link xlink:href="/url/">URL and title</link>. + </para> + <para> + <link xlink:href="/url/">URL and title</link>. + </para> + <para> + <link xlink:href="/url/">URL and title</link>. + </para> + <para> + <link xlink:href="/url/">URL and title</link> + </para> + <para> + <link xlink:href="/url/">URL and title</link> </para> - </blockquote> - <para> - Auto-links should not occur here: - <literal><http://example.com/></literal> - </para> - <programlisting> -or here: <http://example.com/> -</programlisting> - </section> -</section> -<section xml:id="images"> - <title>Images</title> - <para> - From <quote>Voyage dans la Lune</quote> by Georges Melies (1902): - </para> - <figure> - <title>lalune</title> - <mediaobject> - <imageobject> - <imagedata fileref="lalune.jpg" /> - </imageobject> - <textobject><phrase>lalune</phrase></textobject> - </mediaobject> - </figure> - <para> - Here is a movie <inlinemediaobject> - <imageobject> - <imagedata fileref="movie.jpg" /> - </imageobject> - </inlinemediaobject> icon. - </para> -</section> -<section xml:id="footnotes"> - <title>Footnotes</title> - <para> - Here is a footnote reference,<footnote> <para> - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. + <link xlink:href="/url/with_underscore">with_underscore</link> </para> - </footnote> and another.<footnote> <para> - Here’s the long note. This one contains multiple blocks. + Email link (<email>nobody@nowhere.net</email>) </para> <para> - Subsequent blocks are indented to show that they belong to the - footnote (as with list items). + <link xlink:href="">Empty</link>. + </para> + </section> + <section xml:id="reference"> + <title>Reference</title> + <para> + Foo <link xlink:href="/url/">bar</link>. + </para> + <para> + With <link xlink:href="/url/">embedded [brackets]</link>. + </para> + <para> + <link xlink:href="/url/">b</link> by itself should be a link. + </para> + <para> + Indented <link xlink:href="/url">once</link>. + </para> + <para> + Indented <link xlink:href="/url">twice</link>. + </para> + <para> + Indented <link xlink:href="/url">thrice</link>. + </para> + <para> + This should [not][] be a link. </para> <programlisting> - { <code> } +[not]: /url </programlisting> <para> - If you want, you can indent every line, but you can also be lazy and - just indent the first line of each block. + Foo <link xlink:href="/url/">bar</link>. </para> - </footnote> This should <emphasis>not</emphasis> be a footnote reference, - because it contains a space.[^my note] Here is an inline note.<footnote> <para> - This is <emphasis>easier</emphasis> to type. Inline notes may contain - <link xlink:href="http://google.com">links</link> and - <literal>]</literal> verbatim characters, as well as [bracketed text]. + Foo <link xlink:href="/url/">biz</link>. </para> - </footnote> - </para> - <blockquote> + </section> + <section xml:id="with-ampersands"> + <title>With ampersands</title> + <para> + Here’s a <link xlink:href="http://example.com/?foo=1&bar=2">link + with an ampersand in the URL</link>. + </para> + <para> + Here’s a link with an amersand in the link text: + <link xlink:href="http://att.com/">AT&T</link>. + </para> + <para> + Here’s an <link xlink:href="/script?foo=1&bar=2">inline + link</link>. + </para> + <para> + Here’s an <link xlink:href="/script?foo=1&bar=2">inline link in + pointy braces</link>. + </para> + </section> + <section xml:id="autolinks"> + <title>Autolinks</title> + <para> + With an ampersand: + <link xlink:href="http://example.com/?foo=1&bar=2" role="uri">http://example.com/?foo=1&bar=2</link> + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + In a list? + </para> + </listitem> + <listitem> + <para> + <link xlink:href="http://example.com/" role="uri">http://example.com/</link> + </para> + </listitem> + <listitem> + <para> + It should. + </para> + </listitem> + </itemizedlist> + <para> + An e-mail address: <email>nobody@nowhere.net</email> + </para> + <blockquote> + <para> + Blockquoted: + <link xlink:href="http://example.com/" role="uri">http://example.com/</link> + </para> + </blockquote> + <para> + Auto-links should not occur here: + <literal><http://example.com/></literal> + </para> + <programlisting> +or here: <http://example.com/> +</programlisting> + </section> + </section> + <section xml:id="images"> + <title>Images</title> <para> - Notes can go in quotes.<footnote> + From <quote>Voyage dans la Lune</quote> by Georges Melies (1902): + </para> + <figure> + <title>lalune</title> + <mediaobject> + <imageobject> + <imagedata fileref="lalune.jpg" /> + </imageobject> + <textobject><phrase>lalune</phrase></textobject> + </mediaobject> + </figure> + <para> + Here is a movie <inlinemediaobject> + <imageobject> + <imagedata fileref="movie.jpg" /> + </imageobject> + </inlinemediaobject> icon. + </para> + </section> + <section xml:id="footnotes"> + <title>Footnotes</title> + <para> + Here is a footnote reference,<footnote> + <para> + Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. + </para> + </footnote> and another.<footnote> + <para> + Here’s the long note. This one contains multiple blocks. + </para> + <para> + Subsequent blocks are indented to show that they belong to the + footnote (as with list items). + </para> + <programlisting> + { <code> } +</programlisting> <para> - 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. + </para> + </footnote> This should <emphasis>not</emphasis> be a footnote + reference, because it contains a space.[^my note] Here is an inline + note.<footnote> + <para> + This is <emphasis>easier</emphasis> to type. Inline notes may + contain <link xlink:href="http://google.com">links</link> and + <literal>]</literal> verbatim characters, as well as [bracketed + text]. </para> </footnote> </para> - </blockquote> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> + <blockquote> <para> - And in list items.<footnote> + Notes can go in quotes.<footnote> <para> - In list. + In quote. </para> </footnote> </para> - </listitem> - </orderedlist> - <para> - This paragraph should not be part of the note, as it is not indented. - </para> -</section> + </blockquote> + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para> + And in list items.<footnote> + <para> + In list. + </para> + </footnote> + </para> + </listitem> + </orderedlist> + <para> + This paragraph should not be part of the note, as it is not indented. + </para> + </section> </article> 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. + |