Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

38 files changed, 553 insertions, 395 deletions

diff --git a/nikola/plugins/compile/__init__.py b/nikola/plugins/compile/__init__.py
index 60f1919..ff7e9a2 100644
--- a/nikola/plugins/compile/__init__.py
+++ b/nikola/plugins/compile/__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
diff --git a/nikola/plugins/compile/html.plugin b/nikola/plugins/compile/html.plugin
index 53ade61..f95bdd5 100644
--- a/nikola/plugins/compile/html.plugin
+++ b/nikola/plugins/compile/html.plugin
@@ -5,7 +5,7 @@ module = html
 [Documentation]
 author = Roberto Alsina
 version = 1.0
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Compile HTML into HTML (just copy)
 
 [Nikola]
diff --git a/nikola/plugins/compile/html.py b/nikola/plugins/compile/html.py
index 5f8b244..942d6da 100644
--- a/nikola/plugins/compile/html.py
+++ b/nikola/plugins/compile/html.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
@@ -36,7 +36,6 @@ from nikola.utils import makedirs, write_metadata
 
 
 class CompileHtml(PageCompiler):
-
     """Compile HTML into HTML."""
 
     name = "html"
@@ -45,12 +44,24 @@ class CompileHtml(PageCompiler):
     def compile_html(self, source, dest, is_two_file=True):
         """Compile source file into HTML and save as dest."""
         makedirs(os.path.dirname(dest))
+        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)
+            data, shortcode_deps = self.site.apply_shortcodes(data, with_dependencies=True, extra_context=dict(post=post))
             out_file.write(data)
+        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
         return True
 
     def create_post(self, path, **kw):
diff --git a/nikola/plugins/compile/ipynb.py b/nikola/plugins/compile/ipynb.py
index a9dedde..f3fdeea 100644
--- a/nikola/plugins/compile/ipynb.py
+++ b/nikola/plugins/compile/ipynb.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2013-2015 Damián Avila, Chris Warrick and others.
+# Copyright © 2013-2016 Damián Avila, Chris Warrick and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -32,28 +32,39 @@ import os
 import sys
 
 try:
-    import IPython
-    from IPython.nbconvert.exporters import HTMLExporter
-    if IPython.version_info[0] >= 3:     # API changed with 3.0.0
-        from IPython import nbformat
-        current_nbformat = nbformat.current_nbformat
-        from IPython.kernel import kernelspec
-    else:
-        import IPython.nbformat.current as nbformat
-        current_nbformat = 'json'
-        kernelspec = None
-
-    from IPython.config import Config
+    from nbconvert.exporters import HTMLExporter
+    import nbformat
+    current_nbformat = nbformat.current_nbformat
+    from jupyter_client import kernelspec
+    from traitlets.config import Config
     flag = True
+    ipy_modern = True
 except ImportError:
-    flag = None
+    try:
+        import IPython
+        from IPython.nbconvert.exporters import HTMLExporter
+        if IPython.version_info[0] >= 3:     # API changed with 3.0.0
+            from IPython import nbformat
+            current_nbformat = nbformat.current_nbformat
+            from IPython.kernel import kernelspec
+            ipy_modern = True
+        else:
+            import IPython.nbformat.current as nbformat
+            current_nbformat = 'json'
+            kernelspec = None
+            ipy_modern = False
+
+        from IPython.config import Config
+        flag = True
+    except ImportError:
+        flag = None
+        ipy_modern = None
 
 from nikola.plugin_categories import PageCompiler
 from nikola.utils import makedirs, req_missing, get_logger, STDERR_HANDLER
 
 
 class CompileIPynb(PageCompiler):
-
     """Compile IPynb into HTML."""
 
     name = "ipynb"
@@ -70,7 +81,6 @@ class CompileIPynb(PageCompiler):
         """Export notebooks as HTML strings."""
         if flag is None:
             req_missing(['ipython[notebook]>=2.0.0'], 'build this site (compile ipynb)')
-        HTMLExporter.default_template = 'basic'
         c = Config(self.site.config['IPYNB_CONFIG'])
         exportHtml = HTMLExporter(config=c)
         with io.open(source, "r", encoding="utf8") as in_file:
@@ -81,8 +91,21 @@ class CompileIPynb(PageCompiler):
     def compile_html(self, source, dest, is_two_file=True):
         """Compile source file into HTML and save as dest."""
         makedirs(os.path.dirname(dest))
+        try:
+            post = self.site.post_per_input_file[source]
+        except KeyError:
+            post = None
         with io.open(dest, "w+", encoding="utf8") as out_file:
-            out_file.write(self.compile_html_string(source, is_two_file))
+            output = self.compile_html_string(source, is_two_file)
+            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 read_metadata(self, post, file_metadata_regexp=None, unslugify_titles=False, lang=None):
         """Read metadata directly from ipynb file.
@@ -119,7 +142,7 @@ class CompileIPynb(PageCompiler):
             # imported .ipynb file, guaranteed to start with "{" because it’s JSON.
             nb = nbformat.reads(content, current_nbformat)
         else:
-            if IPython.version_info[0] >= 3:
+            if ipy_modern:
                 nb = nbformat.v4.new_notebook()
                 nb["cells"] = [nbformat.v4.new_markdown_cell(content)]
             else:
@@ -152,7 +175,7 @@ class CompileIPynb(PageCompiler):
             nb["metadata"]["nikola"] = metadata
 
         with io.open(path, "w+", encoding="utf8") as fd:
-            if IPython.version_info[0] >= 3:
+            if ipy_modern:
                 nbformat.write(nb, fd, 4)
             else:
                 nbformat.write(nb, fd, 'ipynb')
diff --git a/nikola/plugins/compile/markdown.plugin b/nikola/plugins/compile/markdown.plugin
index f7d11b1..2607413 100644
--- a/nikola/plugins/compile/markdown.plugin
+++ b/nikola/plugins/compile/markdown.plugin
@@ -5,7 +5,7 @@ module = markdown
 [Documentation]
 author = Roberto Alsina
 version = 1.0
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Compile Markdown into HTML
 
 [Nikola]
diff --git a/nikola/plugins/compile/markdown/__init__.py b/nikola/plugins/compile/markdown/__init__.py
index c1425a1..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
@@ -44,7 +44,6 @@ from nikola.utils import makedirs, req_missing, write_metadata
 
 
 class CompileMarkdown(PageCompiler):
-
     """Compile Markdown into HTML."""
 
     name = "markdown"
@@ -70,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.plugin b/nikola/plugins/compile/markdown/mdx_gist.plugin
index 7fe676c..85b5450 100644
--- a/nikola/plugins/compile/markdown/mdx_gist.plugin
+++ b/nikola/plugins/compile/markdown/mdx_gist.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Extension for embedding gists
 
diff --git a/nikola/plugins/compile/markdown/mdx_gist.py b/nikola/plugins/compile/markdown/mdx_gist.py
index f439fa2..25c071f 100644
--- a/nikola/plugins/compile/markdown/mdx_gist.py
+++ b/nikola/plugins/compile/markdown/mdx_gist.py
@@ -22,7 +22,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Warning: URL formats of "raw" gists are undocummented and subject to change.
-# See also:  http://developer.github.com/v3/gists/
+# See also:  https://developer.github.com/v3/gists/
 #
 # Inspired by "[Python] reStructuredText GitHub Gist directive"
 # (https://gist.github.com/brianhsu/1407759), public domain by Brian Hsu
@@ -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
@@ -217,7 +104,6 @@ GIST_RST_RE = r'(?m)^\.\.\s*gist::\s*(?P<gist_id>[^\]\s]+)(?:\s*(?P<filename>.+?
 
 
 class GistFetchException(Exception):
-
     """Raised when attempt to fetch content of a Gist from github.com fails."""
 
     def __init__(self, url, status_code):
@@ -228,7 +114,6 @@ class GistFetchException(Exception):
 
 
 class GistPattern(Pattern):
-
     """InlinePattern for footnote markers in a document's body text."""
 
     def __init__(self, pattern, configs):
