From 7e0b959ef2a64f2339be28f258b895d7a79003a8 Mon Sep 17 00:00:00 2001
From: Waylan Limberg <waylan@gmail.com>
Date: Fri, 12 Feb 2010 15:45:28 -0500
Subject: Moved remaining tests from merge

---
 markdown/tests/extensions/extra/raw-html.html | 14 ++++++++++++++
 markdown/tests/extensions/extra/raw-html.txt  | 12 ++++++++++++
 markdown/tests/extensions/test.cfg            |  6 ++++++
 markdown/tests/extensions/toc_nested.html     | 16 ++++++++++++++++
 markdown/tests/extensions/toc_nested.txt      |  9 +++++++++
 markdown/tests/extensions/toc_nested2.html    | 14 ++++++++++++++
 markdown/tests/extensions/toc_nested2.txt     | 10 ++++++++++
 markdown/tests/misc/raw_whitespace.html       |  8 ++++++++
 markdown/tests/misc/raw_whitespace.txt        | 10 ++++++++++
 markdown/tests/misc/smart_em.html             |  5 +++++
 markdown/tests/misc/smart_em.txt              |  9 +++++++++
 tests/extensions-x-extra/raw-html.html        | 14 --------------
 tests/extensions-x-extra/raw-html.txt         | 12 ------------
 tests/extensions-x-toc/nested.html            | 16 ----------------
 tests/extensions-x-toc/nested.txt             |  9 ---------
 tests/extensions-x-toc/nested2.html           | 14 --------------
 tests/extensions-x-toc/nested2.txt            | 10 ----------
 tests/misc/raw_whitespace.html                |  8 --------
 tests/misc/raw_whitespace.txt                 | 10 ----------
 tests/misc/smart_em.html                      |  5 -----
 tests/misc/smart_em.txt                       |  9 ---------
 21 files changed, 113 insertions(+), 107 deletions(-)
 create mode 100644 markdown/tests/extensions/extra/raw-html.html
 create mode 100644 markdown/tests/extensions/extra/raw-html.txt
 create mode 100644 markdown/tests/extensions/toc_nested.html
 create mode 100644 markdown/tests/extensions/toc_nested.txt
 create mode 100644 markdown/tests/extensions/toc_nested2.html
 create mode 100644 markdown/tests/extensions/toc_nested2.txt
 create mode 100644 markdown/tests/misc/raw_whitespace.html
 create mode 100644 markdown/tests/misc/raw_whitespace.txt
 create mode 100644 markdown/tests/misc/smart_em.html
 create mode 100644 markdown/tests/misc/smart_em.txt
 delete mode 100644 tests/extensions-x-extra/raw-html.html
 delete mode 100644 tests/extensions-x-extra/raw-html.txt
 delete mode 100644 tests/extensions-x-toc/nested.html
 delete mode 100644 tests/extensions-x-toc/nested.txt
 delete mode 100644 tests/extensions-x-toc/nested2.html
 delete mode 100644 tests/extensions-x-toc/nested2.txt
 delete mode 100644 tests/misc/raw_whitespace.html
 delete mode 100644 tests/misc/raw_whitespace.txt
 delete mode 100644 tests/misc/smart_em.html
 delete mode 100644 tests/misc/smart_em.txt

diff --git a/markdown/tests/extensions/extra/raw-html.html b/markdown/tests/extensions/extra/raw-html.html
new file mode 100644
index 0000000..b2a7c4d
--- /dev/null
+++ b/markdown/tests/extensions/extra/raw-html.html
@@ -0,0 +1,14 @@
+<div>
+
+<p><em>foo</em></p>
+</div>
+
+<div class="baz">
+
+<p><em>bar</em></p>
+</div>
+
+<div>
+
+<p><em>blah</em></p>
+</div>
\ No newline at end of file
diff --git a/markdown/tests/extensions/extra/raw-html.txt b/markdown/tests/extensions/extra/raw-html.txt
new file mode 100644
index 0000000..284fe0c
--- /dev/null
+++ b/markdown/tests/extensions/extra/raw-html.txt
@@ -0,0 +1,12 @@
+<div markdown="1">_foo_</div>
+
+<div markdown=1 class="baz">
+_bar_
+</div>
+
+<div markdown>
+
+_blah_
+
+</div>
+
diff --git a/markdown/tests/extensions/test.cfg b/markdown/tests/extensions/test.cfg
index 3a15b7b..6208201 100644
--- a/markdown/tests/extensions/test.cfg
+++ b/markdown/tests/extensions/test.cfg
@@ -7,5 +7,11 @@ extensions=toc
 [toc_invalid]
 extensions=toc
 
