From 1270231bd33bfdbde93a3faa0af0c211d3616cd0 Mon Sep 17 00:00:00 2001
From: Waylan Limberg
Date: Thu, 18 Jun 2015 15:58:48 -0400
Subject: Revert "Fix processing angle quotes in smarty extension"
---
markdown/extensions/smarty.py | 12 ++++--------
tests/extensions/smarty.html | 1 -
tests/extensions/smarty.txt | 1 -
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/markdown/extensions/smarty.py b/markdown/extensions/smarty.py
index 223f2ad..46e54c1 100644
--- a/markdown/extensions/smarty.py
+++ b/markdown/extensions/smarty.py
@@ -211,10 +211,10 @@ class SmartyExtension(Extension):
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'
@@ -249,18 +249,14 @@ class SmartyExtension(Extension):
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, '
“Link” — she said.
“Ellipsis within quotes…”
Кавычки-«ёлочки»
-«hello»
Anführungszeichen-»Chevrons«
Escaped -- ndash
diff --git a/tests/extensions/smarty.txt b/tests/extensions/smarty.txt
index d7cba6a..48430bb 100644
--- a/tests/extensions/smarty.txt
+++ b/tests/extensions/smarty.txt
@@ -19,7 +19,6 @@ em-dashes (---) and ellipes (...)
"Ellipsis within quotes..."
Кавычки-<<ёлочки>>
-<>
Anführungszeichen->>Chevrons<<
--- -- ---
--
cgit v1.2.1