From 5082b5411bdb1acb5b0dba9cbdfa346b96f1e309 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Mon, 7 Dec 2009 08:26:53 +0000 Subject: Improved syntax for markdown definition lists. Definition lists are now more compatible with PHP Markdown Extra. Resolves Issue #24. + You can have multiple definitions for a term (but still not multiple terms). + Multi-block definitions no longer need a column before each block (indeed, this will now cause multiple definitions). + The marker no longer needs to be flush with the left margin, but can be indented at or two spaces. Also, ~ as well as : can be used as the marker (this suggestion due to David Wheeler.) + There can now be a blank line between the term and the definitions. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1656 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/writer.opendocument | 141 +++++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 51 deletions(-) (limited to 'tests/writer.opendocument') diff --git a/tests/writer.opendocument b/tests/writer.opendocument index 587f9efe0..5e3e848f6 100644 --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -498,6 +498,11 @@ + + + + + @@ -529,7 +534,7 @@ - + @@ -561,7 +566,7 @@ - + @@ -593,7 +598,7 @@ - + @@ -625,7 +630,7 @@ - + @@ -825,7 +830,8 @@ - + + @@ -837,8 +843,7 @@ - - + @@ -846,22 +851,25 @@ - + + + + - + - + - - - + + + - + @@ -1269,6 +1277,37 @@ orange fruit { orange code block } orange block quote + Multiple definitions, + tight: + apple + red fruit + computer + orange + orange fruit + bank + Multiple definitions, + loose: + apple + red fruit + computer + orange + orange fruit + bank + Blank line after term, + indented marker, alternate markers: + apple + red fruit + computer + orange + orange fruit + + + sublist + + + sublist + + HTML Blocks Simple block on one @@ -1289,22 +1328,22 @@ foo This should be a code block, though: - <div> - foo - </div> + <div> + foo + </div> As should this: - <div>foo</div> + <div>foo</div> Now, nested: foo This should just be an HTML comment: Multiline: Code block: - <!-- Comment --> + <!-- Comment --> Just plain comment, with trailing spaces on the line: Code: - <hr /> + <hr /> Hr’s: Inline @@ -1371,46 +1410,46 @@ Ellipses…and…and…. LaTeX - + - \cite[22-23]{smith.1899} + \cite[22-23]{smith.1899} - 2+2=4 + 2+2=4 - x ∈ y + x ∈ y - α ∧ ω + α ∧ ω - 223 + 223 - p-Tree + p-Tree - Here’s some display math: \frac{d}{dx}f(x)=\limh → 0\frac{f(x+h)-f(x)}{h} + Here’s some display math: \frac{d}{dx}f(x)=\limh → 0\frac{f(x+h)-f(x)}{h} - Here’s one that has a line break in it: α+ω × x2. + Here’s one that has a line break in it: α+ω × x2. These shouldn’t be math: - + - To get the famous equation, write $e = mc^2$. + To get the famous equation, write $e = mc^2$. - $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.) + $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). + Shoes ($20) and socks ($5). - Escaped $: $73 this should be emphasized 23$. + Escaped $: $73 this should be emphasized 23$. Here’s a LaTeX @@ -1425,21 +1464,21 @@ Cat & 1 \\ \hline Characters Here is some unicode: - + - I hat: Î + I hat: Î - o umlaut: ö + o umlaut: ö - section: § + section: § - set membership: ∈ + set membership: ∈ - copyright: © + copyright: © AT&T has an ampersand in @@ -1497,7 +1536,7 @@ Cat & 1 \\ \hline thrice. This should [not][] be a link. - [not]: /url + [not]: /url Foo bar. Foo @@ -1516,24 +1555,24 @@ Cat & 1 \\ \hline Autolinks With an ampersand: http://example.com/?foo=1&bar=2 - + - In a list? + In a list? - http://example.com/ + http://example.com/ - It should. + It should. An e-mail address: nobody@nowhere.net - Blockquoted: http://example.com/ + Blockquoted: http://example.com/ Auto-links should not occur here: <http://example.com/> - or here: <http://example.com/> + or here: <http://example.com/> Images From @@ -1552,7 +1591,7 @@ Cat & 1 \\ \hline another.2 Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). - { <code> } + { <code> } If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. This should not be a @@ -1560,11 +1599,11 @@ Cat & 1 \\ \hline note] Here is an inline note.3 This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text]. - Notes can go in quotes.4 + Notes can go in quotes.4 In quote. - + - And in list items.5 + And in list items.5 In list. -- cgit v1.2.3