@@ -290,7 +175,6 @@ class GistPattern(Pattern):
 
 
 class GistExtension(MarkdownExtension, Extension):
-
     """Gist extension for Markdown."""
 
     def __init__(self, configs={}):
diff --git a/nikola/plugins/compile/markdown/mdx_nikola.plugin b/nikola/plugins/compile/markdown/mdx_nikola.plugin
index 12e4fb6..3c5c638 100644
--- a/nikola/plugins/compile/markdown/mdx_nikola.plugin
+++ b/nikola/plugins/compile/markdown/mdx_nikola.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Nikola-specific Markdown extensions
 
diff --git a/nikola/plugins/compile/markdown/mdx_nikola.py b/nikola/plugins/compile/markdown/mdx_nikola.py
index 54cc18c..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
@@ -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)
 
 
diff --git a/nikola/plugins/compile/markdown/mdx_podcast.plugin b/nikola/plugins/compile/markdown/mdx_podcast.plugin
index c92a8a0..c4ee7e9 100644
--- a/nikola/plugins/compile/markdown/mdx_podcast.plugin
+++ b/nikola/plugins/compile/markdown/mdx_podcast.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Markdown extensions for embedding podcasts and other audio files
 
diff --git a/nikola/plugins/compile/markdown/mdx_podcast.py b/nikola/plugins/compile/markdown/mdx_podcast.py
index 61afdbf..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
@@ -30,10 +30,10 @@ Extension to Python Markdown for Embedded Audio.
 Basic Example:
 
 >>> import markdown
->>> text = "[podcast]http://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3[/podcast]"
+>>> text = "[podcast]https://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3[/podcast]"
 >>> html = markdown.markdown(text, [PodcastExtension()])
 >>> print(html)
-<p><audio controls=""><source src="http://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3" type="audio/mpeg"></source></audio></p>
+<p><audio controls=""><source src="https://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3" type="audio/mpeg"></source></audio></p>
 """
 
 from __future__ import print_function, unicode_literals
@@ -51,7 +51,6 @@ PODCAST_RE = r'\[podcast\](?P<url>.+)\[/podcast\]'
 
 
 class PodcastPattern(Pattern):
-
     """InlinePattern for footnote markers in a document's body text."""
 
     def __init__(self, pattern, configs):
@@ -70,7 +69,6 @@ class PodcastPattern(Pattern):
 
 
 class PodcastExtension(MarkdownExtension, Extension):
-
     """"Podcast extension for Markdown."""
 
     def __init__(self, configs={}):
diff --git a/nikola/plugins/compile/pandoc.plugin b/nikola/plugins/compile/pandoc.plugin
index 3ff3668..2a69095 100644
--- a/nikola/plugins/compile/pandoc.plugin
+++ b/nikola/plugins/compile/pandoc.plugin
@@ -5,7 +5,7 @@ module = pandoc
 [Documentation]
 author = Roberto Alsina
 version = 1.0
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Compile markups into HTML using pandoc
 
 [Nikola]
diff --git a/nikola/plugins/compile/pandoc.py b/nikola/plugins/compile/pandoc.py
index 3030626..2368ae9 100644
--- a/nikola/plugins/compile/pandoc.py
+++ b/nikola/plugins/compile/pandoc.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
@@ -40,7 +40,6 @@ from nikola.utils import req_missing, makedirs, write_metadata
 
 
 class CompilePandoc(PageCompiler):
-
     """Compile markups into HTML using pandoc."""
 
     name = "pandoc"
@@ -55,7 +54,22 @@ class CompilePandoc(PageCompiler):
         """Compile source file into HTML and save as dest."""
         makedirs(os.path.dirname(dest))
         try:
+            try:
+                post = self.site.post_per_input_file[source]
+            except KeyError:
+                post = None
             subprocess.check_call(['pandoc', '-o', dest, source] + self.site.config['PANDOC_OPTIONS'])
+            with open(dest, 'r', encoding='utf-8') as inf:
+                output, shortcode_deps = self.site.apply_shortcodes(inf.read(), with_dependencies=True)
+            with open(dest, 'w', encoding='utf-8') as outf:
+                outf.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
         except OSError as e:
             if e.strreror == 'No such file or directory':
                 req_missing(['pandoc'], 'build this site (compile with pandoc)', python=False)
diff --git a/nikola/plugins/compile/php.plugin b/nikola/plugins/compile/php.plugin
index 151c022..f4fb0c1 100644
--- a/nikola/plugins/compile/php.plugin
+++ b/nikola/plugins/compile/php.plugin
@@ -5,7 +5,7 @@ module = php
 [Documentation]
 author = Roberto Alsina
 version = 1.0
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Compile PHP into HTML (just copy and name the file .php)
 
 [Nikola]
diff --git a/nikola/plugins/compile/php.py b/nikola/plugins/compile/php.py
index 28f4923..d2559fd 100644
--- a/nikola/plugins/compile/php.py
+++ b/nikola/plugins/compile/php.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
@@ -37,7 +37,6 @@ from hashlib import md5
 
 
 class CompilePhp(PageCompiler):
-
     """Compile PHP into PHP."""
 
     name = "php"
diff --git a/nikola/plugins/compile/rest.plugin b/nikola/plugins/compile/rest.plugin
index cf842c7..4d9041a 100644
--- a/nikola/plugins/compile/rest.plugin
+++ b/nikola/plugins/compile/rest.plugin
@@ -5,7 +5,7 @@ module = rest
 [Documentation]
 author = Roberto Alsina
 version = 1.0
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Compile reSt into HTML
 
 [Nikola]
diff --git a/nikola/plugins/compile/rest/__init__.py b/nikola/plugins/compile/rest/__init__.py
index b99e872..b75849f 100644
--- a/nikola/plugins/compile/rest/__init__.py
+++ b/nikola/plugins/compile/rest/__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
@@ -36,13 +36,22 @@ import docutils.utils
 import docutils.io
 import docutils.readers.standalone
 import docutils.writers.html4css1
+import docutils.parsers.rst.directives
+from docutils.parsers.rst import roles
 
+from nikola.nikola import LEGAL_VALUES
 from nikola.plugin_categories import PageCompiler
-from nikola.utils import unicode_str, get_logger, makedirs, write_metadata, STDERR_HANDLER
+from nikola.utils import (
+    unicode_str,
+    get_logger,
+    makedirs,
+    write_metadata,
+    STDERR_HANDLER,
+    LocaleBorg
+)
 
 
 class CompileRest(PageCompiler):
-
     """Compile reStructuredText into HTML."""
 
     name = "rest"
@@ -50,19 +59,6 @@ class CompileRest(PageCompiler):
     demote_headers = True
     logger = None
 
