From 6fae136cbb1ed28047e615217b5ce082875f5b19 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 11 Aug 2014 11:21:49 -0700 Subject: Textile reader: list and HTML block parsing improvements. Closes #1513. Lists can now start without an intervening blank line. Also, html block-level tags that don't start a line are parsed as RawInline and don't interrupt paragraphs, as in RedCloth. --- tests/textile-reader.native | 13 +++++++------ tests/textile-reader.textile | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/textile-reader.native b/tests/textile-reader.native index f82c4a896..0a0b10bd3 100644 --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -67,6 +67,11 @@ Pandoc (Meta {unMeta = fromList []}) ,BulletList [[Plain [Str "one"]] ,[Plain [Str "two",LineBreak,Str "->",Space,Str "and",Space,Str "more"]]] +,Header 2 ("issue-1513",[],[]) [Str "Issue",Space,Str "#1513"] +,Para [Str "List:"] +,BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]]] ,Header 2 ("definition-list",[],[]) [Str "Definition",Space,Str "List"] ,DefinitionList [([Str "coffee"], @@ -145,13 +150,9 @@ Pandoc (Meta {unMeta = fromList []}) ,RawBlock (Format "html") "
" ,Para [Str "any",Space,Strong [Str "Raw",Space,Str "HTML",Space,Str "Block"],Space,Str "with",Space,Str "bold"] ,RawBlock (Format "html") "
" -,Para [Str "Html",Space,Str "blocks",Space,Str "can",Space,Str "be"] -,RawBlock (Format "html") "
" -,Para [Str "inlined"] -,RawBlock (Format "html") "
" -,Para [Str "as",Space,Str "well."] +,Para [Str "Html",Space,Str "blocks",Space,Str "can",Space,Str "be",Space,RawInline (Format "html") "
",Str "inlined",RawInline (Format "html") "
",Space,Str "as",Space,Str "well."] ,BulletList - [[Plain [Str "this",Space,Str "
",Space,Str "won\8217t",Space,Str "produce",Space,Str "raw",Space,Str "html",Space,Str "blocks",Space,Str "
"]] + [[Plain [Str "this",Space,RawInline (Format "html") "
",Space,Str "won\8217t",Space,Str "produce",Space,Str "raw",Space,Str "html",Space,Str "blocks",Space,RawInline (Format "html") "
"]] ,[Plain [Str "but",Space,Str "this",Space,RawInline (Format "html") "",Space,Str "will",Space,Str "produce",Space,Str "inline",Space,Str "html",Space,RawInline (Format "html") ""]]] ,Para [Str "Can",Space,Str "you",Space,Str "prove",Space,Str "that",Space,Str "2",Space,Str "<",Space,Str "3",Space,Str "?"] ,Header 1 ("raw-latex",[],[]) [Str "Raw",Space,Str "LaTeX"] diff --git a/tests/textile-reader.textile b/tests/textile-reader.textile index c0c0659b7..e1e143531 100644 --- a/tests/textile-reader.textile +++ b/tests/textile-reader.textile @@ -123,6 +123,12 @@ h2. Issue #1500 * two -> and more +h2. Issue #1513 + +List: +* one +* two + h2. Definition List - coffee := Hot and black -- cgit v1.2.3