aboutsummaryrefslogtreecommitdiff
path: root/tests/misc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/misc')
-rw-r--r--tests/misc/amp-in-url.html1
-rw-r--r--tests/misc/amp-in-url.txt1
-rw-r--r--tests/misc/ampersand.html2
-rw-r--r--tests/misc/ampersand.txt5
-rw-r--r--tests/misc/attributes2.html6
-rw-r--r--tests/misc/attributes2.txt10
-rw-r--r--tests/misc/backtick-escape.html5
-rw-r--r--tests/misc/backtick-escape.txt5
-rw-r--r--tests/misc/bidi.html4
-rw-r--r--tests/misc/bidi.txt4
-rw-r--r--tests/misc/blank-block-quote.html2
-rw-r--r--tests/misc/blank_lines_in_codeblocks.html61
-rw-r--r--tests/misc/blank_lines_in_codeblocks.txt73
-rw-r--r--tests/misc/blockquote-hr.html9
-rw-r--r--tests/misc/blockquote-hr.txt6
-rw-r--r--tests/misc/br.html2
-rw-r--r--tests/misc/br.txt2
-rw-r--r--tests/misc/brackets-in-img-title.html9
-rw-r--r--tests/misc/brackets-in-img-title.txt12
-rw-r--r--tests/misc/comments.html5
-rw-r--r--tests/misc/comments.txt7
-rw-r--r--tests/misc/div.html4
-rw-r--r--tests/misc/div.txt5
-rw-r--r--tests/misc/em-around-links.html15
-rw-r--r--tests/misc/em-around-links.txt10
-rw-r--r--tests/misc/em_strong.html3
-rw-r--r--tests/misc/em_strong.txt1
-rw-r--r--tests/misc/em_strong_complex.html14
-rw-r--r--tests/misc/em_strong_complex.txt27
-rw-r--r--tests/misc/email.html3
-rw-r--r--tests/misc/email.txt2
-rw-r--r--tests/misc/escaped_links.html4
-rw-r--r--tests/misc/escaped_links.txt9
-rw-r--r--tests/misc/h1.html4
-rw-r--r--tests/misc/h1.txt6
-rw-r--r--tests/misc/header-in-lists.html20
-rw-r--r--tests/misc/header-in-lists.txt14
-rw-r--r--tests/misc/html-comments.html2
-rw-r--r--tests/misc/html-comments.txt2
-rw-r--r--tests/misc/html.html9
-rw-r--r--tests/misc/html.txt13
-rw-r--r--tests/misc/image.html1
-rw-r--r--tests/misc/image.txt2
-rw-r--r--tests/misc/ins-at-start-of-paragraph.html1
-rw-r--r--tests/misc/ins-at-start-of-paragraph.txt1
-rw-r--r--tests/misc/lists3.html4
-rw-r--r--tests/misc/lists7.html98
-rw-r--r--tests/misc/lists7.txt44
-rw-r--r--tests/misc/lists8.html39
-rw-r--r--tests/misc/lists8.txt16
-rw-r--r--tests/misc/markup-inside-p.html21
-rw-r--r--tests/misc/markup-inside-p.txt21
-rw-r--r--tests/misc/mismatched-tags.html11
-rw-r--r--tests/misc/mismatched-tags.txt9
-rw-r--r--tests/misc/more_comments.html7
-rw-r--r--tests/misc/more_comments.txt9
-rw-r--r--tests/misc/multi-line-tags.html4
-rw-r--r--tests/misc/multi-line-tags.txt6
-rw-r--r--tests/misc/multi-paragraph-block-quote.html2
-rw-r--r--tests/misc/multi-test.html2
-rw-r--r--tests/misc/multi-test.txt6
-rw-r--r--tests/misc/multiline-comments.html16
-rw-r--r--tests/misc/multiline-comments.txt18
-rw-r--r--tests/misc/nested-lists.html13
-rw-r--r--tests/misc/nested-lists.txt9
-rw-r--r--tests/misc/nested-patterns.html17
-rw-r--r--tests/misc/nested-patterns.txt20
-rw-r--r--tests/misc/para-with-hr.html5
-rw-r--r--tests/misc/para-with-hr.txt3
-rw-r--r--tests/misc/php.html11
-rw-r--r--tests/misc/php.txt13
-rw-r--r--tests/misc/pre.html13
-rw-r--r--tests/misc/pre.txt14
-rw-r--r--tests/misc/some-test.html6
-rw-r--r--tests/misc/tabs-in-lists.html2
-rw-r--r--tests/misc/two-spaces.html6
-rw-r--r--tests/misc/uche.html2
-rw-r--r--tests/misc/uche.txt3
-rw-r--r--tests/misc/underscores.html2
79 files changed, 562 insertions, 313 deletions
diff --git a/tests/misc/amp-in-url.html b/tests/misc/amp-in-url.html
deleted file mode 100644
index 2170a54..0000000
--- a/tests/misc/amp-in-url.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><a href="http://www.freewisdom.org/this&amp;that">link</a></p> \ No newline at end of file
diff --git a/tests/misc/amp-in-url.txt b/tests/misc/amp-in-url.txt
deleted file mode 100644
index 471106e..0000000
--- a/tests/misc/amp-in-url.txt
+++ /dev/null
@@ -1 +0,0 @@
-[link](http://www.freewisdom.org/this&that)
diff --git a/tests/misc/ampersand.html b/tests/misc/ampersand.html
deleted file mode 100644
index 94ed80c..0000000
--- a/tests/misc/ampersand.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>&amp;</p>
-<p>AT&amp;T</p> \ No newline at end of file
diff --git a/tests/misc/ampersand.txt b/tests/misc/ampersand.txt
deleted file mode 100644
index 367d32c..0000000
--- a/tests/misc/ampersand.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-&
-
-AT&T
-
-
diff --git a/tests/misc/attributes2.html b/tests/misc/attributes2.html
deleted file mode 100644
index 5971cc8..0000000
--- a/tests/misc/attributes2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p id="TABLE.OF.CONTENTS" />
-<ul>
-<li id="TABLEOFCONTENTS" />
-</ul>
-<p id="TABLEOFCONTENTS">Or in the middle of the text </p>
-<p id="tableofcontents" /> \ No newline at end of file
diff --git a/tests/misc/attributes2.txt b/tests/misc/attributes2.txt
deleted file mode 100644
index d635cb2..0000000
--- a/tests/misc/attributes2.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{@id=TABLE.OF.CONTENTS}
-
-
-* {@id=TABLEOFCONTENTS}
-
-
-Or in the middle of the text {@id=TABLEOFCONTENTS}
-
-{@id=tableofcontents}
-
diff --git a/tests/misc/backtick-escape.html b/tests/misc/backtick-escape.html
index 07f5115..da30541 100644
--- a/tests/misc/backtick-escape.html
+++ b/tests/misc/backtick-escape.html
@@ -1,3 +1,4 @@
-<p>\`This should not be in code.\`
-`This also should not be in code.`
+<p>`This should not be in code.`
+\<code>This should be in code.\\</code>
+\`This should not be in code.\`
`And finally this should not be in code.`</p> \ No newline at end of file
diff --git a/tests/misc/backtick-escape.txt b/tests/misc/backtick-escape.txt
index b4d80b2..c019463 100644
--- a/tests/misc/backtick-escape.txt
+++ b/tests/misc/backtick-escape.txt
@@ -1,3 +1,4 @@
-\\`This should not be in code.\\`
-\`This also should not be in code.\`
+\`This should not be in code.\`
+\\`This should be in code.\\`
+\\\`This should not be in code.\\\`
\`And finally this should not be in code.`
diff --git a/tests/misc/bidi.html b/tests/misc/bidi.html
index ffe04dc..3cc0444 100644
--- a/tests/misc/bidi.html
+++ b/tests/misc/bidi.html
@@ -1,7 +1,7 @@
<p><strong>Python</strong>(パイソン)は、<a href="http://en.wikipedia.org/wiki/Guido_van_Rossum">Guido van Rossum</a> によって作られたオープンソースのオブジェクト指向スクリプト言語。<a href="http://ja.wikipedia.org/wiki/Perl">Perl</a>とともに欧米で広く普及している。イギリスのテレビ局 BBC が製作したコメディ番組『空飛ぶモンティ・パイソン』にちなんで名付けられた。 (Pythonには、爬虫類のニシキヘビの意味があり、Python言語のマスコットやアイコンとして使われることがある。)</p>
<p>|||||||||||||||||||||||||||||THIS SHOULD BE LTR|||||||||||||||||||||||||</p>
-<p dir="rtl">|||||||||||||||||||||||||||||THIS SHOULD BE RTL||||||||||||||||||||||||| </p>
-<p dir="ltr">(<strong>بايثون</strong> لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوح </p>
+<p>|||||||||||||||||||||||||||||THIS SHOULD BE RTL||||||||||||||||||||||||| </p>
+<p>(<strong>بايثون</strong> لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوح </p>
<p>پایتون زبان برنامه‌نویسی تفسیری و سطح بالا ، شی‌گرا و یک زبان برنامه‌نویسی تفسیری سمت سرور قدرتمند است که توسط گیدو ون روسوم در سال ۱۹۹۰ ساخته شد. این زبان در ویژگی‌ها شبیه پرل، روبی، اسکیم، اسمال‌تاک و تی‌سی‌ال است و از مدیریت خودکار حافظه استفاده می‌کند</p>
<p>Python,是一种面向对象的、直譯式的计算机程序设计语言,也是一种功能强大而完善的通用型语言,已经具有十多年的发展历史,成熟且稳定。</p>
<p>ބްލޫ ވޭލްގެ ދޫ މަތީގައި އެއްފަހަރާ 50 މީހުންނަށް ތިބެވިދާނެވެ. ބޮޑު މަހުގެ ދުލަކީ އެހާމެ ބޮޑު އެއްޗެކެވެ.</p>
diff --git a/tests/misc/bidi.txt b/tests/misc/bidi.txt
index f11ff1c..7e6dbea 100644
--- a/tests/misc/bidi.txt
+++ b/tests/misc/bidi.txt
@@ -2,10 +2,10 @@
|||||||||||||||||||||||||||||THIS SHOULD BE LTR|||||||||||||||||||||||||
-|||||||||||||||||||||||||||||THIS SHOULD BE RTL||||||||||||||||||||||||| {@dir=rtl}
+|||||||||||||||||||||||||||||THIS SHOULD BE RTL|||||||||||||||||||||||||
-(**بايثون** لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير {@dir=ltr} بالإضافة إلى أنها مجانية و مفتوح
+(**بايثون** لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوح
diff --git a/tests/misc/blank-block-quote.html b/tests/misc/blank-block-quote.html
index 23df17a..966078c 100644
--- a/tests/misc/blank-block-quote.html
+++ b/tests/misc/blank-block-quote.html
@@ -1,3 +1,3 @@
<p>aaaaaaaaaaa</p>
-<blockquote />
+<blockquote></blockquote>
<p>bbbbbbbbbbb</p> \ No newline at end of file
diff --git a/tests/misc/blank_lines_in_codeblocks.html b/tests/misc/blank_lines_in_codeblocks.html
new file mode 100644
index 0000000..57a4c36
--- /dev/null
+++ b/tests/misc/blank_lines_in_codeblocks.html
@@ -0,0 +1,61 @@
+<p>Preserve blank lines in code blocks with tabs:</p>
+<pre><code>a code block
+
+two tabbed lines
+
+
+three tabbed lines
+
+
+
+four tabbed lines
+
+
+
+
+five tabbed lines
+
+
+
+
+
+six tabbed lines
+
+
+
+
+
+
+End of tabbed block
+</code></pre>
+<p>And without tabs:</p>
+<pre><code>a code block
+
+two blank lines
+
+
+three blank lines
+
+
+
+four blank lines
+
+
+
+
+five blank lines
+
+
+
+
+
+six blank lines
+
+
+
+
+
+
+End of block
+</code></pre>
+<p>End of document</p> \ No newline at end of file
diff --git a/tests/misc/blank_lines_in_codeblocks.txt b/tests/misc/blank_lines_in_codeblocks.txt
new file mode 100644
index 0000000..e7ae102
--- /dev/null
+++ b/tests/misc/blank_lines_in_codeblocks.txt
@@ -0,0 +1,73 @@
+Preserve blank lines in code blocks with tabs:
+
+ a code block
+
+ two tabbed lines
+
+
+ three tabbed lines
+
+
+
+ four tabbed lines
+
+
+
+
+ five tabbed lines
+
+
+
+
+
+ six tabbed lines
+
+
+
+
+
+
+ End of tabbed block
+
+
+
+
+
+
+And without tabs:
+
+ a code block
+
+ two blank lines
+
+
+ three blank lines
+
+
+
+ four blank lines
+
+
+
+
+ five blank lines
+
+
+
+
+
+ six blank lines
+
+
+
+
+
+
+ End of block
+
+
+
+
+
+
+End of document \ No newline at end of file
diff --git a/tests/misc/blockquote-hr.html b/tests/misc/blockquote-hr.html
index 61c1a3c..e13784f 100644
--- a/tests/misc/blockquote-hr.html
+++ b/tests/misc/blockquote-hr.html
@@ -13,4 +13,13 @@ With multiple lines.
Even a lazy line.</p>
<hr />
<p>The last line.</p>
+</blockquote>
+<p>foo</p>
+<blockquote>
+<p>bar</p>
+<hr />
+</blockquote>
+<hr />
+<blockquote>
+<p>baz</p>
</blockquote> \ No newline at end of file
diff --git a/tests/misc/blockquote-hr.txt b/tests/misc/blockquote-hr.txt
index ef9c44f..8f67b24 100644
--- a/tests/misc/blockquote-hr.txt
+++ b/tests/misc/blockquote-hr.txt
@@ -19,3 +19,9 @@ Even a lazy line.
> ---
> The last line.
+
+foo
+> bar
+> ***
+---
+> baz
diff --git a/tests/misc/br.html b/tests/misc/br.html
index 08563a5..e8e6fdf 100644
--- a/tests/misc/br.html
+++ b/tests/misc/br.html
@@ -8,4 +8,4 @@ Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;
<h2>Lists</h2>
<p>Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,
<code>+</code>, and <code>-</code>) as list markers. These three markers are
-interchangable; this:</p> \ No newline at end of file
+interchangeable; this:</p> \ No newline at end of file
diff --git a/tests/misc/br.txt b/tests/misc/br.txt
index 59d29e0..19f4cf1 100644
--- a/tests/misc/br.txt
+++ b/tests/misc/br.txt
@@ -12,5 +12,5 @@ Output:
Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
`+`, and `-`) as list markers. These three markers are
-interchangable; this:
+interchangeable; this:
diff --git a/tests/misc/brackets-in-img-title.html b/tests/misc/brackets-in-img-title.html
new file mode 100644
index 0000000..3677139
--- /dev/null
+++ b/tests/misc/brackets-in-img-title.html
@@ -0,0 +1,9 @@
+<p><img alt="alt" src="local-img.jpg" />
+<img alt="alt" src="local-img.jpg" title="" />
+<img alt="alt" src="local-img.jpg" title="normal title" /></p>
+<p><img alt="alt" src="local-img.jpg" title="(just title in brackets)" />
+<img alt="alt" src="local-img.jpg" title="title with brackets (I think)" /></p>
+<p><img alt="alt" src="local-img.jpg" title="(" />
+<img alt="alt" src="local-img.jpg" title="(open only" />
+<img alt="alt" src="local-img.jpg" title=")" />
+<img alt="alt" src="local-img.jpg" title="close only)" /></p> \ No newline at end of file
diff --git a/tests/misc/brackets-in-img-title.txt b/tests/misc/brackets-in-img-title.txt
new file mode 100644
index 0000000..01fcd4e
--- /dev/null
+++ b/tests/misc/brackets-in-img-title.txt
@@ -0,0 +1,12 @@
+![alt](local-img.jpg)
+![alt](local-img.jpg "")
+![alt](local-img.jpg "normal title")
+
+![alt](local-img.jpg "(just title in brackets)")
+![alt](local-img.jpg "title with brackets (I think)")
+
+![alt](local-img.jpg "(")
+![alt](local-img.jpg "(open only")
+![alt](local-img.jpg ")")
+![alt](local-img.jpg "close only)")
+
diff --git a/tests/misc/comments.html b/tests/misc/comments.html
deleted file mode 100644
index 005a755..0000000
--- a/tests/misc/comments.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>X&lt;0</p>
-<p>X&gt;0</p>
-<!-- A comment -->
-
-<div>as if</div> \ No newline at end of file
diff --git a/tests/misc/comments.txt b/tests/misc/comments.txt
deleted file mode 100644
index 68302b0..0000000
--- a/tests/misc/comments.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-X<0
-
-X>0
-
-<!-- A comment -->
-
-<div>as if</div>
diff --git a/tests/misc/div.html b/tests/misc/div.html
deleted file mode 100644
index 7cd0d6d..0000000
--- a/tests/misc/div.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="sidebar">
-
-<p><em>foo</em></p>
-</div> \ No newline at end of file
diff --git a/tests/misc/div.txt b/tests/misc/div.txt
deleted file mode 100644
index ca87745..0000000
--- a/tests/misc/div.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="sidebar">
-
- _foo_
-
-</div>
diff --git a/tests/misc/em-around-links.html b/tests/misc/em-around-links.html
index 06bfa8e..cc415f5 100644
--- a/tests/misc/em-around-links.html
+++ b/tests/misc/em-around-links.html
@@ -1,16 +1,13 @@
<h1>Title</h1>
-
<ul>
- <li><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
+<li><em><a href="http://example.com">Python in Markdown</a> by some
great folks</em> - This <em>does</em> work as expected.</li>
- <li><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
+<li><em><a href="http://example.com">Python in Markdown</a> by some
great folks</em> - This <em>does</em> work as expected.</li>
- <li><a href="http://www.freewisdom.org/projects/python-markdown/"><em>Python in Markdown</em></a> by some
+<li><a href="http://example.com"><em>Python in Markdown</em></a> by some
great folks - This <em>does</em> work as expected.</li>
- <li><a href="http://www.freewisdom.org/projects/python-markdown/"><em>Python in Markdown</em></a> <em>by some
+<li><a href="http://example.com"><em>Python in Markdown</em></a> <em>by some
great folks</em> - This <em>does</em> work as expected.</li>
</ul>
-
-<p><em><a href="http://www.freewisdom.org/projects/python-markdown/">Python in Markdown</a> by some
- great folks</em> - This <em>does</em> work as expected.</p>
-
+<p><em><a href="http://example.com">Python in Markdown</a> by some
+great folks</em> - This <em>does</em> work as expected.</p> \ No newline at end of file
diff --git a/tests/misc/em-around-links.txt b/tests/misc/em-around-links.txt
index 5b15be4..dbc3644 100644
--- a/tests/misc/em-around-links.txt
+++ b/tests/misc/em-around-links.txt
@@ -1,14 +1,14 @@
# Title
- - *[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+ - *[Python in Markdown](http://example.com) by some
great folks* - This *does* work as expected.
- - _[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+ - _[Python in Markdown](http://example.com) by some
great folks_ - This *does* work as expected.
- - [_Python in Markdown_](http://www.freewisdom.org/projects/python-markdown/) by some
+ - [_Python in Markdown_](http://example.com) by some
great folks - This *does* work as expected.
- - [_Python in Markdown_](http://www.freewisdom.org/projects/python-markdown/) _by some
+ - [_Python in Markdown_](http://example.com) _by some
great folks_ - This *does* work as expected.
-_[Python in Markdown](http://www.freewisdom.org/projects/python-markdown/) by some
+_[Python in Markdown](http://example.com) by some
great folks_ - This *does* work as expected.
diff --git a/tests/misc/em_strong.html b/tests/misc/em_strong.html
index 75c92d8..776381b 100644
--- a/tests/misc/em_strong.html
+++ b/tests/misc/em_strong.html
@@ -7,4 +7,5 @@
<p>three asterisks: ***</p>
<p>with spaces: * * *</p>
<p>three underscores: ___</p>
-<p>with spaces: _ _ _</p> \ No newline at end of file
+<p>with spaces: _ _ _</p>
+<p>One char: <em>a</em></p> \ No newline at end of file
diff --git a/tests/misc/em_strong.txt b/tests/misc/em_strong.txt
index d0774ad..1285665 100644
--- a/tests/misc/em_strong.txt
+++ b/tests/misc/em_strong.txt
@@ -18,3 +18,4 @@ three underscores: ___
with spaces: _ _ _
+One char: _a_
diff --git a/tests/misc/em_strong_complex.html b/tests/misc/em_strong_complex.html
new file mode 100644
index 0000000..65faddf
--- /dev/null
+++ b/tests/misc/em_strong_complex.html
@@ -0,0 +1,14 @@
+<p><em><strong>test test</strong> test test</em></p>
+<p><strong><em>test test</em> test test</strong></p>
+<p><strong><em>test</em></strong></p>
+<p><strong>test</strong></p>
+<p><strong><em>test</em> test</strong>_</p>
+<p><strong><em>test</em> test</strong></p>
+<p><em>test_test test_test</em></p>
+<p><em><strong>test test</strong> test test</em></p>
+<p><strong><em>test test</em> test test</strong></p>
+<p>*<em>test</em></p>
+<p><strong><em>test</em></strong></p>
+<p><strong>test</strong>*</p>
+<p><strong><em>test</em> test</strong></p>
+<p><em>test</em>test test<em>test</em></p> \ No newline at end of file
diff --git a/tests/misc/em_strong_complex.txt b/tests/misc/em_strong_complex.txt
new file mode 100644
index 0000000..0425971
--- /dev/null
+++ b/tests/misc/em_strong_complex.txt
@@ -0,0 +1,27 @@
+___test test__ test test_
+
+___test test_ test test__
+
+___test___
+
+__test__
+
+___test_ test___
+
+___test_ test__
+
+_test_test test_test_
+
+***test test** test test*
+
+***test test* test test**
+
+**test*
+
+***test***
+
+**test***
+
+***test* test**
+
+*test*test test*test* \ No newline at end of file
diff --git a/tests/misc/email.html b/tests/misc/email.html
index 0d033bb..8ef799f 100644
--- a/tests/misc/email.html
+++ b/tests/misc/email.html
@@ -1,2 +1,3 @@
<p>asdfasdfadsfasd <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;">&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;</a> or you can say
-instead <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;">&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;</a></p> \ No newline at end of file
+instead <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;">&#121;&#117;&#114;&#105;&#64;&#102;&#114;&#101;&#101;&#119;&#105;&#115;&#100;&#111;&#109;&#46;&#111;&#114;&#103;</a></p>
+<p><a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#98;&#111;&#98;&#38;&#115;&#117;&#101;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;">&#98;&#111;&#98;&amp;&#115;&#117;&#101;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;</a></p> \ No newline at end of file
diff --git a/tests/misc/email.txt b/tests/misc/email.txt
index ece8801..c557c73 100644
--- a/tests/misc/email.txt
+++ b/tests/misc/email.txt
@@ -1,3 +1,5 @@
asdfasdfadsfasd <yuri@freewisdom.org> or you can say
instead <mailto:yuri@freewisdom.org>
+
+<bob&sue@example.com>
diff --git a/tests/misc/escaped_links.html b/tests/misc/escaped_links.html
new file mode 100644
index 0000000..b2a7c96
--- /dev/null
+++ b/tests/misc/escaped_links.html
@@ -0,0 +1,4 @@
+<p>Backslashed in links:</p>
+<p><a href="/query?q=go:GO\:0000307">q=go:GO\:0000307</a></p>
+<p><a href="/query?q=go:GO\:0000308" title="/query?q=go:GO\:0000308">q=go:GO\:0000308</a></p>
+<p>a \non-escaped char.</p> \ No newline at end of file
diff --git a/tests/misc/escaped_links.txt b/tests/misc/escaped_links.txt
new file mode 100644
index 0000000..c64ab26
--- /dev/null
+++ b/tests/misc/escaped_links.txt
@@ -0,0 +1,9 @@
+Backslashed in links:
+
+[q=go:GO\\:0000307](/query?q=go:GO\\:0000307)
+
+[q=go:GO\\:0000308][foo]
+
+[foo]: /query?q=go:GO\:0000308 "/query?q=go:GO\:0000308"
+
+a \non-escaped char. \ No newline at end of file
diff --git a/tests/misc/h1.html b/tests/misc/h1.html
index fbf9b4d..886b61e 100644
--- a/tests/misc/h1.html
+++ b/tests/misc/h1.html
@@ -1,3 +1,5 @@
<h2>Header</h2>
<h1>Header 2</h1>
-<h3>H3</h3> \ No newline at end of file
+<h3>H3</h3>
+<h1>H1</h1>
+<h2>H2</h2> \ No newline at end of file
diff --git a/tests/misc/h1.txt b/tests/misc/h1.txt
index 0a1c8f9..f67b921 100644
--- a/tests/misc/h1.txt
+++ b/tests/misc/h1.txt
@@ -5,3 +5,9 @@ Header 2
========
### H3
+
+H1
+=
+
+H2
+--
diff --git a/tests/misc/header-in-lists.html b/tests/misc/header-in-lists.html
new file mode 100644
index 0000000..351b44a
--- /dev/null
+++ b/tests/misc/header-in-lists.html
@@ -0,0 +1,20 @@
+<p>Tight List:</p>
+<ul>
+<li>
+<h1>Header1</h1>
+Line 1-2 - <strong>not</strong> a header <em>or</em> paragraph!</li>
+<li>
+<h1>Header2</h1>
+Line 2-2 - not a header or paragraph!</li>
+</ul>
+<p>Loose List:</p>
+<ul>
+<li>
+<h1>Header1</h1>
+<p>Line 1-2 - <em>a</em> paragraph</p>
+</li>
+<li>
+<h1>Header2</h1>
+<p>Line 2-2 - a paragraph</p>
+</li>
+</ul> \ No newline at end of file
diff --git a/tests/misc/header-in-lists.txt b/tests/misc/header-in-lists.txt
new file mode 100644
index 0000000..b22083e
--- /dev/null
+++ b/tests/misc/header-in-lists.txt
@@ -0,0 +1,14 @@
+Tight List:
+
+* #Header1
+Line 1-2 - **not** a header *or* paragraph!
+* #Header2
+Line 2-2 - not a header or paragraph!
+
+Loose List:
+
+* #Header1
+Line 1-2 - *a* paragraph
+
+* #Header2
+Line 2-2 - a paragraph
diff --git a/tests/misc/html-comments.html b/tests/misc/html-comments.html
deleted file mode 100644
index 7b36246..0000000
--- a/tests/misc/html-comments.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>Here is HTML <!-- **comment** -->
-and once more <p><!--comment--></p></p> \ No newline at end of file
diff --git a/tests/misc/html-comments.txt b/tests/misc/html-comments.txt
deleted file mode 100644
index cac4da5..0000000
--- a/tests/misc/html-comments.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Here is HTML <!-- **comment** -->
-and once more <p><!--comment--></p>
diff --git a/tests/misc/html.html b/tests/misc/html.html
deleted file mode 100644
index 81ac5ee..0000000
--- a/tests/misc/html.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>Block level html</h1>
-
-<p>Some inline <b>stuff<b>.<br />
-</p>
-<p>Now some <arbitrary>arbitrary tags</arbitrary>.</p>
-<div>More block level html.</div>
-
-<p>And of course <script>blah</script>.</p>
-<p><a href="script&gt;stuff&lt;/script">this <script>link</a></p> \ No newline at end of file
diff --git a/tests/misc/html.txt b/tests/misc/html.txt
deleted file mode 100644
index 3ac3ae0..0000000
--- a/tests/misc/html.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<h1>Block level html</h1>
-
-Some inline <b>stuff<b>.
-
-Now some <arbitrary>arbitrary tags</arbitrary>.
-
-<div>More block level html.</div>
-
-And of course <script>blah</script>.
-
-[this <script>link](<script>stuff</script>)
-
diff --git a/tests/misc/image.html b/tests/misc/image.html
deleted file mode 100644
index 16be2d5..0000000
--- a/tests/misc/image.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><img alt="Poster" src="http://humane_man.jpg" title="The most humane man." /></p> \ No newline at end of file
diff --git a/tests/misc/image.txt b/tests/misc/image.txt
deleted file mode 100644
index 5553bd4..0000000
--- a/tests/misc/image.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-![Poster](http://humane_man.jpg "The most humane man.")
diff --git a/tests/misc/ins-at-start-of-paragraph.html b/tests/misc/ins-at-start-of-paragraph.html
new file mode 100644
index 0000000..a08524e
--- /dev/null
+++ b/tests/misc/ins-at-start-of-paragraph.html
@@ -0,0 +1 @@
+<p><ins>Hello, fellow developer</ins> this ins should be wrapped in a p.</p> \ No newline at end of file
diff --git a/tests/misc/ins-at-start-of-paragraph.txt b/tests/misc/ins-at-start-of-paragraph.txt
new file mode 100644
index 0000000..2aee0bc
--- /dev/null
+++ b/tests/misc/ins-at-start-of-paragraph.txt
@@ -0,0 +1 @@
+<ins>Hello, fellow developer</ins> this ins should be wrapped in a p.
diff --git a/tests/misc/lists3.html b/tests/misc/lists3.html
index 991395b..7cfe001 100644
--- a/tests/misc/lists3.html
+++ b/tests/misc/lists3.html
@@ -1,5 +1,5 @@
<ul>
<li>blah blah blah
-sdf asdf asdf asdf asdf
-asda asdf asdfasd</li>
+ sdf asdf asdf asdf asdf
+ asda asdf asdfasd</li>
</ul> \ No newline at end of file
diff --git a/tests/misc/lists7.html b/tests/misc/lists7.html
new file mode 100644
index 0000000..81c1daa
--- /dev/null
+++ b/tests/misc/lists7.html
@@ -0,0 +1,98 @@
+<ul>
+<li>item 1</li>
+<li>
+<ul>
+<li>item 2-1</li>
+<li>item 2-2</li>
+<li>item 2-3</li>
+<li>item 2-4</li>
+</ul>
+</li>
+<li>item 3</li>
+<li>
+<ul>
+<li>
+<p>item 4-1</p>
+</li>
+<li>
+<p>item 4-2</p>
+</li>
+<li>
+<p>item 4-3</p>
+</li>
+<li>
+<p>item 4-4</p>
+</li>
+</ul>
+</li>
+</ul>
+<h2>same as above, different spacing</h2>
+<ul>
+<li>item 1</li>
+<li>
+<ul>
+<li>item 2-1</li>
+<li>item 2-2</li>
+</ul>
+</li>
+<li>item 3</li>
+<li>
+<ul>
+<li>
+<p>item 4-1</p>
+</li>
+<li>
+<p>item 4-2</p>
+</li>
+</ul>
+</li>
+</ul>
+<h2>only 1 item in nested list ##</h2>
+<ul>
+<li>item 1</li>
+<li>
+<ul>
+<li>item 2-1</li>
+</ul>
+</li>
+<li>item 3</li>
+<li>
+<ul>
+<li>item 4-1</li>
+</ul>
+</li>
+</ul>
+<h2>Something ludicrous ##</h2>
+<ul>
+<li>item 1</li>
+<li>
+<ul>
+<li>item 2-1</li>
+<li>item 2-2</li>
+<li>
+<ul>
+<li>item 2-2-1</li>
+<li>item 2-2-2</li>
+</ul>
+</li>
+<li>item 2-3</li>
+</ul>
+</li>
+<li>item 3</li>
+<li>
+<ul>
+<li>
+<p>item 4-1</p>
+</li>
+<li>
+<ul>
+<li>item 4-1-1</li>
+<li>item 4-1-2</li>
+</ul>
+</li>
+<li>
+<p>item 4-2</p>
+</li>
+</ul>
+</li>
+</ul> \ No newline at end of file
diff --git a/tests/misc/lists7.txt b/tests/misc/lists7.txt
new file mode 100644
index 0000000..77181c8
--- /dev/null
+++ b/tests/misc/lists7.txt
@@ -0,0 +1,44 @@
+* item 1
+* * item 2-1
+ * item 2-2
+ * item 2-3
+ * item 2-4
+* item 3
+* * item 4-1
+
+ * item 4-2
+
+ * item 4-3
+
+ * item 4-4
+
+## same as above, different spacing
+* item 1
+* * item 2-1
+ * item 2-2
+* item 3
+* * item 4-1
+
+ * item 4-2
+
+## only 1 item in nested list ##
+* item 1
+* * item 2-1
+* item 3
+* * item 4-1
+
+## Something ludicrous ##
+* item 1
+* * item 2-1
+ * item 2-2
+ * * item 2-2-1
+ * item 2-2-2
+ * item 2-3
+* item 3
+* * item 4-1
+
+ * * item 4-1-1
+ * item 4-1-2
+
+ * item 4-2
+
diff --git a/tests/misc/lists8.html b/tests/misc/lists8.html
new file mode 100644
index 0000000..8a93a51
--- /dev/null
+++ b/tests/misc/lists8.html
@@ -0,0 +1,39 @@
+<h1>Lists with blockquotes</h1>
+<ol>
+<li>
+<blockquote>
+<p>Four-score and seven years ago...</p>
+</blockquote>
+</li>
+<li>
+<blockquote>
+<p>We have nothing to fear...</p>
+</blockquote>
+</li>
+<li>
+<blockquote>
+<p>This is it...</p>
+</blockquote>
+</li>
+</ol>
+<h1>Multi-line blockquotes</h1>
+<ul>
+<li>
+<blockquote>
+<p>Four-score and sever years ago
+our fathers brought forth</p>
+</blockquote>
+</li>
+<li>
+<blockquote>
+<p>We have nothing to fear
+but fear itself</p>
+</blockquote>
+</li>
+<li>
+<blockquote>
+<p>This is it
+as far as I'm concerned</p>
+</blockquote>
+</li>
+</ul> \ No newline at end of file
diff --git a/tests/misc/lists8.txt b/tests/misc/lists8.txt
new file mode 100644
index 0000000..8ab6767
--- /dev/null
+++ b/tests/misc/lists8.txt
@@ -0,0 +1,16 @@
+# Lists with blockquotes
+1. > Four-score and seven years ago...
+
+2. > We have nothing to fear...
+
+3. > This is it...
+
+# Multi-line blockquotes
+* > Four-score and sever years ago
+ > our fathers brought forth
+
+* > We have nothing to fear
+ > but fear itself
+
+* > This is it
+ > as far as I'm concerned
diff --git a/tests/misc/markup-inside-p.html b/tests/misc/markup-inside-p.html
deleted file mode 100644
index 1b6b420..0000000
--- a/tests/misc/markup-inside-p.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<p>
-
-_foo_
-
-</p>
-
-<p>
-_foo_
-</p>
-
-<p>_foo_</p>
-
-<p>
-
-_foo_
-</p>
-
-<p>
-_foo_
-
-</p> \ No newline at end of file
diff --git a/tests/misc/markup-inside-p.txt b/tests/misc/markup-inside-p.txt
deleted file mode 100644
index ab7dd0f..0000000
--- a/tests/misc/markup-inside-p.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-<p>
-
-_foo_
-
-</p>
-
-<p>
-_foo_
-</p>
-
-<p>_foo_</p>
-
-<p>
-
-_foo_
-</p>
-
-<p>
-_foo_
-
-</p>
diff --git a/tests/misc/mismatched-tags.html b/tests/misc/mismatched-tags.html
deleted file mode 100644
index ec087e1..0000000
--- a/tests/misc/mismatched-tags.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p>Some text</p>
-
-<div>some more text</div>
-
-<p>and a bit more</p>
-<p>And this output</p>
-
-<p><em>Compatible with PHP Markdown Extra 1.2.2 and Markdown.pl1.0.2b8:</em></p>
-<!-- comment --><p><div>text</div><br /></p><br />
-
-<p>Should be in p</p> \ No newline at end of file
diff --git a/tests/misc/mismatched-tags.txt b/tests/misc/mismatched-tags.txt
deleted file mode 100644
index 8e6a52f..0000000
--- a/tests/misc/mismatched-tags.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>Some text</p><div>some more text</div>
-
-and a bit more
-
-<p>And this output</p> *Compatible with PHP Markdown Extra 1.2.2 and Markdown.pl1.0.2b8:*
-
-<!-- comment --><p><div>text</div><br /></p><br />
-
-Should be in p
diff --git a/tests/misc/more_comments.html b/tests/misc/more_comments.html
deleted file mode 100644
index 97074d5..0000000
--- a/tests/misc/more_comments.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--asd@asdfd.com>
-
-<!asd@asdfd.com>
-
-<asd!@asdfd.com>
-
-<p>Test</p> \ No newline at end of file
diff --git a/tests/misc/more_comments.txt b/tests/misc/more_comments.txt
deleted file mode 100644
index 0397f9c..0000000
--- a/tests/misc/more_comments.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--asd@asdfd.com>
-
-
-<!asd@asdfd.com>
-
-
-<asd!@asdfd.com>
-
-Test
diff --git a/tests/misc/multi-line-tags.html b/tests/misc/multi-line-tags.html
deleted file mode 100644
index 763a050..0000000
--- a/tests/misc/multi-line-tags.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-
-<p>asdf asdfasd</p>
-</div> \ No newline at end of file
diff --git a/tests/misc/multi-line-tags.txt b/tests/misc/multi-line-tags.txt
deleted file mode 100644
index 4ea3b02..0000000
--- a/tests/misc/multi-line-tags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<div>
-
-asdf asdfasd
-
-</div>
diff --git a/tests/misc/multi-paragraph-block-quote.html b/tests/misc/multi-paragraph-block-quote.html
index e13986a..f01b5e4 100644
--- a/tests/misc/multi-paragraph-block-quote.html
+++ b/tests/misc/multi-paragraph-block-quote.html
@@ -1,6 +1,6 @@
<blockquote>
<p>This is line one of paragraph one
- This is line two of paragraph one</p>
+This is line two of paragraph one</p>
<p>This is line one of paragraph two</p>
<p>This is another blockquote.</p>
</blockquote> \ No newline at end of file
diff --git a/tests/misc/multi-test.html b/tests/misc/multi-test.html
index 2c8fe9e..9fe9648 100644
--- a/tests/misc/multi-test.html
+++ b/tests/misc/multi-test.html
@@ -1,5 +1,3 @@
-<h1 id="inthebeginning">Header </h1>
-<p>Now, let's try something <em class="special">inline</em>, to see if it works</p>
<p>Blah blah blah <a href="http://www.slashdot.org">http://www.slashdot.org</a></p>
<ul>
<li>Basic list</li>
diff --git a/tests/misc/multi-test.txt b/tests/misc/multi-test.txt
index c4ab1c1..feaac31 100644
--- a/tests/misc/multi-test.txt
+++ b/tests/misc/multi-test.txt
@@ -1,9 +1,3 @@
-
-# Header {@id=inthebeginning}
-
-Now, let's try something *inline{@class=special}*, to see if it works
-
-
Blah blah blah <http://www.slashdot.org>
* Basic list
diff --git a/tests/misc/multiline-comments.html b/tests/misc/multiline-comments.html
deleted file mode 100644
index 547ba0b..0000000
--- a/tests/misc/multiline-comments.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-
-foo
-
--->
-
-<p>
-
-foo
-
-</p>
-
-<div>
-
-<p>foo</p>
-</div> \ No newline at end of file
diff --git a/tests/misc/multiline-comments.txt b/tests/misc/multiline-comments.txt
deleted file mode 100644
index 71bc418..0000000
--- a/tests/misc/multiline-comments.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-
-foo
-
--->
-
-<p>
-
-foo
-
-</p>
-
-
-<div>
-
-foo
-
-</div>
diff --git a/tests/misc/nested-lists.html b/tests/misc/nested-lists.html
index bb73784..9af441a 100644
--- a/tests/misc/nested-lists.html
+++ b/tests/misc/nested-lists.html
@@ -36,4 +36,17 @@
</ul>
</li>
<li>item 2</li>
+<li>item 3</li>
+<li>
+<p>item 4</p>
+<ul>
+<li>item 4-1</li>
+<li>item 4-2</li>
+<li>
+<p>item 4-3</p>
+<p>Paragraph under item 4-3</p>
+</li>
+</ul>
+<p>Paragraph under item 4</p>
+</li>
</ul> \ No newline at end of file
diff --git a/tests/misc/nested-lists.txt b/tests/misc/nested-lists.txt
index 38aae15..a2704b4 100644
--- a/tests/misc/nested-lists.txt
+++ b/tests/misc/nested-lists.txt
@@ -22,3 +22,12 @@ plain text
* item 1-2
* item 1-2-1
* item 2
+* item 3
+* item 4
+ * item 4-1
+ * item 4-2
+ * item 4-3
+
+ Paragraph under item 4-3
+
+ Paragraph under item 4
diff --git a/tests/misc/nested-patterns.html b/tests/misc/nested-patterns.html
index b90d46d..1c7bb43 100644
--- a/tests/misc/nested-patterns.html
+++ b/tests/misc/nested-patterns.html
@@ -1,7 +1,10 @@
-<p><strong><em><a href="http://www.freewisdom.org">link</a></em></strong>
-<strong><em><a href="http://www.freewisdom.org">link</a></em></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<strong><a href="http://www.freewisdom.org"><em>link</em></a></strong>
-<a href="http://www.freewisdom.org"><strong><em>link</em></strong></a></p> \ No newline at end of file
+<p><strong><em><a href="http://example.com">link</a></em></strong>
+<strong><em><a href="http://example.com">link</a></em></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<strong><a href="http://example.com"><em>link</em></a></strong>
+<a href="http://example.com"><strong><em>link</em></strong></a></p>
+<p><strong><em>I am <strong><em>italic</em> and</strong> bold</em> I am <code>just</code> bold</strong></p>
+<p>Example <strong><em>bold italic</em></strong> on the same line <strong><em>bold italic</em></strong>.</p>
+<p>Example <strong><em>bold italic</em></strong> on the same line <strong><em>bold italic</em></strong>.</p> \ No newline at end of file
diff --git a/tests/misc/nested-patterns.txt b/tests/misc/nested-patterns.txt
index 3f5dc3e..9032cf1 100644
--- a/tests/misc/nested-patterns.txt
+++ b/tests/misc/nested-patterns.txt
@@ -1,7 +1,13 @@
-___[link](http://www.freewisdom.org)___
-***[link](http://www.freewisdom.org)***
-**[*link*](http://www.freewisdom.org)**
-__[_link_](http://www.freewisdom.org)__
-__[*link*](http://www.freewisdom.org)__
-**[_link_](http://www.freewisdom.org)**
-[***link***](http://www.freewisdom.org)
+___[link](http://example.com)___
+***[link](http://example.com)***
+**[*link*](http://example.com)**
+__[_link_](http://example.com)__
+__[*link*](http://example.com)__
+**[_link_](http://example.com)**
+[***link***](http://example.com)
+
+***I am ___italic_ and__ bold* I am `just` bold**
+
+Example __*bold italic*__ on the same line __*bold italic*__.
+
+Example **_bold italic_** on the same line **_bold italic_**.
diff --git a/tests/misc/para-with-hr.html b/tests/misc/para-with-hr.html
index 8569fec..7607449 100644
--- a/tests/misc/para-with-hr.html
+++ b/tests/misc/para-with-hr.html
@@ -1,3 +1,6 @@
<p>Here is a paragraph, followed by a horizontal rule.</p>
<hr />
-<p>Followed by another paragraph.</p> \ No newline at end of file
+<p>Followed by another paragraph.</p>
+<p>Here is another paragraph, followed by:
+*** not an HR.
+Followed by more of the same paragraph.</p> \ No newline at end of file
diff --git a/tests/misc/para-with-hr.txt b/tests/misc/para-with-hr.txt
index 20735fb..165bbe3 100644
--- a/tests/misc/para-with-hr.txt
+++ b/tests/misc/para-with-hr.txt
@@ -2,3 +2,6 @@ Here is a paragraph, followed by a horizontal rule.
***
Followed by another paragraph.
+Here is another paragraph, followed by:
+*** not an HR.
+Followed by more of the same paragraph.
diff --git a/tests/misc/php.html b/tests/misc/php.html
deleted file mode 100644
index 8cd4ed5..0000000
--- a/tests/misc/php.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-
-<p><b>This should have a p tag</b></p>
-<!--This is a comment -->
-
-<div>This shouldn't</div>
-
-<?php echo "block_level";?>
-
-<p>&lt;?php echo "not_block_level";?&gt;</p> \ No newline at end of file
diff --git a/tests/misc/php.txt b/tests/misc/php.txt
deleted file mode 100644
index ca5be45..0000000
--- a/tests/misc/php.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-
-<b>This should have a p tag</b>
-
-<!--This is a comment -->
-
-<div>This shouldn't</div>
-
-<?php echo "block_level";?>
-
- <?php echo "not_block_level";?>
-
diff --git a/tests/misc/pre.html b/tests/misc/pre.html
deleted file mode 100644
index a44ae12..0000000
--- a/tests/misc/pre.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<pre>
-
-aaa
-
-bbb
-</pre>
-
-<pre>
-* and this is pre-formatted content
-* and it should be printed just like this
-* and not formatted as a list
-
-</pre> \ No newline at end of file
diff --git a/tests/misc/pre.txt b/tests/misc/pre.txt
deleted file mode 100644
index 31243b5..0000000
--- a/tests/misc/pre.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-<pre>
-
-aaa
-
-bbb
-</pre>
-
-<pre>
-* and this is pre-formatted content
-* and it should be printed just like this
-* and not formatted as a list
-
-</pre>
-
diff --git a/tests/misc/some-test.html b/tests/misc/some-test.html
index a36d1ee..b78683f 100644
--- a/tests/misc/some-test.html
+++ b/tests/misc/some-test.html
@@ -24,8 +24,10 @@
</ul>
<p>Markdown</p>
<ul>
-<li>Python
- is ok<ul>
+<li>
+<p>Python
+ is ok</p>
+<ul>
<li>Therefore i am</li>
</ul>
</li>
diff --git a/tests/misc/tabs-in-lists.html b/tests/misc/tabs-in-lists.html
index a1a92ec..fdb7cb6 100644
--- a/tests/misc/tabs-in-lists.html
+++ b/tests/misc/tabs-in-lists.html
@@ -19,7 +19,7 @@
<p>Now a list with 4 spaces and some text:</p>
<ul>
<li>A
-abcdef</li>
+ abcdef</li>
<li>B</li>
</ul>
<p>Now with a tab and an extra space:</p>
diff --git a/tests/misc/two-spaces.html b/tests/misc/two-spaces.html
index 102d1db..97b54b4 100644
--- a/tests/misc/two-spaces.html
+++ b/tests/misc/two-spaces.html
@@ -4,14 +4,12 @@ but this line has three <br />
and this is the second from last line
in this test message</p>
<ul>
-<li>This list item has two spaces.<br />
-</li>
+<li>This list item has two spaces. </li>
<li>
<p>This has none.
This line has three. <br />
This line has none.
- And this line two.<br />
-</p>
+ And this line two. </p>
<p>This line has none.</p>
</li>
<li>
diff --git a/tests/misc/uche.html b/tests/misc/uche.html
index e62329d..9134e95 100644
--- a/tests/misc/uche.html
+++ b/tests/misc/uche.html
@@ -1,3 +1,3 @@
<p><img alt="asif" src="http://fourthought.com/images/ftlogo.png" title="Fourthought logo" /></p>
-<p><a href="http://fourthought.com/"><img alt="" src="http://fourthought.com/images/ftlogo.png" style="float: left; margin: 10px; border: none;" title="Fourthought logo" /></a></p>
+<p><a href="http://fourthought.com/"><img alt="Alt text" src="http://fourthought.com/images/ftlogo.png" title="Fourthought logo" /></a></p>
<p><a href="http://link.com/"><img alt="text" src="x" /></a></p> \ No newline at end of file
diff --git a/tests/misc/uche.txt b/tests/misc/uche.txt
index a3dda1a..625d2ae 100644
--- a/tests/misc/uche.txt
+++ b/tests/misc/uche.txt
@@ -1,7 +1,6 @@
![asif](http://fourthought.com/images/ftlogo.png "Fourthought logo")
-[![{@style=float: left; margin: 10px; border:
-none;}](http://fourthought.com/images/ftlogo.png "Fourthought
+[![Alt text](http://fourthought.com/images/ftlogo.png "Fourthought
logo")](http://fourthought.com/)
[![text](x)](http://link.com/)
diff --git a/tests/misc/underscores.html b/tests/misc/underscores.html
index 54bd9f9..72d51b8 100644
--- a/tests/misc/underscores.html
+++ b/tests/misc/underscores.html
@@ -1,6 +1,6 @@
<p>THIS_SHOULD_STAY_AS_IS</p>
<p>Here is some <em>emphasis</em>, ok?</p>
<p>Ok, at least <em>this</em> should work.</p>
-<p>THIS<strong>SHOULD</strong>STAY</p>
+<p>THIS__SHOULD__STAY</p>
<p>Here is some <strong>strong</strong> stuff.</p>
<p>THIS<strong><em>SHOULD</em></strong>STAY?</p> \ No newline at end of file