-    def _read_extra_deps(self, post):
-        """Read contents of .dep file and returns them as a list."""
-        dep_path = post.base_path + '.dep'
-        if os.path.isfile(dep_path):
-            with io.open(dep_path, 'r+', encoding='utf8') as depf:
-                deps = [l.strip() for l in depf.readlines()]
-                return deps
-        return []
-
-    def register_extra_dependencies(self, post):
-        """Add dependency to post object to check .dep file."""
-        post.add_dependency(lambda: self._read_extra_deps(post), 'fragment')
-
     def compile_html_string(self, data, source_path=None, is_two_file=True):
         """Compile reST into HTML strings."""
         # If errors occur, this will be added to the line number reported by
@@ -74,16 +70,20 @@ class CompileRest(PageCompiler):
             add_ln = len(m_data.splitlines()) + 1
 
         default_template_path = os.path.join(os.path.dirname(__file__), 'template.txt')
+        settings_overrides = {
+            'initial_header_level': 1,
+            'record_dependencies': True,
+            'stylesheet_path': None,
+            'link_stylesheet': True,
+            'syntax_highlight': 'short',
+            'math_output': 'mathjax',
+            'template': default_template_path,
+            'language_code': LEGAL_VALUES['DOCUTILS_LOCALES'].get(LocaleBorg().current_lang, 'en')
+        }
+
         output, error_level, deps = rst2html(
-            data, settings_overrides={
-                'initial_header_level': 1,
-                'record_dependencies': True,
-                'stylesheet_path': None,
-                'link_stylesheet': True,
-                'syntax_highlight': 'short',
-                'math_output': 'mathjax',
-                'template': default_template_path,
-            }, logger=self.logger, source_path=source_path, l_add_ln=add_ln, transforms=self.site.rst_transforms)
+            data, settings_overrides=settings_overrides, logger=self.logger, source_path=source_path, l_add_ln=add_ln, transforms=self.site.rst_transforms,
+            no_title_transform=self.site.config.get('NO_DOCUTILS_TITLE_TRANSFORM', False))
         if not isinstance(output, unicode_str):
             # To prevent some weird bugs here or there.
             # Original issue: empty files.  `output` became a bytestring.
@@ -95,18 +95,23 @@ class CompileRest(PageCompiler):
         makedirs(os.path.dirname(dest))
         error_level = 100
         with io.open(dest, "w+", encoding="utf8") as out_file:
+            try:
+                post = self.site.post_per_input_file[source]
+            except KeyError:
+                post = None
             with io.open(source, "r", encoding="utf8") as in_file:
                 data = in_file.read()
                 output, error_level, deps = self.compile_html_string(data, source, is_two_file)
+                output, shortcode_deps = self.site.apply_shortcodes(output, filename=source, with_dependencies=True, extra_context=dict(post=post))
                 out_file.write(output)
-            deps_path = dest + '.dep'
-            if deps.list:
-                deps.list = [p for p in deps.list if p != dest]  # Don't depend on yourself (#1671)
-                with io.open(deps_path, "w+", encoding="utf8") as deps_file:
-                    deps_file.write('\n'.join(deps.list))
+            if post is None:
+                if deps.list:
+                    self.logger.error(
+                        "Cannot save dependencies for post {0} due to unregistered source file name",
+                        source)
             else:
-                if os.path.isfile(deps_path):
-                    os.unlink(deps_path)
+                post._depfile[dest] += deps.list
+                post._depfile[dest] += shortcode_deps
         if error_level < 3:
             return True
         else:
@@ -172,17 +177,20 @@ def get_observer(settings):
 
 
 class NikolaReader(docutils.readers.standalone.Reader):
-
     """Nikola-specific docutils reader."""
 
     def __init__(self, *args, **kwargs):
         """Initialize the reader."""
         self.transforms = kwargs.pop('transforms', [])
+        self.no_title_transform = kwargs.pop('no_title_transform', False)
         docutils.readers.standalone.Reader.__init__(self, *args, **kwargs)
 
     def get_transforms(self):
         """Get docutils transforms."""
-        return docutils.readers.standalone.Reader(self).get_transforms() + self.transforms
+        transforms = docutils.readers.standalone.Reader(self).get_transforms() + self.transforms
+        if self.no_title_transform:
+            transforms = [t for t in transforms if str(t) != "<class 'docutils.transforms.frontmatter.DocTitle'>"]
+        return transforms
 
     def new_document(self):
         """Create and return a new empty document tree (root node)."""
@@ -192,11 +200,21 @@ class NikolaReader(docutils.readers.standalone.Reader):
         return document
 
 
+def shortcode_role(name, rawtext, text, lineno, inliner,
+                   options={}, content=[]):
+    """A shortcode role that passes through raw inline HTML."""
+    return [docutils.nodes.raw('', text, format='html')], []
+
+roles.register_canonical_role('raw-html', shortcode_role)
+roles.register_canonical_role('html', shortcode_role)
+roles.register_canonical_role('sc', shortcode_role)
+
+
 def add_node(node, visit_function=None, depart_function=None):
     """Register a Docutils node class.
 
     This function is completely optional. It is a same concept as
-    `Sphinx add_node function <http://sphinx-doc.org/ext/appapi.html#sphinx.application.Sphinx.add_node>`_.
+    `Sphinx add_node function <http://sphinx-doc.org/extdev/appapi.html#sphinx.application.Sphinx.add_node>`_.
 
     For example::
 
@@ -237,7 +255,8 @@ def rst2html(source, source_path=None, source_class=docutils.io.StringInput,
              parser=None, parser_name='restructuredtext', writer=None,
              writer_name='html', settings=None, settings_spec=None,
              settings_overrides=None, config_section=None,
-             enable_exit_status=None, logger=None, l_add_ln=0, transforms=None):
+             enable_exit_status=None, logger=None, l_add_ln=0, transforms=None,
+             no_title_transform=False):
     """Set up & run a ``Publisher``, and return a dictionary of document parts.
 
     Dictionary keys are the names of parts, and values are Unicode strings;
