Skip to content

Use a different approach to fix the smarty bug #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 20, 2015
Merged

Use a different approach to fix the smarty bug #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
621cac4
Revert "smarty: Use a separate processor for angled quotes"
mitya57 Jun 19, 2015
c906d6d
Add a test to make sure quotes processor does not touch code blocks
mitya57 Jun 19, 2015
93d7941
Override regex for html inline pattern when smart_angled_quotes is true
mitya57 Jun 20, 2015
644e32c
Add a test for duplicate angled quotes without smarty extension
mitya57 Jun 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions markdown/extensions/smarty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

from __future__ import unicode_literals
from . import Extension
from ..inlinepatterns import HtmlPattern
from ..inlinepatterns import HtmlPattern, HTML_RE
from ..odict import OrderedDict
from ..treeprocessors import InlineProcessor

Expand Down Expand Up @@ -147,6 +147,8 @@
remainingSingleQuotesRegex = "'"
remainingDoubleQuotesRegex = '"'

HTML_STRICT_RE = HTML_RE + r'(?!\>)'


class SubstituteTextPattern(HtmlPattern):
def __init__(self, pattern, replace, markdown_instance):
Expand Down Expand Up @@ -211,10 +213,10 @@ def educateAngledQuotes(self, md):
rightAngledQuotePattern = SubstituteTextPattern(
r'\>\>', (self.substitutions['right-angle-quote'],), md
)
self.angledQuotesPatterns.add(
self.inlinePatterns.add(
'smarty-left-angle-quotes', leftAngledQuotePattern, '_begin'
)
self.angledQuotesPatterns.add(
self.inlinePatterns.add(
'smarty-right-angle-quotes',
rightAngledQuotePattern,
'>smarty-left-angle-quotes'
Expand Down Expand Up @@ -249,18 +251,17 @@ def extendMarkdown(self, md, md_globals):
self.educateEllipses(md)
if configs['smart_quotes']:
self.educateQuotes(md)
if configs['smart_angled_quotes']:
self.educateAngledQuotes(md)
# Override HTML_RE from inlinepatterns.py so that it does not
# process tags with duplicate closing quotes.
md.inlinePatterns["html"] = HtmlPattern(HTML_STRICT_RE, md)
if configs['smart_dashes']:
self.educateDashes(md)
inlineProcessor = InlineProcessor(md)
inlineProcessor.inlinePatterns = self.inlinePatterns
md.treeprocessors.add('smarty', inlineProcessor, '_end')
md.ESCAPED_CHARS.extend(['"', "'"])
if configs['smart_angled_quotes']:
self.angledQuotesPatterns = OrderedDict()
self.educateAngledQuotes(md)
angledQuotesProcessor = InlineProcessor(md)
angledQuotesProcessor.inlinePatterns = self.angledQuotesPatterns
md.treeprocessors.add('smarty-angledquotes', angledQuotesProcessor, '<inline')


def makeExtension(*args, **kwargs):
Expand Down
3 changes: 2 additions & 1 deletion tests/basic/inline-html-simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@

<hr class="foo" id="bar" >

<p><some <a href="http://example.com">weird</a> stuff></p>
<p><some <a href="http://example.com">weird</a> stuff></p>
<p><some>&gt; &lt;<unbalanced>&gt; &lt;<brackets></p>
2 changes: 2 additions & 0 deletions tests/basic/inline-html-simple.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ Hr's:
<hr class="foo" id="bar" >

<some [weird](http://example.com) stuff>

<some>> <<unbalanced>> <<brackets>
2 changes: 1 addition & 1 deletion tests/extensions/smarty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Escaped ellipsis...</p>
<p>&lsquo;Escaped "quotes" in real ones&rsquo;<br />
'&ldquo;Real&rdquo; quotes in escaped ones'</p>
<p>Skip <code>"code" -- --- 'spans' ...</code>.</p>
<p>Skip <code>&lt;&lt;all&gt;&gt; "code" -- --- 'spans' ...</code>.</p>
<pre><code>Also skip "code" 'blocks'
foo -- bar --- baz ...
</code></pre>
2 changes: 1 addition & 1 deletion tests/extensions/smarty.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Escaped ellipsis\...
'Escaped \"quotes\" in real ones'
\'"Real" quotes in escaped ones\'

Skip `"code" -- --- 'spans' ...`.
Skip `<<all>> "code" -- --- 'spans' ...`.

Also skip "code" 'blocks'
foo -- bar --- baz ...