From dd59cd23415e1fdf3286ea4d45a104e8c093717d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 16 Jul 2011 09:42:16 -0700 Subject: HTML reader: treat Plain as Para when needed. For example, in Just a few glitches remaining. And in this, the preformatting. 
Preformatted text not starting with its own blank line.
Thansk to Dirk Laurie for noticing the issue. --- tests/html-reader.html | 34 ---------------------------------- tests/html-reader.native | 37 ++----------------------------------- 2 files changed, 2 insertions(+), 69 deletions(-) (limited to 'tests') diff --git a/tests/html-reader.html b/tests/html-reader.html index a51ee3307..ea10a306c 100644 --- a/tests/html-reader.html +++ b/tests/html-reader.html @@ -298,40 +298,6 @@ These should not be escaped: \$ \\ \> \[ \{
Low-voiced stringed instrument.
-

HTML Blocks

-

Simple block on one line:

-foo

And nested without indentation:

-foobar

Interpreted markdown in a table:

-This is emphasized. And this is strong

Here's a simple block:

-foo

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-foo

This should just be an HTML comment:

-

Multiline:

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

Code:

-
<hr />
-
-

Hr's:

-
-
-
-
-
-
-
-
-
-

Inline Markup

This is emphasized, and so is this.

This is strong, and so is this.

diff --git a/tests/html-reader.native b/tests/html-reader.native index c7ba26568..a9070adc6 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -183,39 +183,6 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,([Str "Cello",LineBreak,Str "Violoncello"], [[Plain [Str "Low",Str "-",Str "voiced",Space,Str "stringed",Space,Str "instrument",Str "."]]])] ,HorizontalRule -,Header 1 [Str "HTML",Space,Str "Blocks"] -,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] -,Plain [Str "foo"] -,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] -,Plain [Str "foobar"] -,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"] -,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]] -,Para [Str "Here",Str "'",Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"] -,CodeBlock ("",[],[]) "
\n foo\n
" -,Para [Str "As",Space,Str "should",Space,Str "this:"] -,CodeBlock ("",[],[]) "
foo
" -,Para [Str "Now,",Space,Str "nested:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"] -,Para [Str "Multiline:"] -,Para [Str "Code",Space,Str "block:"] -,CodeBlock ("",[],[]) "" -,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "
" -,Para [Str "Hr",Str "'",Str "s:"] -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule ,Header 1 [Str "Inline",Space,Str "Markup"] ,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."] ,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."] @@ -293,7 +260,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with single quotes")] -,Plain [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] +,Para [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] ,Para [Link [Str "Empty"] ("",""),Str "."] ,Header 2 [Str "Reference"] ,Para [Str "Foo",Space,Link [Str "bar"] ("/url/",""),Str "."] @@ -319,7 +286,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [[Plain [Str "In",Space,Str "a",Space,Str "list?"]] ,[Plain [Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,[Plain [Str "It",Space,Str "should",Str "."]]] -,Plain [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] +,Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] ,BlockQuote [Para [Str "Blockquoted:",Space,Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""] -- cgit v1.2.3