@@ -255,7 +274,7 @@ def rst2html(source, source_path=None, source_class=docutils.io.StringInput,
              reStructuredText syntax errors.
     """
     if reader is None:
-        reader = NikolaReader(transforms=transforms)
+        reader = NikolaReader(transforms=transforms, no_title_transform=no_title_transform)
         # For our custom logging, we have special needs and special settings we
         # specify here.
         # logger    a logger from Nikola
@@ -276,3 +295,10 @@ def rst2html(source, source_path=None, source_class=docutils.io.StringInput,
     pub.publish(enable_exit_status=enable_exit_status)
 
     return pub.writer.parts['docinfo'] + pub.writer.parts['fragment'], pub.document.reporter.max_level, pub.settings.record_dependencies
+
+# Alignment helpers for extensions
+_align_options_base = ('left', 'center', 'right')
+
+
+def _align_choice(argument):
+    return docutils.parsers.rst.directives.choice(argument, _align_options_base + ("none", ""))
diff --git a/nikola/plugins/compile/rest/chart.plugin b/nikola/plugins/compile/rest/chart.plugin
index 438abe4..0a7896f 100644
--- a/nikola/plugins/compile/rest/chart.plugin
+++ b/nikola/plugins/compile/rest/chart.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Chart directive based in PyGal
 
diff --git a/nikola/plugins/compile/rest/chart.py b/nikola/plugins/compile/rest/chart.py
index 88fdff3..24f459b 100644
--- a/nikola/plugins/compile/rest/chart.py
+++ b/nikola/plugins/compile/rest/chart.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
@@ -43,7 +43,6 @@ _site = None
 
 
 class Plugin(RestExtension):
-
     """Plugin for chart role."""
 
     name = "rest_chart"
@@ -53,11 +52,11 @@ class Plugin(RestExtension):
         global _site
         _site = self.site = site
         directives.register_directive('chart', Chart)
+        self.site.register_shortcode('chart', _gen_chart)
         return super(Plugin, self).set_site(site)
 
 
 class Chart(Directive):
-
     """reStructuredText extension for inserting charts as SVG.
 
     Usage:
@@ -74,52 +73,68 @@ class Chart(Directive):
     has_content = True
     required_arguments = 1
     option_spec = {
-        "copy": directives.unchanged,
+        "box_mode": directives.unchanged,
+        "classes": directives.unchanged,
         "css": directives.unchanged,
+        "defs": directives.unchanged,
         "disable_xml_declaration": directives.unchanged,
         "dots_size": directives.unchanged,
+        "dynamic_print_values": directives.unchanged,
         "explicit_size": directives.unchanged,
         "fill": directives.unchanged,
-        "font_sizes": directives.unchanged,
+        "force_uri_protocol": directives.unchanged,
+        "half_pie": directives.unchanged,
         "height": directives.unchanged,
         "human_readable": directives.unchanged,
         "include_x_axis": directives.unchanged,
+        "inner_radius": directives.unchanged,
         "interpolate": directives.unchanged,
         "interpolation_parameters": directives.unchanged,
         "interpolation_precision": directives.unchanged,
+        "inverse_y_axis": directives.unchanged,
         "js": directives.unchanged,
-        "label_font_size": directives.unchanged,
         "legend_at_bottom": directives.unchanged,
+        "legend_at_bottom_columns": directives.unchanged,
         "legend_box_size": directives.unchanged,
-        "legend_font_size": directives.unchanged,
         "logarithmic": directives.unchanged,
-        "major_label_font_size": directives.unchanged,
         "margin": directives.unchanged,
-        "no_data_font_size": directives.unchanged,
+        "margin_bottom": directives.unchanged,
+        "margin_left": directives.unchanged,
+        "margin_right": directives.unchanged,
+        "margin_top": directives.unchanged,
+        "max_scale": directives.unchanged,
+        "min_scale": directives.unchanged,
+        "missing_value_fill_truncation": directives.unchanged,
         "no_data_text": directives.unchanged,
         "no_prefix": directives.unchanged,
         "order_min": directives.unchanged,
         "pretty_print": directives.unchanged,
+        "print_labels": directives.unchanged,
         "print_values": directives.unchanged,
+        "print_values_position": directives.unchanged,
         "print_zeroes": directives.unchanged,
         "range": directives.unchanged,
         "rounded_bars": directives.unchanged,
+        "secondary_range": directives.unchanged,
         "show_dots": directives.unchanged,
         "show_legend": directives.unchanged,
         "show_minor_x_labels": directives.unchanged,
+        "show_minor_y_labels": directives.unchanged,
+        "show_only_major_dots": directives.unchanged,
+        "show_x_guides": directives.unchanged,
+        "show_x_labels": directives.unchanged,
+        "show_y_guides": directives.unchanged,
         "show_y_labels": directives.unchanged,
         "spacing": directives.unchanged,
+        "stack_from_top": directives.unchanged,
         "strict": directives.unchanged,
         "stroke": directives.unchanged,
+        "stroke_style": directives.unchanged,
         "style": directives.unchanged,
         "title": directives.unchanged,
-        "title_font_size": directives.unchanged,
-        "to_dict": directives.unchanged,
         "tooltip_border_radius": directives.unchanged,
-        "tooltip_font_size": directives.unchanged,
         "truncate_label": directives.unchanged,
         "truncate_legend": directives.unchanged,
-        "value_font_size": directives.unchanged,
         "value_formatter": directives.unchanged,
         "width": directives.unchanged,
         "x_label_rotation": directives.unchanged,
@@ -128,37 +143,55 @@ class Chart(Directive):
         "x_labels_major_count": directives.unchanged,
         "x_labels_major_every": directives.unchanged,
         "x_title": directives.unchanged,
+        "x_value_formatter": directives.unchanged,
+        "xrange": directives.unchanged,
         "y_label_rotation": directives.unchanged,
         "y_labels": directives.unchanged,
+        "y_labels_major": directives.unchanged,
+        "y_labels_major_count": directives.unchanged,
+        "y_labels_major_every": directives.unchanged,
         "y_title": directives.unchanged,
         "zero": directives.unchanged,
     }
 
     def run(self):
         """Run the directive."""
-        if pygal is None:
-            msg = req_missing(['pygal'], 'use the Chart directive', optional=True)
-            return [nodes.raw('', '<div class="text-error">{0}</div>'.format(msg), format='html')]
-        options = {}
-        if 'style' in self.options:
-            style_name = self.options.pop('style')
-        else:
-            style_name = 'BlueStyle'
-        if '(' in style_name:  # Parametric style
-            style = eval('pygal.style.' + style_name)
-        else:
-            style = getattr(pygal.style, style_name)
-        for k, v in self.options.items():
+        self.options['site'] = None
+        html = _gen_chart(self.arguments[0], data='\n'.join(self.content), **self.options)
+        return [nodes.raw('', html, format='html')]
+
+
+def _gen_chart(chart_type, **_options):
+    if pygal is None:
+        msg = req_missing(['pygal'], 'use the Chart directive', optional=True)
+        return '<div class="text-error">{0}</div>'.format(msg)
+    options = {}
+    data = _options.pop('data')
+    _options.pop('post', None)
+    _options.pop('site')
+    if 'style' in _options:
+        style_name = _options.pop('style')
+    else:
+        style_name = 'BlueStyle'
+    if '(' in style_name:  # Parametric style
+        style = eval('pygal.style.' + style_name)
+    else:
+        style = getattr(pygal.style, style_name)
+    for k, v in _options.items():
+        try:
             options[k] = literal_eval(v)
-
-        chart = getattr(pygal, self.arguments[0])(style=style)
-        chart.config(**options)
-        for line in self.content:
+        except:
+            options[k] = v
+    chart = pygal
+    for o in chart_type.split('.'):
+        chart = getattr(chart, o)
+    chart = chart(style=style)
+    if _site and _site.invariant:
+        chart.no_prefix = True
+    chart.config(**options)
+    for line in data.splitlines():
+        line = line.strip()
+        if line:
             label, series = literal_eval('({0})'.format(line))
             chart.add(label, series)
-        data = chart.render().decode('utf8')
-        if _site and _site.invariant:
-            import re
-            data = re.sub('id="chart-[a-f0-9\-]+"', 'id="chart-foobar"', data)
-            data = re.sub('#chart-[a-f0-9\-]+', '#chart-foobar', data)
-        return [nodes.raw('', data, format='html')]
+    return chart.render().decode('utf8')
diff --git a/nikola/plugins/compile/rest/doc.plugin b/nikola/plugins/compile/rest/doc.plugin
index facdd03..e447eb2 100644
--- a/nikola/plugins/compile/rest/doc.plugin
+++ b/nikola/plugins/compile/rest/doc.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Manuel Kaufmann
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Role to link another page / post from the blog
 
diff --git a/nikola/plugins/compile/rest/doc.py b/nikola/plugins/compile/rest/doc.py
index 99cce81..55f576d 100644
--- a/nikola/plugins/compile/rest/doc.py
+++ b/nikola/plugins/compile/rest/doc.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
@@ -29,12 +29,11 @@
 from docutils import nodes
 from docutils.parsers.rst import roles
 
-from nikola.utils import split_explicit_title
+from nikola.utils import split_explicit_title, LOGGER
 from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for doc role."""
 
     name = 'rest_doc'
@@ -43,12 +42,12 @@ class Plugin(RestExtension):
         """Set Nikola site."""
         self.site = site
         roles.register_canonical_role('doc', doc_role)
+        self.site.register_shortcode('doc', doc_shortcode)
         doc_role.site = site
         return super(Plugin, self).set_site(site)
 
 
-def doc_role(name, rawtext, text, lineno, inliner,
-             options={}, content=[]):
+def _doc_link(rawtext, text, options={}, content=[]):
     """Handle the doc role."""
     # split link's text and post's slug in role content
     has_explicit_title, title, slug = split_explicit_title(text)
@@ -67,22 +66,48 @@ def doc_role(name, rawtext, text, lineno, inliner,
         if post is None:
             raise ValueError
     except ValueError:
+        return False, False, None, None, slug
+
+    if not has_explicit_title:
+        # use post's title as link's text
+        title = post.title()
+    permalink = post.permalink()
+
+    return True, twin_slugs, title, permalink, slug
+
+
+def doc_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+    """Handle the doc role."""
+    success, twin_slugs, title, permalink, slug = _doc_link(rawtext, text, options, content)
+    if success:
+        if twin_slugs:
+            inliner.reporter.warning(
+                'More than one post with the same slug. Using "{0}"'.format(permalink))
+            LOGGER.warn(
+                'More than one post with the same slug. Using "{0}" for doc role'.format(permalink))
+        node = make_link_node(rawtext, title, permalink, options)
+        return [node], []
+    else:
         msg = inliner.reporter.error(
             '"{0}" slug doesn\'t exist.'.format(slug),
             line=lineno)
         prb = inliner.problematic(rawtext, rawtext, msg)
         return [prb], [msg]
 
-    if not has_explicit_title:
-        # use post's title as link's text
-        title = post.title()
-    permalink = post.permalink()
-    if twin_slugs:
-        msg = inliner.reporter.warning(
-            'More than one post with the same slug. Using "{0}"'.format(permalink))
 
-    node = make_link_node(rawtext, title, permalink, options)
-    return [node], []
+def doc_shortcode(*args, **kwargs):
+    """Implement the doc shortcode."""
+    text = kwargs['data']
+    success, twin_slugs, title, permalink, slug = _doc_link(text, text, LOGGER)
+    if success:
+        if twin_slugs:
+            LOGGER.warn(
+                'More than one post with the same slug. Using "{0}" for doc shortcode'.format(permalink))
+        return '<a href="{0}">{1}</a>'.format(permalink, title)
+    else:
+        LOGGER.error(
+            '"{0}" slug doesn\'t exist.'.format(slug))
+        return '<span class="error text-error" style="color: red;">Invalid link: {0}</span>'.format(text)
 
 
 def make_link_node(rawtext, text, url, options):
diff --git a/nikola/plugins/compile/rest/gist.plugin b/nikola/plugins/compile/rest/gist.plugin
index 9fa2e82..763c1d2 100644
--- a/nikola/plugins/compile/rest/gist.plugin
+++ b/nikola/plugins/compile/rest/gist.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Gist directive
 
diff --git a/nikola/plugins/compile/rest/gist.py b/nikola/plugins/compile/rest/gist.py
index 736ee37..e40c3b2 100644
--- a/nikola/plugins/compile/rest/gist.py
+++ b/nikola/plugins/compile/rest/gist.py
@@ -11,7 +11,6 @@ from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for gist directive."""
 
     name = "rest_gist"
@@ -24,7 +23,6 @@ class Plugin(RestExtension):
 
 
 class GitHubGist(Directive):
-
     """Embed GitHub Gist.
 
     Usage:
diff --git a/nikola/plugins/compile/rest/listing.plugin b/nikola/plugins/compile/rest/listing.plugin
index 85c780f..3ebb296 100644
--- a/nikola/plugins/compile/rest/listing.plugin
+++ b/nikola/plugins/compile/rest/listing.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Extension for source listings
 
diff --git a/nikola/plugins/compile/rest/listing.py b/nikola/plugins/compile/rest/listing.py
index 4871bf3..4dfbedc 100644
--- a/nikola/plugins/compile/rest/listing.py
+++ b/nikola/plugins/compile/rest/listing.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
@@ -55,7 +55,6 @@ from nikola.plugin_categories import RestExtension
 
 # A sanitized version of docutils.parsers.rst.directives.body.CodeBlock.
 class CodeBlock(Directive):
-
     """Parse and mark up content of a code block."""
 
     optional_arguments = 1
@@ -126,7 +125,6 @@ docutils.parsers.rst.directives.misc.CodeBlock = CodeBlock
 
 
 class Plugin(RestExtension):
-
     """Plugin for listing directive."""
 
     name = "rest_listing"
@@ -138,6 +136,7 @@ class Plugin(RestExtension):
         # leaving these to make the code directive work with
         # docutils < 0.9
         CodeBlock.site = site
+        Listing.site = site
         directives.register_directive('code', CodeBlock)
         directives.register_directive('code-block', CodeBlock)
         directives.register_directive('sourcecode', CodeBlock)
@@ -152,7 +151,6 @@ listing_spec['linenos'] = directives.unchanged
 
 
 class Listing(Include):
-
     """Create a highlighted block of code from a file in listings/.
 
     Usage:
@@ -171,7 +169,12 @@ class Listing(Include):
         """Run listing directive."""
         _fname = self.arguments.pop(0)
         fname = _fname.replace('/', os.sep)
-        lang = self.arguments.pop(0)
+        try:
+            lang = self.arguments.pop(0)
+            self.options['code'] = lang
+        except IndexError:
+            self.options['literal'] = True
+
         if len(self.folders) == 1:
             listings_folder = next(iter(self.folders.keys()))
             if fname.startswith(listings_folder):
@@ -181,15 +184,17 @@ class Listing(Include):
         else:
             fpath = os.path.join(fname)  # must be new syntax: specify folder name
         self.arguments.insert(0, fpath)
-        self.options['code'] = lang
         if 'linenos' in self.options:
             self.options['number-lines'] = self.options['linenos']
         with io.open(fpath, 'r+', encoding='utf8') as fileobject:
             self.content = fileobject.read().splitlines()
         self.state.document.settings.record_dependencies.add(fpath)
         target = urlunsplit(("link", 'listing', fpath.replace('\\', '/'), '', ''))
+        src_target = urlunsplit(("link", 'listing_source', fpath.replace('\\', '/'), '', ''))
+        src_label = self.site.MESSAGES('Source')
         generated_nodes = (
-            [core.publish_doctree('`{0} <{1}>`_'.format(_fname, target))[0]])
+            [core.publish_doctree('`{0} <{1}>`_  `({2}) <{3}>`_' .format(
+                _fname, target, src_label, src_target))[0]])
         generated_nodes += self.get_code_from_file(fileobject)
         return generated_nodes
 
