Imported Upstream version 7.7.3upstream/7.7.3

1 files changed, 21 insertions, 6 deletions

diff --git a/nikola/plugins/compile/markdown/mdx_nikola.py b/nikola/plugins/compile/markdown/mdx_nikola.py
index 54cc18c..7984121 100644
--- a/nikola/plugins/compile/markdown/mdx_nikola.py
+++ b/nikola/plugins/compile/markdown/mdx_nikola.py
@@ -24,25 +24,31 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-"""Markdown Extension for Nikola-specific post-processing."""
+"""Markdown Extension for Nikola.
+
+- Specific post-processing.
+- Strikethrough inline patterns.
+"""
 
 from __future__ import unicode_literals
 import re
 try:
     from markdown.postprocessors import Postprocessor
+    from markdown.inlinepatterns import SimpleTagPattern
     from markdown.extensions import Extension
 except ImportError:
     # No need to catch this, if you try to use this without Markdown,
     # the markdown compiler will fail first
-    Postprocessor = Extension = object
+    Postprocessor = SimpleTagPattern = Extension = object
 
 from nikola.plugin_categories import MarkdownExtension
 
+
 CODERE = re.compile('<div class="codehilite"><pre>(.*?)</pre></div>', flags=re.MULTILINE | re.DOTALL)
+STRIKE_RE = r"(~{2})(.+?)(~{2})"  # ~~strike~~
 
 
 class NikolaPostProcessor(Postprocessor):
-
     """Nikola-specific post-processing for Markdown."""
 
     def run(self, text):
@@ -57,13 +63,22 @@ class NikolaPostProcessor(Postprocessor):
 
 
 class NikolaExtension(MarkdownExtension, Extension):
+    """Nikola Markdown extensions."""
 
-    """Extension for injecting the postprocessor."""
-
-    def extendMarkdown(self, md, md_globals):
+    def _add_nikola_post_processor(self, md):
         """Extend Markdown with the postprocessor."""
         pp = NikolaPostProcessor()
         md.postprocessors.add('nikola_post_processor', pp, '_end')
+
+    def _add_strikethrough_inline_pattern(self, md):
+        """Support PHP-Markdown style strikethrough, for example: ``~~strike~~``."""
+        pattern = SimpleTagPattern(STRIKE_RE, 'del')
+        md.inlinePatterns.add('strikethrough', pattern, '_end')
+
+    def extendMarkdown(self, md, md_globals):
+        """Extend markdown to Nikola flavours."""
+        self._add_nikola_post_processor(md)
+        self._add_strikethrough_inline_pattern(md)
         md.registerExtension(self)