+[toc_nested]
+extensions=toc
+
+[toc_nested2]
+extensions=toc
+
 [wikilinks]
 extensions=wikilinks
diff --git a/markdown/tests/extensions/toc_nested.html b/markdown/tests/extensions/toc_nested.html
new file mode 100644
index 0000000..a8a1583
--- /dev/null
+++ b/markdown/tests/extensions/toc_nested.html
@@ -0,0 +1,16 @@
+<h1 id="header-a">Header A</h1>
+<h2 id="header-1">Header 1</h2>
+<h3 id="header-i">Header i</h3>
+<h1 id="header-b">Header B</h1>
+<div class="toc">
+<ul>
+<li><a href="#header-a">Header A</a><ul>
+<li><a href="#header-1">Header 1</a><ul>
+<li><a href="#header-i">Header i</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#header-b">Header B</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/markdown/tests/extensions/toc_nested.txt b/markdown/tests/extensions/toc_nested.txt
new file mode 100644
index 0000000..9b515f9
--- /dev/null
+++ b/markdown/tests/extensions/toc_nested.txt
@@ -0,0 +1,9 @@
+# Header A
+
+## Header 1
+
+### Header i
+
+# Header B
+
+[TOC]
diff --git a/markdown/tests/extensions/toc_nested2.html b/markdown/tests/extensions/toc_nested2.html
new file mode 100644
index 0000000..bf87716
--- /dev/null
+++ b/markdown/tests/extensions/toc_nested2.html
@@ -0,0 +1,14 @@
+<div class="toc">
+<ul>
+<li><a href="#start-with-header-other-than-one">Start with header other than one.</a></li>
+<li><a href="#header-3">Header 3</a><ul>
+<li><a href="#header-4">Header 4</a></li>
+</ul>
+</li>
+<li><a href="#header-3_1">Header 3</a></li>
+</ul>
+</div>
+<h3 id="start-with-header-other-than-one">Start with header other than one.</h3>
+<h3 id="header-3">Header 3</h3>
+<h4 id="header-4">Header 4</h4>
+<h3 id="header-3_1">Header 3</h3>
\ No newline at end of file
diff --git a/markdown/tests/extensions/toc_nested2.txt b/markdown/tests/extensions/toc_nested2.txt
new file mode 100644
index 0000000..9db4d8c
--- /dev/null
+++ b/markdown/tests/extensions/toc_nested2.txt
@@ -0,0 +1,10 @@
+[TOC]
+
+### Start with header other than one.
+
+### Header 3
+
+#### Header 4
+
+### Header 3
+
diff --git a/markdown/tests/misc/raw_whitespace.html b/markdown/tests/misc/raw_whitespace.html
new file mode 100644
index 0000000..7a6f131
--- /dev/null
+++ b/markdown/tests/misc/raw_whitespace.html
@@ -0,0 +1,8 @@
+<p>Preserve whitespace in raw html</p>
+<pre>
+class Foo():
+    bar = 'bar'
+
+    def baz(self):
+        print self.bar
+</pre>
\ No newline at end of file
diff --git a/markdown/tests/misc/raw_whitespace.txt b/markdown/tests/misc/raw_whitespace.txt
new file mode 100644
index 0000000..bbc7cec
--- /dev/null
+++ b/markdown/tests/misc/raw_whitespace.txt
@@ -0,0 +1,10 @@
+Preserve whitespace in raw html
+
+<pre>
+class Foo():
+    bar = 'bar'
+
+    def baz(self):
+        print self.bar
+</pre>
+
diff --git a/markdown/tests/misc/smart_em.html b/markdown/tests/misc/smart_em.html
new file mode 100644
index 0000000..5683b25
--- /dev/null
+++ b/markdown/tests/misc/smart_em.html
@@ -0,0 +1,5 @@
+<p><em>emphasis</em></p>
+<p>this_is_not_emphasis</p>
+<p>[<em>punctuation with emphasis</em>]</p>
+<p>[<em>punctuation_with_emphasis</em>]</p>
+<p>[punctuation_without_emphasis]</p>
\ No newline at end of file
diff --git a/markdown/tests/misc/smart_em.txt b/markdown/tests/misc/smart_em.txt
new file mode 100644
index 0000000..3c56842
--- /dev/null
+++ b/markdown/tests/misc/smart_em.txt
@@ -0,0 +1,9 @@
+_emphasis_
+
+this_is_not_emphasis
+
+[_punctuation with emphasis_]
+
+[_punctuation_with_emphasis_]
+
+[punctuation_without_emphasis]
diff --git a/tests/extensions-x-extra/raw-html.html b/tests/extensions-x-extra/raw-html.html
deleted file mode 100644
index b2a7c4d..0000000
--- a/tests/extensions-x-extra/raw-html.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-
-<p><em>foo</em></p>
-</div>
-
-<div class="baz">
-
-<p><em>bar</em></p>
-</div>
-
-<div>
-
-<p><em>blah</em></p>
-</div>
\ No newline at end of file
diff --git a/tests/extensions-x-extra/raw-html.txt b/tests/extensions-x-extra/raw-html.txt
deleted file mode 100644
index 284fe0c..0000000
--- a/tests/extensions-x-extra/raw-html.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-<div markdown="1">_foo_</div>
-
-<div markdown=1 class="baz">
-_bar_
-</div>
-
-<div markdown>
-
-_blah_
-
-</div>
-
diff --git a/tests/extensions-x-toc/nested.html b/tests/extensions-x-toc/nested.html
deleted file mode 100644
index a8a1583..0000000
--- a/tests/extensions-x-toc/nested.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1 id="header-a">Header A</h1>
-<h2 id="header-1">Header 1</h2>
-<h3 id="header-i">Header i</h3>
-<h1 id="header-b">Header B</h1>
-<div class="toc">
-<ul>
-<li><a href="#header-a">Header A</a><ul>
-<li><a href="#header-1">Header 1</a><ul>
-<li><a href="#header-i">Header i</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a href="#header-b">Header B</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/tests/extensions-x-toc/nested.txt b/tests/extensions-x-toc/nested.txt
deleted file mode 100644
index 9b515f9..0000000
--- a/tests/extensions-x-toc/nested.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Header A
-
-## Header 1
-
-### Header i
-
-# Header B
-
-[TOC]
diff --git a/tests/extensions-x-toc/nested2.html b/tests/extensions-x-toc/nested2.html
deleted file mode 100644
index bf87716..0000000
--- a/tests/extensions-x-toc/nested2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="toc">
-<ul>
-<li><a href="#start-with-header-other-than-one">Start with header other than one.</a></li>
-<li><a href="#header-3">Header 3</a><ul>
-<li><a href="#header-4">Header 4</a></li>
-</ul>
-</li>
-<li><a href="#header-3_1">Header 3</a></li>
-</ul>
-</div>
-<h3 id="start-with-header-other-than-one">Start with header other than one.</h3>
-<h3 id="header-3">Header 3</h3>
-<h4 id="header-4">Header 4</h4>
-<h3 id="header-3_1">Header 3</h3>
\ No newline at end of file
diff --git a/tests/extensions-x-toc/nested2.txt b/tests/extensions-x-toc/nested2.txt
deleted file mode 100644
index 9db4d8c..0000000
--- a/tests/extensions-x-toc/nested2.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[TOC]
-
-### Start with header other than one.
-
-### Header 3
-
-#### Header 4
-
-### Header 3
-
diff --git a/tests/misc/raw_whitespace.html b/tests/misc/raw_whitespace.html
deleted file mode 100644
index 7a6f131..0000000
--- a/tests/misc/raw_whitespace.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Preserve whitespace in raw html</p>
-<pre>
-class Foo():
-    bar = 'bar'
-
-    def baz(self):
-        print self.bar
-</pre>
\ No newline at end of file
diff --git a/tests/misc/raw_whitespace.txt b/tests/misc/raw_whitespace.txt
deleted file mode 100644
index bbc7cec..0000000
--- a/tests/misc/raw_whitespace.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Preserve whitespace in raw html
-
-<pre>
-class Foo():
-    bar = 'bar'
-
-    def baz(self):
-        print self.bar
-</pre>
-
diff --git a/tests/misc/smart_em.html b/tests/misc/smart_em.html
deleted file mode 100644
index 5683b25..0000000
--- a/tests/misc/smart_em.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p><em>emphasis</em></p>
-<p>this_is_not_emphasis</p>
-<p>[<em>punctuation with emphasis</em>]</p>
-<p>[<em>punctuation_with_emphasis</em>]</p>
-<p>[punctuation_without_emphasis]</p>
\ No newline at end of file
diff --git a/tests/misc/smart_em.txt b/tests/misc/smart_em.txt
deleted file mode 100644
index 3c56842..0000000
--- a/tests/misc/smart_em.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-_emphasis_
-
-this_is_not_emphasis
-
-[_punctuation with emphasis_]
-
-[_punctuation_with_emphasis_]
-
-[punctuation_without_emphasis]
-- 
cgit v1.2.3