diff --git a/nikola/plugins/compile/rest/media.plugin b/nikola/plugins/compile/rest/media.plugin
index 9803c8f..8dfb19c 100644
--- a/nikola/plugins/compile/rest/media.plugin
+++ b/nikola/plugins/compile/rest/media.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Directive to support oembed via micawber
 
diff --git a/nikola/plugins/compile/rest/media.py b/nikola/plugins/compile/rest/media.py
index 345e331..8a69586 100644
--- a/nikola/plugins/compile/rest/media.py
+++ b/nikola/plugins/compile/rest/media.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
@@ -40,7 +40,6 @@ from nikola.utils import req_missing
 
 
 class Plugin(RestExtension):
-
     """Plugin for reST media directive."""
 
     name = "rest_media"
@@ -49,11 +48,11 @@ class Plugin(RestExtension):
         """Set Nikola site."""
         self.site = site
         directives.register_directive('media', Media)
+        self.site.register_shortcode('media', _gen_media_embed)
         return super(Plugin, self).set_site(site)
 
 
 class Media(Directive):
-
     """reST extension for inserting any sort of media using micawber."""
 
     has_content = False
@@ -62,9 +61,13 @@ class Media(Directive):
 
     def run(self):
         """Run media directive."""
-        if micawber is None:
-            msg = req_missing(['micawber'], 'use the media directive', optional=True)
-            return [nodes.raw('', '<div class="text-error">{0}</div>'.format(msg), format='html')]
+        html = _gen_media_embed(" ".join(self.arguments))
+        return [nodes.raw('', html, format='html')]
+
 
