Merge pull request #356 from codebykat/fix/two-blockquotes-in-a-row-g…

…et-merged Blockquotes: Don't merge sequential quotes into a single blockquote
trentm · Jun 16, 2020 · b19ae37 · b19ae37
2 parents 8c0ddb3 + 7d3c6d6
commit b19ae37
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -2027,7 +2027,6 @@ def _do_smart_punctuation(self, text):
             ^[ \t]*>%s[ \t]?        # '>' at the start of a line
               .+\n                  # rest of the first line
             (.+\n)*                 # subsequent consecutive lines
-            \n*                     # blanks
           )+
         )
     '''

diff --git a/test/tm-cases/blockquote_containing_empty_lines.html b/test/tm-cases/blockquote_containing_empty_lines.html
@@ -0,0 +1,5 @@
+<blockquote>
+  <p>no way</p>
+
+  <p>way</p>
+</blockquote>
diff --git a/test/tm-cases/blockquote_containing_empty_lines.text b/test/tm-cases/blockquote_containing_empty_lines.text
@@ -0,0 +1,4 @@
+> no way
+>
+>
+> way
diff --git a/test/tm-cases/blockquote_two_in_a_row.html b/test/tm-cases/blockquote_two_in_a_row.html
@@ -0,0 +1,7 @@
+<blockquote>
+  <p>no way</p>
+</blockquote>
+
+<blockquote>
+  <p>way</p>
+</blockquote>
diff --git a/test/tm-cases/blockquote_two_in_a_row.text b/test/tm-cases/blockquote_two_in_a_row.text
@@ -0,0 +1,3 @@
+> no way
+
+> way