Skip to content

Fix processing angle quotes in smarty extension #417

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 2 commits into from
Jun 15, 2015
Merged

Fix processing angle quotes in smarty extension #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9bb31
tests: Add a failing case for `<<Hello>>` to smarty test
mitya57 Jun 15, 2015
5029d82
smarty: Use a separate processor for angled quotes
mitya57 Jun 15, 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
12 changes: 8 additions & 4 deletions markdown/extensions/smarty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ def educateAngledQuotes(self, md):
rightAngledQuotePattern = SubstituteTextPattern(
r'\>\>', (self.substitutions['right-angle-quote'],), md
)
self.inlinePatterns.add(
self.angledQuotesPatterns.add(
'smarty-left-angle-quotes', leftAngledQuotePattern, '_begin'
)
self.inlinePatterns.add(
self.angledQuotesPatterns.add(
'smarty-right-angle-quotes',
rightAngledQuotePattern,
'>smarty-left-angle-quotes'
Expand Down Expand Up @@ -249,14 +249,18 @@ def extendMarkdown(self, md, md_globals):
self.educateEllipses(md)
if configs['smart_quotes']:
self.educateQuotes(md)
if configs['smart_angled_quotes']:
self.educateAngledQuotes(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
1 change: 1 addition & 0 deletions tests/extensions/smarty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
&ldquo;<a href="http://example.com">Link</a>&rdquo; &mdash; she said.</p>
<p>&ldquo;Ellipsis within quotes&hellip;&rdquo;</p>
<p>Кавычки-&laquo;ёлочки&raquo;<br />
&laquo;hello&raquo;<br />
Anführungszeichen-&raquo;Chevrons&laquo;</p>
<hr />
<p>Escaped -- ndash<br />
Expand Down
1 change: 1 addition & 0 deletions tests/extensions/smarty.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ em-dashes (---) and ellipes (...)
"Ellipsis within quotes..."

Кавычки-<<ёлочки>>
<<hello>>
Anführungszeichen->>Chevrons<<

--- -- ---
Expand Down