aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan.limberg@icloud.com>2015-11-06 17:34:23 -0500
committerWaylan Limberg <waylan.limberg@icloud.com>2015-11-06 17:34:23 -0500
commit6897545a10e52deda73d2e19a7c71bcfa2883bb4 (patch)
treefe77eb9a9d6886db771d7ea2ede40a98ba8c1e0f
parent9ce3138b7e9cf887c590c67331da4f8ba4b5b7a1 (diff)
downloadmarkdown-6897545a10e52deda73d2e19a7c71bcfa2883bb4.tar.gz
markdown-6897545a10e52deda73d2e19a7c71bcfa2883bb4.tar.bz2
markdown-6897545a10e52deda73d2e19a7c71bcfa2883bb4.zip
Ensure InlinePatterns don't drop newlines.
Drppoed the non-greedy quantifier from the end of the inlinePatterns as it served no useful purpose and was actually (in very rare edge cases) causing newlines to be dropped. FIxes #439. Thanks to @munificent for the report.
-rw-r--r--markdown/inlinepatterns.py2
-rw-r--r--tests/extensions/smarty.html4
-rw-r--r--tests/extensions/smarty.txt3
3 files changed, 7 insertions, 2 deletions
diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py
index 95d358d..dcf4ad4 100644
--- a/markdown/inlinepatterns.py
+++ b/markdown/inlinepatterns.py
@@ -198,7 +198,7 @@ class Pattern(object):
"""
self.pattern = pattern
- self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern,
+ self.compiled_re = re.compile("^(.*?)%s(.*)$" % pattern,
re.DOTALL | re.UNICODE)
# Api for Markdown to pass safe_mode into instance
diff --git a/tests/extensions/smarty.html b/tests/extensions/smarty.html
index 50cf774..e37e377 100644
--- a/tests/extensions/smarty.html
+++ b/tests/extensions/smarty.html
@@ -27,4 +27,6 @@ Escaped ellipsis...</p>
<p>Skip <code>&lt;&lt;all&gt;&gt; "code" -- --- 'spans' ...</code>.</p>
<pre><code>Also skip "code" 'blocks'
foo -- bar --- baz ...
-</code></pre> \ No newline at end of file
+</code></pre>
+<p>A line that &lsquo;wraps&rsquo; with
+<em>emphasis</em> at the beginning of the next line.</p> \ No newline at end of file
diff --git a/tests/extensions/smarty.txt b/tests/extensions/smarty.txt
index f2f4041..12e5c95 100644
--- a/tests/extensions/smarty.txt
+++ b/tests/extensions/smarty.txt
@@ -35,3 +35,6 @@ Skip `<<all>> "code" -- --- 'spans' ...`.
Also skip "code" 'blocks'
foo -- bar --- baz ...
+
+A line that 'wraps' with
+*emphasis* at the beginning of the next line.