New upstream version 7.8.1upstream/7.8.1

1 files changed, 62 insertions, 34 deletions

diff --git a/nikola/plugins/compile/rest/__init__.py b/nikola/plugins/compile/rest/__init__.py
index 4b04958..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,9 +36,19 @@ 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):
@@ -49,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
@@ -73,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.
@@ -94,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:
@@ -176,11 +182,15 @@ class NikolaReader(docutils.readers.standalone.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)."""
@@ -190,6 +200,16 @@ 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.
 
@@ -235,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;
@@ -253,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
@@ -274,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", ""))