New upstream version 7.8.1upstream/7.8.1

4 files changed, 37 insertions, 138 deletions

diff --git a/nikola/plugins/compile/markdown/__init__.py b/nikola/plugins/compile/markdown/__init__.py
index 93438a3..2e4234c 100644
--- a/nikola/plugins/compile/markdown/__init__.py
+++ b/nikola/plugins/compile/markdown/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2016 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -69,13 +69,25 @@ class CompileMarkdown(PageCompiler):
             req_missing(['markdown'], 'build this site (compile Markdown)')
         makedirs(os.path.dirname(dest))
         self.extensions += self.site.config.get("MARKDOWN_EXTENSIONS")
+        try:
+            post = self.site.post_per_input_file[source]
+        except KeyError:
+            post = None
         with io.open(dest, "w+", encoding="utf8") as out_file:
             with io.open(source, "r", encoding="utf8") as in_file:
                 data = in_file.read()
             if not is_two_file:
                 _, data = self.split_metadata(data)
-            output = markdown(data, self.extensions)
+            output = markdown(data, self.extensions, output_format="html5")
+            output, shortcode_deps = self.site.apply_shortcodes(output, filename=source, with_dependencies=True, extra_context=dict(post=post))
             out_file.write(output)
+        if post is None:
+            if shortcode_deps:
+                self.logger.error(
+                    "Cannot save dependencies for post {0} due to unregistered source file name",
+                    source)
+        else:
+            post._depfile[dest] += shortcode_deps
 
     def create_post(self, path, **kw):
         """Create a new post."""
diff --git a/nikola/plugins/compile/markdown/mdx_gist.py b/nikola/plugins/compile/markdown/mdx_gist.py
index a930de5..25c071f 100644
--- a/nikola/plugins/compile/markdown/mdx_gist.py
+++ b/nikola/plugins/compile/markdown/mdx_gist.py
@@ -31,161 +31,48 @@ Extension to Python Markdown for Embedded Gists (gist.github.com).
 
 Basic Example:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: 4747847]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/4747847.js"></script>
-    <noscript>
-    <pre>import this</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    [:gist: 4747847]
 
 Example with filename:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: 4747847 zen.py]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/4747847.js?file=zen.py"></script>
-    <noscript>
-    <pre>import this</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    [:gist: 4747847 zen.py]
 
 Basic Example with hexidecimal id:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: c4a43d6fdce612284ac0]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/c4a43d6fdce612284ac0.js"></script>
-    <noscript>
-    <pre>Moo</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    [:gist: c4a43d6fdce612284ac0]
 
 Example with hexidecimal id filename:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: c4a43d6fdce612284ac0 cow.txt]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/c4a43d6fdce612284ac0.js?file=cow.txt"></script>
-    <noscript>
-    <pre>Moo</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    [:gist: c4a43d6fdce612284ac0 cow.txt]
 
 Example using reStructuredText syntax:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... .. gist:: 4747847 zen.py
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/4747847.js?file=zen.py"></script>
-    <noscript>
-    <pre>import this</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    .. gist:: 4747847 zen.py
 
 Example using hexidecimal ID with reStructuredText syntax:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... .. gist:: c4a43d6fdce612284ac0
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/c4a43d6fdce612284ac0.js"></script>
-    <noscript>
-    <pre>Moo</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    .. gist:: c4a43d6fdce612284ac0
 
 Example using hexidecimal ID and filename with reStructuredText syntax:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... .. gist:: c4a43d6fdce612284ac0 cow.txt
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/c4a43d6fdce612284ac0.js?file=cow.txt"></script>
-    <noscript>
-    <pre>Moo</pre>
-    </noscript>
-    </div>
-    </p>
+    Text of the gist:
+    .. gist:: c4a43d6fdce612284ac0 cow.txt
 
 Error Case: non-existent Gist ID:
 
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: 0]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/0.js"></script>
-    <noscript><!-- WARNING: Received a 404 response from Gist URL: https://gist.githubusercontent.com/raw/0 --></noscript>
-    </div>
-    </p>
-
-Error Case:  non-existent file:
-
-    >>> import markdown
-    >>> text = '''
-    ... Text of the gist:
-    ... [:gist: 4747847 doesntexist.py]
-    ... '''
-    >>> html = markdown.markdown(text, [GistExtension()])
-    >>> print(html)
-    <p>Text of the gist:
-    <div class="gist">
-    <script src="https://gist.github.com/4747847.js?file=doesntexist.py"></script>
-    <noscript><!-- WARNING: Received a 404 response from Gist URL: https://gist.githubusercontent.com/raw/4747847/doesntexist.py --></noscript>
-    </div>
-    </p>
+    Text of the gist:
+    [:gist: 0]
+
+Error Case: non-existent file:
+
+    Text of the gist:
+    [:gist: 4747847 doesntexist.py]
 """
 
 from __future__ import unicode_literals, print_function
diff --git a/nikola/plugins/compile/markdown/mdx_nikola.py b/nikola/plugins/compile/markdown/mdx_nikola.py
index 7984121..59a5d5b 100644
--- a/nikola/plugins/compile/markdown/mdx_nikola.py
+++ b/nikola/plugins/compile/markdown/mdx_nikola.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2016 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
diff --git a/nikola/plugins/compile/markdown/mdx_podcast.py b/nikola/plugins/compile/markdown/mdx_podcast.py
index 0f68e40..96a70ed 100644
--- a/nikola/plugins/compile/markdown/mdx_podcast.py
+++ b/nikola/plugins/compile/markdown/mdx_podcast.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013-2015 Michael Rabbitt, Roberto Alsina and others.
+# Copyright © 2013-2016 Michael Rabbitt, Roberto Alsina and others.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the