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/html-reader.native | 13 +++-- tests/latex-reader.native | 72 +++++++++++------------ tests/rst-reader.native | 60 ++++++++++---------- tests/testsuite.native | 103 +++++++++++++++++++++------------ tests/testsuite.txt | 42 +++++++++++++- tests/writer.context | 47 ++++++++++++++++ tests/writer.docbook | 102 +++++++++++++++++++++++++++++++++ tests/writer.html | 66 ++++++++++++++++++++++ tests/writer.latex | 47 ++++++++++++++++ tests/writer.man | 55 ++++++++++++++++++ tests/writer.markdown | 42 +++++++++++++- tests/writer.mediawiki | 59 +++++++++++++++++++ tests/writer.native | 103 +++++++++++++++++++++------------ tests/writer.opendocument | 141 +++++++++++++++++++++++++++++----------------- tests/writer.rst | 37 ++++++++++++ tests/writer.rtf | 22 ++++++++ tests/writer.texinfo | 52 +++++++++++++++++ 17 files changed, 862 insertions(+), 201 deletions(-) (limited to 'tests') diff --git a/tests/html-reader.native b/tests/html-reader.native index ae371f1c0..42ba648d8 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -181,12 +181,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") , HorizontalRule , Header 2 [Str "Definition"] , DefinitionList - [ ([Str "Violin"], - [ Plain [Str "Stringed",Space,Str "musical",Space,Str "instrument."] - , Plain [Str "Torture",Space,Str "device."] ] ), - ([Str "Cello",LineBreak,Str "Violoncello"], - [ Plain [Str "Low-voiced",Space,Str "stringed",Space,Str "instrument."] ] - ) ] + [ ([Str "Violin"], + [ [ Plain [Str "Stringed",Space,Str "musical",Space,Str "instrument."] ] + , [ Plain [Str "Torture",Space,Str "device."] ] + ]) + , ([Str "Cello",LineBreak,Str "Violoncello"], + [ [ Plain [Str "Low-voiced",Space,Str "stringed",Space,Str "instrument."] ] + ]) ] , HorizontalRule , Header 1 [Str "HTML",Space,Str "Blocks"] , Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 4a239bc07..68212071f 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -185,48 +185,48 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Header 1 [Str "Definition",Space,Str "Lists"] , Para [Str "Tight",Space,Str "using",Space,Str "spaces:"] , DefinitionList - [ ([Str "apple"], - [ Para [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Para [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Para [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Para [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Tight",Space,Str "using",Space,Str "tabs:"] , DefinitionList - [ ([Str "apple"], - [ Para [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Para [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Para [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Para [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Loose:"] , DefinitionList - [ ([Str "apple"], - [ Para [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Para [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Para [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Para [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] , DefinitionList - [ ([Emph [Str "apple"]], - [ Para [Str "red",Space,Str "fruit"] - , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ] ), - ([Emph [Str "orange"]], - [ Para [Str "orange",Space,Str "fruit"] - , CodeBlock ("",[],[]) "{ orange code block }" - , BlockQuote - [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] - ] ) ] + [ ([Emph [Str "apple"]], + [ [ Para [Str "red",Space,Str "fruit"] + , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ]]) + , ([Emph [Str "orange"]], + [ [ Para [Str "orange",Space,Str "fruit"] + , CodeBlock ("",[],[]) "{ orange code block }" + , BlockQuote + [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] + ]]) ] , Header 1 [Str "HTML",Space,Str "Blocks"] , Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] , Para [Str "foo",Space,Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 294be318c..22de678b3 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -1,8 +1,8 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str "Subtitle"] ["John MacFarlane","Anonymous"] "July 17, 2006") [ DefinitionList - [ ([Str "Revision"], - [ Plain [Str "3"] ] - ) ] + [ ([Str "Revision"], + [ [ Plain [Str "3"] ] + ]) ] , Header 1 [Str "Level",Space,Str "one",Space,Str "header"] , Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."] , Header 2 [Str "Level",Space,Str "two",Space,Str "header"] @@ -154,36 +154,36 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str , [ Plain [Str "item",Space,Str "2"] ] ] , Header 2 [Str "Definition"] , DefinitionList - [ ([Str "term",Space,Str "1"], - [ Para [Str "Definition",Space,Str "1."] ] - ), - ([Str "term",Space,Str "2"], - [ Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "1."] - , Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "2."] ] ), - ([Str "term",Space,Str "with",Space,Emph [Str "emphasis"]], - [ Para [Str "Definition",Space,Str "3."] ] - ) ] + [ ([Str "term",Space,Str "1"], + [ [ Para [Str "Definition",Space,Str "1."] ] + ]) + , ([Str "term",Space,Str "2"], + [ [ Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "1."] + , Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "2."] ]]) + , ([Str "term",Space,Str "with",Space,Emph [Str "emphasis"]], + [ [ Para [Str "Definition",Space,Str "3."] ] + ]) ] , Header 1 [Str "Field",Space,Str "Lists"] , DefinitionList - [ ([Str "address"], - [ Plain [Str "61",Space,Str "Main",Space,Str "St."] ] - ), - ([Str "city"], - [ Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"] ] - ), - ([Str "phone"], - [ Plain [Str "123",Str "-",Str "4567"] ] - ) ] + [ ([Str "address"], + [ [ Plain [Str "61",Space,Str "Main",Space,Str "St."] ] + ]) + , ([Str "city"], + [ [ Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"] ] + ]) + , ([Str "phone"], + [ [ Plain [Str "123",Str "-",Str "4567"] ] + ]) ] , DefinitionList - [ ([Str "address"], - [ Plain [Str "61",Space,Str "Main",Space,Str "St."] ] - ), - ([Str "city"], - [ Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"] ] - ), - ([Str "phone"], - [ Plain [Str "123",Str "-",Str "4567"] ] - ) ] + [ ([Str "address"], + [ [ Plain [Str "61",Space,Str "Main",Space,Str "St."] ] + ]) + , ([Str "city"], + [ [ Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"] ] + ]) + , ([Str "phone"], + [ [ Plain [Str "123",Str "-",Str "4567"] ] + ]) ] , Header 1 [Str "HTML",Space,Str "Blocks"] , Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] , RawHtml "
foo
\n" diff --git a/tests/testsuite.native b/tests/testsuite.native index 5f2459ffb..e58e5ff10 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -171,48 +171,79 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Header 1 [Str "Definition",Space,Str "Lists"] , Para [Str "Tight",Space,Str "using",Space,Str "spaces:"] , DefinitionList - [ ([Str "apple"], - [ Plain [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Plain [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Plain [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Plain [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Tight",Space,Str "using",Space,Str "tabs:"] , DefinitionList - [ ([Str "apple"], - [ Plain [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Plain [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Plain [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Plain [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Loose:"] , DefinitionList - [ ([Str "apple"], - [ Para [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Para [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Para [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Para [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] , DefinitionList - [ ([Emph [Str "apple"]], - [ Para [Str "red",Space,Str "fruit"] - , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ] ), - ([Emph [Str "orange"]], - [ Para [Str "orange",Space,Str "fruit"] - , CodeBlock ("",[],[]) "{ orange code block }" - , BlockQuote - [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] - ] ) ] + [ ([Emph [Str "apple"]], + [ [ Para [Str "red",Space,Str "fruit"] + , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ]]) + , ([Emph [Str "orange"]], + [ [ Para [Str "orange",Space,Str "fruit"] + , CodeBlock ("",[],[]) "{ orange code block }" + , BlockQuote + [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] + ]]) ] +, Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"] +, DefinitionList + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + , [ Plain [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + , [ Plain [Str "bank"] ] + ]) ] +, Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"] +, DefinitionList + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + , [ Para [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + , [ Para [Str "bank"] ] + ]) ] +, Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"] +, DefinitionList + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + , [ Para [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] + , OrderedList (1,Decimal,Period) + [ [ Plain [Str "sublist"] ] + , [ Plain [Str "sublist"] ] ] ]]) ] , Header 1 [Str "HTML",Space,Str "Blocks"] , Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] , RawHtml "
" diff --git a/tests/testsuite.txt b/tests/testsuite.txt index 357739e08..6f24f02ed 100644 --- a/tests/testsuite.txt +++ b/tests/testsuite.txt @@ -300,15 +300,51 @@ Multiple blocks with italics: *apple* : red fruit -: contains seeds, + contains seeds, crisp, pleasant to taste *orange* : orange fruit -: { orange code block } + { orange code block } -: > orange block quote + > 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 + + 1. sublist + 2. sublist # HTML Blocks diff --git a/tests/writer.context b/tests/writer.context index c5529a8df..e04b42dc0 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -514,6 +514,53 @@ orange block quote \stopblockquote \stopdescr +Multiple definitions, tight: + +\startdescr{apple} +red fruit + +computer +\stopdescr + +\startdescr{orange} +orange fruit + +bank +\stopdescr + +Multiple definitions, loose: + +\startdescr{apple} +red fruit + +computer +\stopdescr + +\startdescr{orange} +orange fruit + +bank +\stopdescr + +Blank line after term, indented marker, alternate markers: + +\startdescr{apple} +red fruit + +computer +\stopdescr + +\startdescr{orange} +orange fruit + +\startitemize[n][stopper=.] +\item + sublist +\item + sublist +\stopitemize +\stopdescr + \subject{HTML Blocks} Simple block on one line: diff --git a/tests/writer.docbook b/tests/writer.docbook index bc04d043d..75c1febf1 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -756,6 +756,108 @@ These should not be escaped: \$ \\ \> \[ \{ + + 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 diff --git a/tests/writer.html b/tests/writer.html index ece782f81..ea9c99649 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -540,6 +540,72 @@ These should not be escaped: \$ \\ \> \[ \{ >

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

  1. sublist
  2. sublist