-        providers = micawber.bootstrap_basic()
-        return [nodes.raw('', micawber.parse_text(" ".join(self.arguments), providers), format='html')]
+def _gen_media_embed(url, *q, **kw):
+    if micawber is None:
+        msg = req_missing(['micawber'], 'use the media directive', optional=True)
+        return '<div class="text-error">{0}</div>'.format(msg)
+    providers = micawber.bootstrap_basic()
+    return micawber.parse_text(url, providers)
diff --git a/nikola/plugins/compile/rest/post_list.plugin b/nikola/plugins/compile/rest/post_list.plugin
index 48969bf..1802f2b 100644
--- a/nikola/plugins/compile/rest/post_list.plugin
+++ b/nikola/plugins/compile/rest/post_list.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Udo Spallek
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Includes a list of posts with tag and slide based filters.
 
diff --git a/nikola/plugins/compile/rest/post_list.py b/nikola/plugins/compile/rest/post_list.py
index a22ee85..8cfd5bf 100644
--- a/nikola/plugins/compile/rest/post_list.py
+++ b/nikola/plugins/compile/rest/post_list.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2013-2015 Udo Spallek, Roberto Alsina and others.
+# Copyright © 2013-2016 Udo Spallek, Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -37,13 +37,13 @@ from docutils.parsers.rst import Directive, directives
 
 from nikola import utils
 from nikola.plugin_categories import RestExtension
+from nikola.packages.datecond import date_in_range
 
 # WARNING: the directive name is post-list
 #          (with a DASH instead of an UNDERSCORE)
 
 
 class Plugin(RestExtension):
-
     """Plugin for reST post-list directive."""
 
     name = "rest_post_list"
@@ -51,19 +51,19 @@ class Plugin(RestExtension):
     def set_site(self, site):
         """Set Nikola site."""
         self.site = site
+        self.site.register_shortcode('post-list', _do_post_list)
         directives.register_directive('post-list', PostList)
         PostList.site = site
         return super(Plugin, self).set_site(site)
 
 
 class PostList(Directive):
