diff --git a/tests/data/closed_atx_heading.html b/tests/data/atx_heading_-_closed.html similarity index 93% rename from tests/data/closed_atx_heading.html rename to tests/data/atx_heading_-_closed.html index aae65da..6a5c4fa 100644 --- a/tests/data/closed_atx_heading.html +++ b/tests/data/atx_heading_-_closed.html @@ -1,6 +1,6 @@ -

h1

-

h2

-

h3

-

h4

-
h5
+

h1

+

h2

+

h3

+

h4

+
h5
h6
\ No newline at end of file diff --git a/tests/data/closed_atx_heading.md b/tests/data/atx_heading_-_closed.md similarity index 88% rename from tests/data/closed_atx_heading.md rename to tests/data/atx_heading_-_closed.md index 95668a1..ed66c59 100644 --- a/tests/data/closed_atx_heading.md +++ b/tests/data/atx_heading_-_closed.md @@ -1,11 +1,11 @@ -# h1 # - -## h2 ## - -### h3 ### - -#### h4 #### - -##### h5 ##### - +# h1 # + +## h2 ## + +### h3 ### + +#### h4 #### + +##### h5 ##### + ###### h6 ###### \ No newline at end of file diff --git a/tests/data/blockquote.html b/tests/data/blockquote.html index 4e84ed9..de5d652 100644 --- a/tests/data/blockquote.html +++ b/tests/data/blockquote.html @@ -1,8 +1,4 @@ -

Here's a regular blockquote:

-
-

blockquote

-
-

Here's one with no space after the ">":

+

Here's a blockquote:

blockquote

diff --git a/tests/data/blockquote.md b/tests/data/blockquote.md index 8e508a8..65f71cc 100644 --- a/tests/data/blockquote.md +++ b/tests/data/blockquote.md @@ -1,11 +1,7 @@ -Here's a regular blockquote: +Here's a blockquote: > blockquote -Here's one with no space after the ">": - ->blockquote - Here's one on multiple lines: > line 1 diff --git a/tests/data/compound_blockquote.html b/tests/data/blockquote_-_compound.html similarity index 96% rename from tests/data/compound_blockquote.html rename to tests/data/blockquote_-_compound.html index 512c113..d81bfb4 100644 --- a/tests/data/compound_blockquote.html +++ b/tests/data/blockquote_-_compound.html @@ -1,16 +1,16 @@ -

Here's one with multiple paragraphs:

-
-

This is line one.

-

This is line two.

-
-

Here's one with multiple types of blocks:

-
-

This is a quoted paragraph.

- -
-

This is a nested quote block.

-
+

Here's one with multiple paragraphs:

+
+

This is line one.

+

This is line two.

+
+

Here's one with multiple types of blocks:

+
+

This is a quoted paragraph.

+ +
+

This is a nested quote block.

+
\ No newline at end of file diff --git a/tests/data/compound_blockquote.md b/tests/data/blockquote_-_compound.md similarity index 95% rename from tests/data/compound_blockquote.md rename to tests/data/blockquote_-_compound.md index dd2c690..a4c9c00 100644 --- a/tests/data/compound_blockquote.md +++ b/tests/data/blockquote_-_compound.md @@ -1,14 +1,14 @@ -Here's one with multiple paragraphs: - -> This is line one. -> -> This is line two. - -Here's one with multiple types of blocks: - -> This is a quoted paragraph. -> -> - This is a list item of a quoted list. -> - This is another list item. -> +Here's one with multiple paragraphs: + +> This is line one. +> +> This is line two. + +Here's one with multiple types of blocks: + +> This is a quoted paragraph. +> +> - This is a list item of a quoted list. +> - This is another list item. +> > > This is a nested quote block. \ No newline at end of file diff --git a/tests/data/blockquote_-_lazy.html b/tests/data/blockquote_-_lazy.html new file mode 100644 index 0000000..e356a57 --- /dev/null +++ b/tests/data/blockquote_-_lazy.html @@ -0,0 +1,11 @@ +

Here's a lazy blockquote:

+
+

line +line

+
+

Here's one with multiple lines:

+
+

line +line +line

+
\ No newline at end of file diff --git a/tests/data/blockquote_-_lazy.md b/tests/data/blockquote_-_lazy.md new file mode 100644 index 0000000..18bbad6 --- /dev/null +++ b/tests/data/blockquote_-_lazy.md @@ -0,0 +1,10 @@ +Here's a lazy blockquote: + +> line +line + +Here's one with multiple lines: + +> line +line +line \ No newline at end of file diff --git a/tests/data/blockquote_-_whitespace.html b/tests/data/blockquote_-_whitespace.html new file mode 100644 index 0000000..1e89a03 --- /dev/null +++ b/tests/data/blockquote_-_whitespace.html @@ -0,0 +1,12 @@ +

Here's a blockquote with no space after the ">":

+
+

blockquote

+
+

Here's a blockquote with leading space:

+
+

