diff options
| author | Waylan Limberg <waylan.limberg@icloud.com> | 2015-11-07 12:57:18 -0500 |
|---|---|---|
| committer | Waylan Limberg <waylan.limberg@icloud.com> | 2015-11-07 12:57:18 -0500 |
| commit | b8f87d1555dd391c8010f32cfea8ca6ec7768a9b (patch) | |
| tree | 933a9115933513c034e9e3b06918818b0c7d5072 | |
| parent | 5deee37e22192c8e6e0d55358eaa013494d20b2c (diff) | |
| parent | b966709845116975709bbe7aec98eab6732e44df (diff) | |
| download | markdown-b8f87d1555dd391c8010f32cfea8ca6ec7768a9b.tar.gz markdown-b8f87d1555dd391c8010f32cfea8ca6ec7768a9b.tar.bz2 markdown-b8f87d1555dd391c8010f32cfea8ca6ec7768a9b.zip | |
Merge pull request #441 from mitya57/master
Fix #440 (Tables extension drops characters after code spans)
| -rw-r--r-- | markdown/extensions/tables.py | 2 | ||||
| -rw-r--r-- | tests/extensions/extra/tables.html | 15 | ||||
| -rw-r--r-- | tests/extensions/extra/tables.txt | 8 |
3 files changed, 23 insertions, 2 deletions
diff --git a/markdown/extensions/tables.py b/markdown/extensions/tables.py index 494aaeb..39c09a4 100644 --- a/markdown/extensions/tables.py +++ b/markdown/extensions/tables.py @@ -119,7 +119,7 @@ class TableProcessor(BlockProcessor): groups = match.groups() delim = groups[1] # the code block delimeter (ie 1 or more backticks) row_contents = groups[2] # the text contained inside the code block - i += match.start(4) # jump pointer to the beginning of the rest of the text (group #4) + i += match.start(4) - 1 # jump pointer to the beginning of the rest of the text (group #4) element = delim + row_contents + delim # reinstert backticks current += element i += 1 diff --git a/tests/extensions/extra/tables.html b/tests/extensions/extra/tables.html index 91337e5..783c205 100644 --- a/tests/extensions/extra/tables.html +++ b/tests/extensions/extra/tables.html @@ -235,4 +235,19 @@ Content Cell | Content Cell <td>more words</td> </tr> </tbody> +</table> +<p>A test for issue #440:</p> +<table> +<thead> +<tr> +<th>foo</th> +<th>bar</th> +</tr> +</thead> +<tbody> +<tr> +<td>foo</td> +<td>(<code>bar</code>) and <code>baz</code>.</td> +</tr> +</tbody> </table>
\ No newline at end of file diff --git a/tests/extensions/extra/tables.txt b/tests/extensions/extra/tables.txt index 1602d1f..c9ca70a 100644 --- a/tests/extensions/extra/tables.txt +++ b/tests/extensions/extra/tables.txt @@ -68,4 +68,10 @@ words |``` some | code ``` | more words words |```` some | code ```` | more words words |`` some ` | ` code `` | more words words |``` some ` | ` code ``` | more words -words |```` some ` | ` code ```` | more words
\ No newline at end of file +words |```` some ` | ` code ```` | more words + +A test for issue #440: + +foo | bar +--- | --- +foo | (`bar`) and `baz`.
\ No newline at end of file |