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/testsuite.native | 103 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 36 deletions(-) (limited to 'tests/testsuite.native') 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 "
" -- cgit v1.2.3