-
     """Provide a reStructuredText directive to create a list of posts.
 
     Post List
     =========
     :Directive Arguments: None.
-    :Directive Options: lang, start, stop, reverse, sort, tags, categories, slugs, all, template, id
+    :Directive Options: lang, start, stop, reverse, sort, date, tags, categories, sections, slugs, post_type, all, template, id
     :Directive Content: None.
 
     The posts appearing in the list can be filtered by options.
@@ -87,10 +87,19 @@ class PostList(Directive):
         Reverse the order of the post-list.
         Defaults is to not reverse the order of posts.
 
-    ``sort``: string
+    ``sort`` : string
         Sort post list by one of each post's attributes, usually ``title`` or a
         custom ``priority``.  Defaults to None (chronological sorting).
 
+    ``date`` : string
+        Show posts that match date range specified by this option. Format:
+
+        * comma-separated clauses (AND)
+        * clause: attribute comparison_operator value (spaces optional)
+          * attribute: year, month, day, hour, month, second, weekday, isoweekday; or empty for full datetime
+          * comparison_operator: == != <= >= < >
+          * value: integer or dateutil-compatible date input
+
     ``tags`` : string [, string...]
         Filter posts to show only posts having at least one of the ``tags``.
         Defaults to None.
@@ -99,13 +108,21 @@ class PostList(Directive):
         Filter posts to show only posts having one of the ``categories``.
         Defaults to None.
 
+    ``sections`` : string [, string...]
+        Filter posts to show only posts having one of the ``sections``.
+        Defaults to None.
+
     ``slugs`` : string [, string...]
         Filter posts to show only posts having at least one of the ``slugs``.
         Defaults to None.
 
+    ``post_type`` (or ``type``) : string
+        Show only ``posts``, ``pages`` or ``all``.
+        Replaces ``all``. Defaults to ``posts``.
+
     ``all`` : flag
-        Shows all posts and pages in the post list.
-        Defaults to show only posts with set *use_in_feeds*.
+        (deprecated, use ``post_type`` instead)
+        Shows all posts and pages in the post list.  Defaults to show only posts.
 
     ``lang`` : string
         The language of post *titles* and *links*.
@@ -127,11 +144,15 @@ class PostList(Directive):
         'sort': directives.unchanged,
         'tags': directives.unchanged,
         'categories': directives.unchanged,
+        'sections': directives.unchanged,
         'slugs': directives.unchanged,
+        'post_type': directives.unchanged,
+        'type': directives.unchanged,
         'all': directives.flag,
         'lang': directives.unchanged,
         'template': directives.path,
         'id': directives.unchanged,
+        'date': directives.unchanged,
     }
 
     def run(self):
@@ -140,73 +161,151 @@ class PostList(Directive):
         stop = self.options.get('stop')
         reverse = self.options.get('reverse', False)
         tags = self.options.get('tags')
-        tags = [t.strip().lower() for t in tags.split(',')] if tags else []
         categories = self.options.get('categories')
-        categories = [c.strip().lower() for c in categories.split(',')] if categories else []
+        sections = self.options.get('sections')
         slugs = self.options.get('slugs')
-        slugs = [s.strip() for s in slugs.split(',')] if slugs else []
-        show_all = self.options.get('all', False)
+        post_type = self.options.get('post_type')
+        type = self.options.get('type', False)
+        all = self.options.get('all', False)
         lang = self.options.get('lang', utils.LocaleBorg().current_lang)
         template = self.options.get('template', 'post_list_directive.tmpl')
         sort = self.options.get('sort')
-        if self.site.invariant:  # for testing purposes
-            post_list_id = self.options.get('id', 'post_list_' + 'fixedvaluethatisnotauuid')
-        else:
-            post_list_id = self.options.get('id', 'post_list_' + uuid.uuid4().hex)
+        date = self.options.get('date')
 
-        filtered_timeline = []
-        posts = []
-        step = -1 if reverse is None else None
-        if show_all is None:
-            timeline = [p for p in self.site.timeline]
+        output, deps = _do_post_list(start, stop, reverse, tags, categories, sections, slugs, post_type, type,
+                                     all, lang, template, sort, state=self.state, site=self.site, date=date)
+        self.state.document.settings.record_dependencies.add("####MAGIC####TIMELINE")
+        for d in deps:
+            self.state.document.settings.record_dependencies.add(d)
+        if output:
+            return [nodes.raw('', output, format='html')]
         else:
-            timeline = [p for p in self.site.timeline if p.use_in_feeds]
-
-        if categories:
-            timeline = [p for p in timeline if p.meta('category', lang=lang).lower() in categories]
-
-        for post in timeline:
-            if tags:
-                cont = True
-                tags_lower = [t.lower() for t in post.tags]
-                for tag in tags:
-                    if tag in tags_lower:
-                        cont = False
-
-                if cont:
-                    continue
-
-            filtered_timeline.append(post)
-
-        if sort:
-            filtered_timeline = natsort.natsorted(filtered_timeline, key=lambda post: post.meta[lang][sort], alg=natsort.ns.F | natsort.ns.IC)
-
-        for post in filtered_timeline[start:stop:step]:
-            if slugs:
-                cont = True
-                for slug in slugs:
-                    if slug == post.meta('slug'):
-                        cont = False
-
-                if cont:
-                    continue
-
-            bp = post.translated_base_path(lang)
-            if os.path.exists(bp):
-                self.state.document.settings.record_dependencies.add(bp)
+            return []
 
-            posts += [post]
 
-        if not posts:
-            return []
-        self.state.document.settings.record_dependencies.add("####MAGIC####TIMELINE")
+def _do_post_list(start=None, stop=None, reverse=False, tags=None, categories=None,
+                  sections=None, slugs=None, post_type='post', type=False, all=False,
+                  lang=None, template='post_list_directive.tmpl', sort=None,
+                  id=None, data=None, state=None, site=None, date=None, filename=None, post=None):
+    if lang is None:
+        lang = utils.LocaleBorg().current_lang
+    if site.invariant:  # for testing purposes
+        post_list_id = id or 'post_list_' + 'fixedvaluethatisnotauuid'
+    else:
+        post_list_id = id or 'post_list_' + uuid.uuid4().hex
+
+    # Get post from filename if available
+    if filename:
+        self_post = site.post_per_input_file.get(filename)
+    else:
+        self_post = None
+
+    if self_post:
+        self_post.register_depfile("####MAGIC####TIMELINE", lang=lang)
+
+    # If we get strings for start/stop, make them integers
+    if start is not None:
+        start = int(start)
+    if stop is not None:
+        stop = int(stop)
+
+    # Parse tags/categories/sections/slugs (input is strings)
+    tags = [t.strip().lower() for t in tags.split(',')] if tags else []
+    categories = [c.strip().lower() for c in categories.split(',')] if categories else []
+    sections = [s.strip().lower() for s in sections.split(',')] if sections else []
+    slugs = [s.strip() for s in slugs.split(',')] if slugs else []
+
+    filtered_timeline = []
+    posts = []
+    step = -1 if reverse is None else None
+
+    if type is not False:
+        post_type = type
+
+    # TODO: remove in v8
+    if all is not False:
+        timeline = [p for p in site.timeline]
+    elif post_type == 'page' or post_type == 'pages':
+        timeline = [p for p in site.timeline if not p.use_in_feeds]
+    elif post_type == 'all':
+        timeline = [p for p in site.timeline]
+    else:  # post
+        timeline = [p for p in site.timeline if p.use_in_feeds]
+
+    # TODO: replaces all, uncomment in v8
+    # if post_type == 'page' or post_type == 'pages':
+    #    timeline = [p for p in site.timeline if not p.use_in_feeds]
+    # elif post_type == 'all':
+    #    timeline = [p for p in site.timeline]
+    # else: # post
+    #    timeline = [p for p in site.timeline if p.use_in_feeds]
+
+    if categories:
+        timeline = [p for p in timeline if p.meta('category', lang=lang).lower() in categories]
+
+    if sections:
+        timeline = [p for p in timeline if p.section_name(lang).lower() in sections]
+
+    for post in timeline:
+        if tags:
+            cont = True
+            tags_lower = [t.lower() for t in post.tags]
+            for tag in tags:
+                if tag in tags_lower:
+                    cont = False
+
+            if cont:
+                continue
+
+        filtered_timeline.append(post)
+
+    if sort:
+        filtered_timeline = natsort.natsorted(filtered_timeline, key=lambda post: post.meta[lang][sort], alg=natsort.ns.F | natsort.ns.IC)
+
+    if date:
+        filtered_timeline = [p for p in filtered_timeline if date_in_range(date, p.date)]
+
+    for post in filtered_timeline[start:stop:step]:
+        if slugs:
+            cont = True
+            for slug in slugs:
+                if slug == post.meta('slug'):
+                    cont = False
+
+            if cont:
+                continue
+
+        bp = post.translated_base_path(lang)
+        if os.path.exists(bp) and state:
+            state.document.settings.record_dependencies.add(bp)
+        elif os.path.exists(bp) and self_post:
+            self_post.register_depfile(bp, lang=lang)
+
+        posts += [post]
+
+    if not posts:
+        return '', []
+
+    template_deps = site.template_system.template_deps(template)
+    if state:
+        # Register template as a dependency (Issue #2391)
+        for d in template_deps:
+            state.document.settings.record_dependencies.add(d)
+    elif self_post:
+        for d in template_deps:
+            self_post.register_depfile(d, lang=lang)
+
+    template_data = {
+        'lang': lang,
+        'posts': posts,
+        # Need to provide str, not TranslatableSetting (Issue #2104)
+        'date_format': site.GLOBAL_CONTEXT.get('date_format')[lang],
+        'post_list_id': post_list_id,
+        'messages': site.MESSAGES,
+    }
+    output = site.template_system.render_template(
+        template, None, template_data)
+    return output, template_deps
 
-        template_data = {
-            'lang': lang,
-            'posts': posts,
-            'date_format': self.site.GLOBAL_CONTEXT.get('date_format'),
-            'post_list_id': post_list_id,
-        }
-        output = self.site.template_system.render_template(
-            template, None, template_data)
-        return [nodes.raw('', output, format='html')]
+# Request file name from shortcode (Issue #2412)
+_do_post_list.nikola_shortcode_pass_filename = True
diff --git a/nikola/plugins/compile/rest/slides.plugin b/nikola/plugins/compile/rest/slides.plugin
index 5c05b89..389da39 100644
--- a/nikola/plugins/compile/rest/slides.plugin
+++ b/nikola/plugins/compile/rest/slides.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Slides directive
 
diff --git a/nikola/plugins/compile/rest/slides.py b/nikola/plugins/compile/rest/slides.py
index 2522e55..7c5b34b 100644
--- a/nikola/plugins/compile/rest/slides.py
+++ b/nikola/plugins/compile/rest/slides.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
@@ -37,7 +37,6 @@ from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for reST slides directive."""
 
     name = "rest_slides"
@@ -51,7 +50,6 @@ class Plugin(RestExtension):
 
 
 class Slides(Directive):
-
     """reST extension for inserting slideshows."""
 
     has_content = True
diff --git a/nikola/plugins/compile/rest/soundcloud.plugin b/nikola/plugins/compile/rest/soundcloud.plugin
index 75469e4..4e36ea4 100644
--- a/nikola/plugins/compile/rest/soundcloud.plugin
+++ b/nikola/plugins/compile/rest/soundcloud.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Roberto Alsina
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = Soundcloud directive
 
diff --git a/nikola/plugins/compile/rest/soundcloud.py b/nikola/plugins/compile/rest/soundcloud.py
index 30134a9..9fabe70 100644
--- a/nikola/plugins/compile/rest/soundcloud.py
+++ b/nikola/plugins/compile/rest/soundcloud.py
@@ -4,13 +4,12 @@
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
-
+from nikola.plugins.compile.rest import _align_choice, _align_options_base
 
 from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for soundclound directive."""
 
     name = "rest_soundcloud"
@@ -23,15 +22,16 @@ class Plugin(RestExtension):
         return super(Plugin, self).set_site(site)
 
 
-CODE = ("""<iframe width="{width}" height="{height}"
+CODE = """\
+<div class="soundcloud-player{align}">
+<iframe width="{width}" height="{height}"
 scrolling="no" frameborder="no"
-src="https://w.soundcloud.com/player/?url=http://api.soundcloud.com/{preslug}/"""
-        """{sid}">
-</iframe>""")
+src="https://w.soundcloud.com/player/?url=http://api.soundcloud.com/{preslug}/{sid}">
+</iframe>
+</div>"""
 
 
 class SoundCloud(Directive):
-
     """reST extension for inserting SoundCloud embedded music.
 
     Usage:
@@ -46,6 +46,7 @@ class SoundCloud(Directive):
     option_spec = {
         'width': directives.positive_int,
         'height': directives.positive_int,
+        "align": _align_choice
     }
     preslug = "tracks"
 
@@ -59,6 +60,10 @@ class SoundCloud(Directive):
             'preslug': self.preslug,
         }
         options.update(self.options)
+        if self.options.get('align') in _align_options_base:
+            options['align'] = ' align-' + self.options['align']
+        else:
+            options['align'] = ''
         return [nodes.raw('', CODE.format(**options), format='html')]
 
     def check_content(self):
@@ -70,7 +75,6 @@ class SoundCloud(Directive):
 
 
 class SoundCloudPlaylist(SoundCloud):
-
     """reST directive for SoundCloud playlists."""
 
     preslug = "playlists"
diff --git a/nikola/plugins/compile/rest/thumbnail.plugin b/nikola/plugins/compile/rest/thumbnail.plugin
index 0084310..3324c31 100644
--- a/nikola/plugins/compile/rest/thumbnail.plugin
+++ b/nikola/plugins/compile/rest/thumbnail.plugin
@@ -9,6 +9,6 @@ plugincategory = CompilerExtension
 [Documentation]
 author = Pelle Nilsson
 version = 0.1
-website = http://getnikola.com
+website = https://getnikola.com/
 description = reST directive to facilitate enlargeable images with thumbnails
 
diff --git a/nikola/plugins/compile/rest/thumbnail.py b/nikola/plugins/compile/rest/thumbnail.py
index 1fae06c..37e0973 100644
--- a/nikola/plugins/compile/rest/thumbnail.py
+++ b/nikola/plugins/compile/rest/thumbnail.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2014-2015 Pelle Nilsson and others.
+# Copyright © 2014-2016 Pelle Nilsson and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -35,7 +35,6 @@ from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for thumbnail directive."""
 
     name = "rest_thumbnail"
@@ -48,7 +47,6 @@ class Plugin(RestExtension):
 
 
 class Thumbnail(Figure):
-
     """Thumbnail directive for reST."""
 
     def align(argument):
@@ -70,8 +68,12 @@ class Thumbnail(Figure):
     def run(self):
         """Run the thumbnail directive."""
         uri = directives.uri(self.arguments[0])
+        if uri.endswith('.svg'):
+            # the ? at the end makes docutil output an <img> instead of an object for the svg, which colorbox requires
+            self.arguments[0] = '.thumbnail'.join(os.path.splitext(uri)) + '?'
+        else:
+            self.arguments[0] = '.thumbnail'.join(os.path.splitext(uri))
         self.options['target'] = uri
-        self.arguments[0] = '.thumbnail'.join(os.path.splitext(uri))
         if self.content:
             (node,) = Figure.run(self)
         else:
diff --git a/nikola/plugins/compile/rest/vimeo.py b/nikola/plugins/compile/rest/vimeo.py
index c694a87..f1ac6c3 100644
--- a/nikola/plugins/compile/rest/vimeo.py
+++ b/nikola/plugins/compile/rest/vimeo.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
@@ -28,6 +28,7 @@
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
+from nikola.plugins.compile.rest import _align_choice, _align_options_base
 
 import requests
 import json
@@ -37,7 +38,6 @@ from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for vimeo reST directive."""
 
     name = "rest_vimeo"
@@ -49,10 +49,12 @@ class Plugin(RestExtension):
         return super(Plugin, self).set_site(site)
 
 
-CODE = """<iframe src="//player.vimeo.com/video/{vimeo_id}"
+CODE = """<div class="vimeo-video{align}">
+<iframe src="https://player.vimeo.com/video/{vimeo_id}"
 width="{width}" height="{height}"
 frameborder="0" webkitAllowFullScreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowFullScreen="allowFullScreen">
 </iframe>
+</div>
 """
 
 VIDEO_DEFAULT_HEIGHT = 500
@@ -60,7 +62,6 @@ VIDEO_DEFAULT_WIDTH = 281
 
 
 class Vimeo(Directive):
-
     """reST extension for inserting vimeo embedded videos.
 
     Usage:
@@ -75,6 +76,7 @@ class Vimeo(Directive):
     option_spec = {
         "width": directives.positive_int,
         "height": directives.positive_int,
+        "align": _align_choice
     }
 
     # set to False for not querying the vimeo api for size
@@ -94,6 +96,10 @@ class Vimeo(Directive):
                 return err
             self.set_video_size()
         options.update(self.options)
+        if self.options.get('align') in _align_options_base:
+            options['align'] = ' align-' + self.options['align']
+        else:
+            options['align'] = ''
         return [nodes.raw('', CODE.format(**options), format='html')]
 
     def check_modules(self):
@@ -109,7 +115,7 @@ class Vimeo(Directive):
 
             if json:  # we can attempt to retrieve video attributes from vimeo
                 try:
-                    url = ('//vimeo.com/api/v2/video/{0}'
+                    url = ('https://vimeo.com/api/v2/video/{0}'
                            '.json'.format(self.arguments[0]))
                     data = requests.get(url).text
                     video_attributes = json.loads(data)[0]
diff --git a/nikola/plugins/compile/rest/youtube.py b/nikola/plugins/compile/rest/youtube.py
index 6c5c211..b3dde62 100644
--- a/nikola/plugins/compile/rest/youtube.py
+++ b/nikola/plugins/compile/rest/youtube.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
@@ -28,13 +28,12 @@
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
-
+from nikola.plugins.compile.rest import _align_choice, _align_options_base
 
 from nikola.plugin_categories import RestExtension
 
 
 class Plugin(RestExtension):
-
     """Plugin for the youtube directive."""
 
     name = "rest_youtube"
@@ -47,14 +46,14 @@ class Plugin(RestExtension):
 
 
 CODE = """\
-<iframe width="{width}"
-height="{height}"
-src="//www.youtube.com/embed/{yid}?rel=0&amp;hd=1&amp;wmode=transparent"
-></iframe>"""
+<div class="youtube-video{align}">
+<iframe width="{width}" height="{height}"
+src="https://www.youtube.com/embed/{yid}?rel=0&amp;hd=1&amp;wmode=transparent"
+></iframe>
+</div>"""
 
 
 class Youtube(Directive):
-
     """reST extension for inserting youtube embedded videos.
 
     Usage:
@@ -69,6 +68,7 @@ class Youtube(Directive):
     option_spec = {
         "width": directives.positive_int,
         "height": directives.positive_int,
+        "align": _align_choice
     }
 
     def run(self):
@@ -80,6 +80,10 @@ class Youtube(Directive):
             'height': 344,
         }
         options.update(self.options)
+        if self.options.get('align') in _align_options_base:
+            options['align'] = ' align-' + self.options['align']
+        else:
+            options['align'] = ''
         return [nodes.raw('', CODE.format(**options), format='html')]
 
     def check_content(self):