orange block quote + > 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 + + 1. sublist + 2. sublist # HTML Blocks diff --git a/tests/writer.mediawiki b/tests/writer.mediawiki index fc9db6faa..4dd69708b 100644 --- a/tests/writer.mediawiki +++ b/tests/writer.mediawiki @@ -57,6 +57,7 @@ A list: # item one # item two + Nested block quotes:
nested @@ -98,31 +99,37 @@ Asterisks tight: * asterisk 1 * asterisk 2 * asterisk 3 + Asterisks loose: * asterisk 1 * asterisk 2 * asterisk 3 + Pluses tight: * Plus 1 * Plus 2 * Plus 3 + Pluses loose: * Plus 1 * Plus 2 * Plus 3 + Minuses tight: * Minus 1 * Minus 2 * Minus 3 + Minuses loose: * Minus 1 * Minus 2 * Minus 3 + === Ordered === Tight: @@ -130,21 +137,25 @@ Tight: # First # Second # Third + and: # One # Two # Three + Loose using tabs: # First # Second # Third + and using spaces: # One # Two # Three + Multiple paragraphs:
    @@ -158,6 +169,9 @@ Multiple paragraphs: * Tab ** Tab *** Tab + + + Here’s another: # First @@ -165,7 +179,9 @@ Here’s another: #* Fee #* Fie #* Foe + # Third + Same thing but with paragraphs: # First @@ -173,13 +189,17 @@ Same thing but with paragraphs: #* Fee #* Fie #* Foe + # Third + === Tabs and spaces === * this is a list item indented with tabs * this is a list item indented with spaces ** this is an example list item indented with tabs ** this is an example list item indented with spaces + + === Fancy list markers ===
      @@ -214,6 +234,8 @@ Autonumbering: # Autonumber. # More. ## Nested. + + Should not be a list item: M.A. 2007 @@ -233,6 +255,7 @@ Tight using spaces: : orange fruit ; banana : yellow fruit + Tight using tabs: ; apple @@ -241,6 +264,7 @@ Tight using tabs: : orange fruit ; banana : yellow fruit + Loose: ; apple @@ -249,6 +273,7 @@ Loose: : orange fruit ; banana : yellow fruit + Multiple blocks with italics:
      @@ -260,6 +285,35 @@ Multiple blocks with italics: 
      { 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 line: @@ -430,12 +484,14 @@ Ellipses…and…and…. * p-Tree * Here’s some display math: \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} * Here’s one that has a line break in it: \alpha + \omega \times x^2. + These shouldn’t be math: * To get the famous equation, write $e = mc^2$. * $22,000 is a ''lot'' of money. So is $34,000. (It worked if “lot” is emphasized.) * Shoes ($20) and socks ($5). * Escaped $: $73 ''this should be emphasized'' 23$. + Here’s a LaTeX table: @@ -452,6 +508,7 @@ Here is some unicode: * section: § * set membership: ∈ * copyright: © + AT&T has an ampersand in their name. AT&T is another way to write it. @@ -561,6 +618,7 @@ With an ampersand: http://example.com/?foo=1&bar=2 * In a list? * http://example.com/ * It should. + An e-mail address: [mailto:nobody@nowhere.net nobody@nowhere.net]
      Blockquoted: http://example.com/ @@ -598,6 +656,7 @@ If you want, you can indent every line, but you can also be lazy and just indent
      # And in list items.In list. + This paragraph should not be part of the note, as it is not indented. == Notes == diff --git a/tests/writer.native b/tests/writer.native index 5f2459ffb..e58e5ff10 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -171,48 +171,79 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Header 1 [Str "Definition",Space,Str "Lists"] , Para [Str "Tight",Space,Str "using",Space,Str "spaces:"] , DefinitionList - [ ([Str "apple"], - [ Plain [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Plain [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Plain [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Plain [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Tight",Space,Str "using",Space,Str "tabs:"] , DefinitionList - [ ([Str "apple"], - [ Plain [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Plain [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Plain [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Plain [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Loose:"] , DefinitionList - [ ([Str "apple"], - [ Para [Str "red",Space,Str "fruit"] ] - ), - ([Str "orange"], - [ Para [Str "orange",Space,Str "fruit"] ] - ), - ([Str "banana"], - [ Para [Str "yellow",Space,Str "fruit"] ] - ) ] + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + ]) + , ([Str "banana"], + [ [ Para [Str "yellow",Space,Str "fruit"] ] + ]) ] , Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] , DefinitionList - [ ([Emph [Str "apple"]], - [ Para [Str "red",Space,Str "fruit"] - , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ] ), - ([Emph [Str "orange"]], - [ Para [Str "orange",Space,Str "fruit"] - , CodeBlock ("",[],[]) "{ orange code block }" - , BlockQuote - [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] - ] ) ] + [ ([Emph [Str "apple"]], + [ [ Para [Str "red",Space,Str "fruit"] + , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ]]) + , ([Emph [Str "orange"]], + [ [ Para [Str "orange",Space,Str "fruit"] + , CodeBlock ("",[],[]) "{ orange code block }" + , BlockQuote + [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] + ]]) ] +, Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"] +, DefinitionList + [ ([Str "apple"], + [ [ Plain [Str "red",Space,Str "fruit"] ] + , [ Plain [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Plain [Str "orange",Space,Str "fruit"] ] + , [ Plain [Str "bank"] ] + ]) ] +, Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"] +, DefinitionList + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + , [ Para [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] ] + , [ Para [Str "bank"] ] + ]) ] +, Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"] +, DefinitionList + [ ([Str "apple"], + [ [ Para [Str "red",Space,Str "fruit"] ] + , [ Para [Str "computer"] ] + ]) + , ([Str "orange"], + [ [ Para [Str "orange",Space,Str "fruit"] + , OrderedList (1,Decimal,Period) + [ [ Plain [Str "sublist"] ] + , [ Plain [Str "sublist"] ] ] ]]) ] , Header 1 [Str "HTML",Space,Str "Blocks"] , Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] , RawHtml "
      " 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. diff --git a/tests/writer.rst b/tests/writer.rst index 408ca357c..993df642f 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -386,6 +386,43 @@ Multiple blocks with italics: +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 + + + 1. sublist + 2. sublist + + HTML Blocks =========== diff --git a/tests/writer.rtf b/tests/writer.rtf index 6ee7bfae0..46ee22c28 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -181,6 +181,28 @@ These should not be escaped: \\$ \\\\ \\> \\[ \\\{\par} {\pard \ql \f0 \sa180 \li360 \fi0 orange fruit\par} {\pard \ql \f0 \sa180 \li360 \fi0 \f1 \{ orange code block \}\par} {\pard \ql \f0 \sa180 \li1080 \fi0 orange block quote\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Multiple definitions, tight:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa0 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa0 \li360 \fi0 computer\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa0 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa0 \li360 \fi0 bank\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Multiple definitions, loose:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa180 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa180 \li360 \fi0 computer\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa180 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa180 \li360 \fi0 bank\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Blank line after term, indented marker, alternate markers:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa180 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa180 \li360 \fi0 computer\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa180 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa0 \li720 \fi-360 1.\tx360\tab sublist\par} +{\pard \ql \f0 \sa0 \li720 \fi-360 2.\tx360\tab sublist\sa180\sa180\par} {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 HTML Blocks\par} {\pard \ql \f0 \sa180 \li0 \fi0 Simple block on one line:\par} {\pard \ql \f0 \sa0 \li0 \fi0 foo\par} diff --git a/tests/writer.texinfo b/tests/writer.texinfo index 4fae5da6c..703828c7c 100644 --- a/tests/writer.texinfo +++ b/tests/writer.texinfo @@ -586,6 +586,58 @@ orange block quote @end quotation @end table +Multiple definitions@comma{} tight: + +@table @asis +@item apple + +red fruit +computer +@item orange + +orange fruit +bank +@end table + +Multiple definitions@comma{} loose: + +@table @asis +@item apple + +red fruit + +computer + +@item orange + +orange fruit + +bank + +@end table + +Blank line after term@comma{} indented marker@comma{} alternate markers: + +@table @asis +@item apple + +red fruit + +computer + +@item orange + +orange fruit + +@enumerate +@item +sublist +@item +sublist +@end enumerate + +@end table + @node HTML Blocks @chapter HTML Blocks -- cgit v1.2.3