Merge pull request #1627 from johnmastro/smartypants-html-entities

Tell smartypants to also process " entities

pelican/readers.py

@@ -467,6 +467,13 @@ def read_file(self, base_path, path, content_class=Page, fmt=None,
         # eventually filter the content with typogrify if asked so
         if self.settings['TYPOGRIFY']:
             from typogrify.filters import typogrify
+            import smartypants
+
+            # Tell `smartypants` to also replace " HTML entities with
+            # smart quotes. This is necessary because Docutils has already
+            # replaced double quotes with said entities by the time we run
+            # this filter.
+            smartypants.Attr.default |= smartypants.Attr.w
 
             def typogrify_wrapper(text):
                 """Ensures ignore_tags feature is backward compatible"""

pelican/tests/test_readers.py

@@ -121,7 +121,7 @@ def test_typogrify(self):
             page = self.read_file(path='article.rst', TYPOGRIFY=True)
             expected = (
                 '<p><span class="caps">THIS</span> is some content. '
-                'With some stuff to&nbsp;&quot;typogrify&quot;&#8230;</p>\n'
+                'With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n'
                 '<p>Now with added support for <abbr title="three letter '
                 'acronym"><span class="caps">TLA</span></abbr>.</p>\n')
 
@@ -146,8 +146,8 @@ def test_typogrify_summary(self):
                                   TYPOGRIFY=True)
             expected = ('<p class="first last">Multi-line metadata should be'
                         ' supported\nas well as <strong>inline'
-                        ' markup</strong> and stuff to&nbsp;&quot;typogrify'
-                        '&quot;&#8230;</p>\n')
+                        ' markup</strong> and stuff to&nbsp;&#8220;typogrify'
+                        '&#8221;&#8230;</p>\n')
 
             self.assertEqual(page.metadata['summary'], expected)
         except ImportError: