diff --git a/tests/testsuite.native b/tests/testsuite.native index a35a32737..091a5898b 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -151,6 +151,51 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane [ [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"] ] , [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"] ] ] ] ] , HorizontalRule +, 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"] ] + ) ] +, 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"] ] + ) ] +, 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"] ] + ) ] +, 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"] ] + ] ) ] , 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 e65e98193..0152af8a7 100644 --- a/tests/testsuite.txt +++ b/tests/testsuite.txt @@ -257,6 +257,52 @@ Same thing but with paragraphs: * * * * * +# Definition Lists + +Tight using spaces: + +apple +: red fruit +orange +: orange fruit +banana +: yellow fruit + +Tight using tabs: + +apple +: red fruit +orange +: orange fruit +banana +: yellow fruit + +Loose: + +apple +: red fruit + +orange +: orange fruit + +banana +: yellow fruit + +Multiple blocks with italics: + +*apple* +: red fruit + +: contains seeds, + crisp, pleasant to taste + +*orange* +: orange fruit + +: { orange code block } + +: > orange block quote + # HTML Blocks Simple block on one line: diff --git a/tests/writer.docbook b/tests/writer.docbook index 675a115cc..7ebe9c251 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -549,6 +549,150 @@ These should not be escaped: \$ \\ \> \[ \{ +
+ Definition Lists + + Tight using spaces: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Tight using tabs: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Loose: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Multiple blocks with italics: + + + + + apple + + + + red fruit + + + contains seeds, crisp, pleasant to taste + + + + + + orange + + + + orange fruit + + +{ orange code block } + +
+ + orange block quote + +
+
+
+
+
Inline Markup diff --git a/tests/writer.html b/tests/writer.html index 9ac41494c..1e167711b 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -388,6 +388,93 @@ These should not be escaped: \$ \\ \> \[ \{ >

Definition Lists

Tight using spaces:

apple
red fruit
orange
orange fruit
banana
yellow fruit

Tight using tabs:

apple
red fruit
orange
orange fruit
banana
yellow fruit

Loose:

apple

red fruit

orange

orange fruit

banana

yellow fruit

Multiple blocks with italics:

apple

red fruit

contains seeds, crisp, pleasant to taste

orange

orange fruit

{ orange code block }
+

orange block quote

HTML Blocks

Simple block on one line:

orange block quote + + # HTML Blocks Simple block on one line: diff --git a/tests/writer.native b/tests/writer.native index a35a32737..091a5898b 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -151,6 +151,51 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane [ [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"] ] , [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"] ] ] ] ] , HorizontalRule +, 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"] ] + ) ] +, 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"] ] + ) ] +, 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"] ] + ) ] +, 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"] ] + ] ) ] , 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.rst b/tests/writer.rst index 1a3bb764e..178709952 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -287,6 +287,57 @@ Tabs and spaces -------------- +Definition Lists +================ + +Tight using spaces: + +apple + red fruit +orange + orange fruit +banana + yellow fruit + +Tight using tabs: + +apple + red fruit +orange + orange fruit +banana + yellow fruit + +Loose: + +apple + red fruit + +orange + orange fruit + +banana + yellow fruit + + +Multiple blocks with italics: + +*apple* + red fruit + + contains seeds, crisp, pleasant to taste + +*orange* + orange fruit + + :: + + { orange code block } + + orange block quote + + + HTML Blocks =========== diff --git a/tests/writer.rtf b/tests/writer.rtf index a6cf9b41d..133a29049 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -141,6 +141,36 @@ These should not be escaped: \\$ \\\\ \\> \\[ \\\{\par} {\pard \ql \f0 \sa180 \li720 \fi-360 \endash \tx360\tab this is an example list item indented with tabs\par} {\pard \ql \f0 \sa180 \li720 \fi-360 \endash \tx360\tab this is an example list item indented with spaces\sa180\sa180\par} {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par} +{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 Definition Lists\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Tight using spaces:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa0 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa0 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 banana\par} +{\pard \ql \f0 \sa0 \li360 \fi0 yellow fruit\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Tight using tabs:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa0 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa0 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 banana\par} +{\pard \ql \f0 \sa0 \li360 \fi0 yellow fruit\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Loose:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 apple\par} +{\pard \ql \f0 \sa180 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 orange\par} +{\pard \ql \f0 \sa180 \li360 \fi0 orange fruit\par} +{\pard \ql \f0 \sa0 \li0 \fi0 banana\par} +{\pard \ql \f0 \sa180 \li360 \fi0 yellow fruit\sa180\par} +{\pard \ql \f0 \sa180 \li0 \fi0 Multiple blocks with italics:\par} +{\pard \ql \f0 \sa0 \li0 \fi0 {\i apple} \par} +{\pard \ql \f0 \sa180 \li360 \fi0 red fruit\par} +{\pard \ql \f0 \sa180 \li360 \fi0 contains seeds, crisp, pleasant to taste\par} +{\pard \ql \f0 \sa0 \li0 \fi0 {\i orange} \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 \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}