Merge branch 'master' into always-split-markdown-in-html

trentm · Dec 26, 2023 · 0203031 · 0203031
2 parents c119ef5 + 844942a
commit 0203031
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## python-markdown2 2.4.13 (not yet released)
 
+- [pull #559] Allow cuddled tables (#557)
 - [pull #560] Fix `markdown-in-html` not always splitting HTML tags into separate lines (#558)
 
 

diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -1253,7 +1253,7 @@ def _do_tables(self, text):
         """
         less_than_tab = self.tab_width - 1
         table_re = re.compile(r'''
-                (?:(?<=\n\n)|\A\n?)             # leading blank line
+                (?:(?<=\n)|\A\n?)             # leading blank line
 
                 ^[ ]{0,%d}                      # allowed whitespace
                 (.*[|].*)[ ]*\n                   # $1: header row (at least one pipe)

diff --git a/test/tm-cases/tables.html b/test/tm-cases/tables.html
@@ -130,13 +130,28 @@ <h1>table with cuddled following content</h1>
 
 <p><em>Note:</em> This passes GFM, but fails in PHP-Markdown.</p>
 
-<h1>FAIL: table with cuddled leading content</h1>
+<h1>table with cuddled leading content</h1>
 
-<p>before
-| Header 1 | Header 2 |
-| -------- | -------- |
-| Cell 1 | Cell 2 |
-| Cell 3 | Cell 4 |</p>
+<p>This would have failed in &lt;=2.4.13</p>
+
+<table>
+<thead>
+<tr>
+  <th>Header 1</th>
+  <th>Header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td>Cell 1</td>
+  <td>Cell 2</td>
+</tr>
+<tr>
+  <td>Cell 3</td>
+  <td>Cell 4</td>
+</tr>
+</tbody>
+</table>
 
 <h1>single column single leading bar</h1>
 

diff --git a/test/tm-cases/tables.text b/test/tm-cases/tables.text
@@ -50,9 +50,9 @@ after
 *Note:* This passes GFM, but fails in PHP-Markdown.
 
 
-# FAIL: table with cuddled leading content
+# table with cuddled leading content
 
-before
+This would have failed in <=2.4.13
 | Header 1 | Header 2 |
 | -------- | -------- |
 | Cell 1 | Cell 2 |