New upstream version 8.1.2.upstream/8.1.2

1 files changed, 44 insertions, 47 deletions

diff --git a/nikola/plugins/compile/rest/chart.py b/nikola/plugins/compile/rest/chart.py
index 88fdff3..17363cb 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-2020 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -23,27 +23,22 @@
 # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 """Chart directive for reSTructuredText."""
 
-from ast import literal_eval
-
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
 
+from nikola.plugin_categories import RestExtension
+
 try:
     import pygal
 except ImportError:
-    pygal = None  # NOQA
-
-from nikola.plugin_categories import RestExtension
-from nikola.utils import req_missing
+    pygal = None
 
 _site = None
 
 
 class Plugin(RestExtension):
-
     """Plugin for chart role."""
 
     name = "rest_chart"
@@ -53,11 +48,10 @@ class Plugin(RestExtension):
         global _site
         _site = self.site = site
         directives.register_directive('chart', Chart)
-        return super(Plugin, self).set_site(site)
+        return super().set_site(site)
 
 
 class Chart(Directive):
-
     """reStructuredText extension for inserting charts as SVG.
 
     Usage:
@@ -74,52 +68,69 @@ 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,
+        "data_file": 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 +139,23 @@ 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():
-            options[k] = literal_eval(v)
-
-        chart = getattr(pygal, self.arguments[0])(style=style)
-        chart.config(**options)
-        for line in self.content:
-            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')]
+        self.options['site'] = None
+        html = _site.plugin_manager.getPluginByName(
+            'chart', 'ShortcodePlugin').plugin_object.handler(
+                self.arguments[0],
+                data='\n'.join(self.content),
+                **self.options)
+        return [nodes.raw('', html, format='html')]