blockquote

+
+

Here's a blockquote on the next line:

+
+

blockquote

+
\ No newline at end of file diff --git a/tests/data/blockquote_-_whitespace.md b/tests/data/blockquote_-_whitespace.md new file mode 100644 index 0000000..35707c1 --- /dev/null +++ b/tests/data/blockquote_-_whitespace.md @@ -0,0 +1,10 @@ +Here's a blockquote with no space after the ">": + +>blockquote + +Here's a blockquote with leading space: + + > blockquote + +Here's a blockquote on the next line: +> blockquote \ No newline at end of file diff --git a/tests/data/code_block.html b/tests/data/code_block.html index 8ced802..5ca8c2a 100644 --- a/tests/data/code_block.html +++ b/tests/data/code_block.html @@ -2,7 +2,4 @@ 
<?php
 
 $message = 'Hello World!'; 
-echo $message;
-

Here's one that holds a list:

-
- list item
-- another list item
\ No newline at end of file +echo $message; \ No newline at end of file diff --git a/tests/data/code_block.md b/tests/data/code_block.md index 324b86a..1c24118 100644 --- a/tests/data/code_block.md +++ b/tests/data/code_block.md @@ -3,10 +3,4 @@ Here's a code block: Here's a regular list:

- -

Here's one with white space around items:

- -

Here's one with too much space before items:

-
- list item
-- another list item
-

Here's one with no space after markers:

-

-list item --another list item

-

Here's one where items contain line breaks:

- \ No newline at end of file diff --git a/tests/data/dense_list.md b/tests/data/dense_list.md deleted file mode 100644 index bf9357e..0000000 --- a/tests/data/dense_list.md +++ /dev/null @@ -1,27 +0,0 @@ -Here's a regular list: - -- list item -- another list item -- 3rd list item - -Here's one with white space around items: - - - list item - - another list item - -Here's one with too much space before items: - - - list item - - another list item - -Here's one with no space after markers: - --list item --another list item - -Here's one where items contain line breaks: - -- list -item -- another -list item \ No newline at end of file diff --git a/tests/data/emphasis.html b/tests/data/emphasis.html index ab7d4d3..4fd23e5 100644 --- a/tests/data/emphasis.html +++ b/tests/data/emphasis.html @@ -1,7 +1,7 @@

Here's an emphasis.

-

A short emphasis a b .

+

A short one a b .

Here's a strong one.

-

Here's an emphasis that uses underscores.

-

Here's a strong emphasis that uses underscores.

-

This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _.

-

Empty emphasis ** is not __ an emphasis.

\ No newline at end of file +

Here's one that uses underscores.

+

Here's a strong one that uses underscores.

+

This is not _ one _ neither is * this * neither is _ this_ neither is _this _.

+

An empty emphasis ** is not __ an emphasis.

\ No newline at end of file diff --git a/tests/data/emphasis.md b/tests/data/emphasis.md index d4b357a..1122723 100644 --- a/tests/data/emphasis.md +++ b/tests/data/emphasis.md @@ -1,13 +1,13 @@ Here's *an emphasis*. -A short emphasis _a_ *b* . +A short one _a_ *b* . Here's **a strong one**. -Here's _an emphasis that uses underscores_. +Here's _one that uses underscores_. -Here's __a strong emphasis that uses underscores__. +Here's __a strong one that uses underscores__. -This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _. +This is not _ one _ neither is * this * neither is _ this_ neither is _this _. -Empty emphasis ** is not __ an emphasis. \ No newline at end of file +An empty emphasis ** is not __ an emphasis. \ No newline at end of file diff --git a/tests/data/escaping.html b/tests/data/escaping.html index bcb44b4..f75f6f6 100644 --- a/tests/data/escaping.html +++ b/tests/data/escaping.html @@ -1,6 +1,2 @@ -

