Merge branch 'master' into admonition

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

1 files changed, 73 insertions, 0 deletions

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