Merge branch 'master' into admonition

Conflicts:
	docs/extensions/index.txt
	tests/extensions/test.cfg

9 files changed, 156 insertions, 9 deletions

diff --git a/tests/misc/attributes-image-ref.html b/tests/misc/attributes-image-ref.html
new file mode 100644
index 0000000..6974420
--- /dev/null
+++ b/tests/misc/attributes-image-ref.html
@@ -0,0 +1 @@
+<p><img alt="img" id="foo" src="http://example.com/i.jpg" /></p>
\ No newline at end of file
diff --git a/tests/misc/attributes-image-ref.txt b/tests/misc/attributes-image-ref.txt
new file mode 100644
index 0000000..a216971
--- /dev/null
+++ b/tests/misc/attributes-image-ref.txt
@@ -0,0 +1,4 @@
+![img{@id=foo}][img]
+
+  [img]: http://example.com/i.jpg
+
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/div.html b/tests/misc/div.html
index 7b68854..cb6a759 100644
--- a/tests/misc/div.html
+++ b/tests/misc/div.html
@@ -2,4 +2,9 @@
 
    _foo_
 
-</div>
\ No newline at end of file
+</div>
+
+<p>And now in uppercase:</p>
+<DIV>
+foo
+</DIV>
\ No newline at end of file
diff --git a/tests/misc/div.txt b/tests/misc/div.txt
index ca87745..4ff972e 100644
--- a/tests/misc/div.txt
+++ b/tests/misc/div.txt
@@ -3,3 +3,9 @@
    _foo_
 
 </div>
+
+And now in uppercase:
+
+<DIV>
+foo
+</DIV>
diff --git a/tests/misc/html.html b/tests/misc/html.html
index c72bb81..1eb6a97 100644
--- a/tests/misc/html.html
+++ b/tests/misc/html.html
@@ -1,7 +1,6 @@
 <h1>Block level html</h1>
 
-<p>Some inline <b>stuff<b>.<br />
-</p>
+<p>Some inline <b>stuff<b>.  </p>
 <p>Now some <arbitrary>arbitrary tags</arbitrary>.</p>
 <div>More block level html.</div>
 
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/url_spaces.html b/tests/misc/url_spaces.html
index ebacb75..f9c91b3 100644
--- a/tests/misc/url_spaces.html
+++ b/tests/misc/url_spaces.html
@@ -1,2 +1,2 @@
-<p><a href="http://wikipedia.org/wiki/Dawn of War">Dawn of War</a></p>
-<p><a href="http://wikipedia.org/wiki/Dawn of War" title="Dawn of War">Dawn of War</a></p>
\ No newline at end of file
+<p><a href="http://wikipedia.org/wiki/Dawn%20of%20War">Dawn of War</a></p>
+<p><a href="http://wikipedia.org/wiki/Dawn%20of%20War" title="Dawn of War">Dawn of War</a></p>
\ No newline at end of file