Here's an emphasis and here's an escaped *emphasis*. Here are also an escaped `code span`, escaped [inline link](http://example.com).

-

Here's an escaped \*emphasis\* inside of a code span.

-

Here's one inside of a code block:

-
An escaped \*emphasis\*.
-

Finally, an escaped reference:

-

[1]: http://example.com

\ No newline at end of file +

Here's an emphasis and here's an escaped *emphasis*. Here are also an escaped `code span`, an escaped [inline link](http://example.com) and an escaped \*emphasis\* inside of a code span.

+
An escaped \*emphasis\* inside of a code block.
\ No newline at end of file diff --git a/tests/data/escaping.md b/tests/data/escaping.md index 8bca463..c17e086 100644 --- a/tests/data/escaping.md +++ b/tests/data/escaping.md @@ -1,11 +1,3 @@ -Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, escaped \[inline link](http://example.com). +Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, an escaped \[inline link](http://example.com) and an escaped `\*emphasis\*` inside of a code span. -Here's `an escaped \*emphasis\* inside of a code span`. - -Here's one inside of a code block: - - An escaped \*emphasis\*. - -Finally, an escaped reference: - -\[1]: http://example.com \ No newline at end of file + An escaped \*emphasis\* inside of a code block. \ No newline at end of file diff --git a/tests/data/horizontal_rule.html b/tests/data/horizontal_rule.html index ed951c8..6bdebe8 100644 --- a/tests/data/horizontal_rule.html +++ b/tests/data/horizontal_rule.html @@ -2,15 +2,9 @@
-
-
---
-
-
-
-
-
- - -

Asterisks:

Underscores:

-

Based on the original test suite.

\ No newline at end of file +

On the next line:

+
\ No newline at end of file diff --git a/tests/data/horizontal_rule.md b/tests/data/horizontal_rule.md index 6e5549c..59ec201 100644 --- a/tests/data/horizontal_rule.md +++ b/tests/data/horizontal_rule.md @@ -2,24 +2,10 @@ Dashes: --- - --- - - --- - - --- - - --- - - - - - - - - - - - - - - - - - - - - - - Asterisks: *** @@ -28,4 +14,5 @@ Underscores: ___ -Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite. \ No newline at end of file +On the next line: +___ \ No newline at end of file diff --git a/tests/data/html.html b/tests/data/html.html index 2e0bf1b..9f5b6b7 100644 --- a/tests/data/html.html +++ b/tests/data/html.html @@ -1,11 +1,11 @@ -

Self-closing tag:

+

A self-closing tag:

-

Self-closing tag with attributes:

+

One with attributes:

-

Bare element:

+

A bare element:

content
-

Element with attributes:

-link +

One with attributes:

+link

Nested elements:

parent diff --git a/tests/data/html.md b/tests/data/html.md index f0f01cb..b2b1266 100644 --- a/tests/data/html.md +++ b/tests/data/html.md @@ -1,18 +1,18 @@ -Self-closing tag: +A self-closing tag:
-Self-closing tag with attributes: +One with attributes:
-Bare element: +A bare element:
content
-Element with attributes: +One with attributes: -link +link Nested elements: diff --git a/tests/data/inline_link.html b/tests/data/inline_link.html index 4ad6eb7..7ff07da 100644 --- a/tests/data/inline_link.html +++ b/tests/data/inline_link.html @@ -1,2 +1,2 @@ -

Here's a link.

-

Here's an image link: MD Logo.

\ No newline at end of file +

Here's a link.

+

Here's one that is based on an image: MD Logo.

\ No newline at end of file diff --git a/tests/data/inline_link.md b/tests/data/inline_link.md index 52979f4..acdc409 100644 --- a/tests/data/inline_link.md +++ b/tests/data/inline_link.md @@ -1,3 +1,3 @@ -Here's a [link](http://parsedown.org). +Here's a [link](http://example.com). -Here's an image link: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/). \ No newline at end of file +Here's one that is based on an image: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/). \ No newline at end of file diff --git a/tests/data/lazy_blockquote.html b/tests/data/lazy_blockquote.html deleted file mode 100644 index 9571bc0..0000000 --- a/tests/data/lazy_blockquote.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

line 1 -line 2

-
\ No newline at end of file diff --git a/tests/data/lazy_blockquote.md b/tests/data/lazy_blockquote.md deleted file mode 100644 index 78a9bdd..0000000 --- a/tests/data/lazy_blockquote.md +++ /dev/null @@ -1,2 +0,0 @@ -> line 1 -line 2 \ No newline at end of file diff --git a/tests/data/list.html b/tests/data/list.html new file mode 100644 index 0000000..b3fc7d4 --- /dev/null +++ b/tests/data/list.html @@ -0,0 +1,5 @@ +

Here's a list:

+ \ No newline at end of file diff --git a/tests/data/list.md b/tests/data/list.md new file mode 100644 index 0000000..adf7d64 --- /dev/null +++ b/tests/data/list.md @@ -0,0 +1,4 @@ +Here's a list: + +- li +- li \ No newline at end of file diff --git a/tests/data/compound_list.html b/tests/data/list_-_compound.html similarity index 100% rename from tests/data/compound_list.html rename to tests/data/list_-_compound.html diff --git a/tests/data/compound_list.md b/tests/data/list_-_compound.md similarity index 73% rename from tests/data/compound_list.md rename to tests/data/list_-_compound.md index cf556d3..1491dcd 100644 --- a/tests/data/compound_list.md +++ b/tests/data/list_-_compound.md @@ -6,5 +6,4 @@ Here's a compound list: - This is another list item. - > This is a quote block that belongs to it. - + > This is a quote block that belongs to it. \ No newline at end of file diff --git a/tests/data/lazy_list_item.html b/tests/data/list_-_lazy.html similarity index 91% rename from tests/data/lazy_list_item.html rename to tests/data/list_-_lazy.html index 1658470..9eabfc6 100644 --- a/tests/data/lazy_list_item.html +++ b/tests/data/list_-_lazy.html @@ -1,4 +1,4 @@ -