Update upstream source from tag 'upstream/8.1.2'

Update to upstream version '8.1.2'
with Debian dir e5e966a9e6010ef70618dc9a61558fa4db35aceb

1 files changed, 26 insertions, 11 deletions

diff --git a/nikola/plugins/task/copy_assets.py b/nikola/plugins/task/copy_assets.py
index 4ed7414..c6d32c7 100644
--- a/nikola/plugins/task/copy_assets.py
+++ b/nikola/plugins/task/copy_assets.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2016 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
@@ -26,11 +26,11 @@
 
 """Copy theme assets into output."""
 
-from __future__ import unicode_literals
 
 import io
 import os
 
+from nikola.packages.pygments_better_html import BetterHtmlFormatter
 from nikola.plugin_categories import Task
 from nikola import utils
 
@@ -48,13 +48,19 @@ class CopyAssets(Task):
         """
         kw = {
             "themes": self.site.THEMES,
+            "translations": self.site.translations,
             "files_folders": self.site.config['FILES_FOLDERS'],
             "output_folder": self.site.config['OUTPUT_FOLDER'],
             "filters": self.site.config['FILTERS'],
             "code_color_scheme": self.site.config['CODE_COLOR_SCHEME'],
-            "code.css_selectors": 'pre.code',
+            "code.css_selectors": ['pre.code', '.code .codetable', '.highlight pre'],
+            "code.css_wrappers": ['.highlight', '.code'],
             "code.css_head": '/* code.css file generated by Nikola */\n',
-            "code.css_close": "\ntable.codetable { width: 100%;} td.linenos {text-align: right; width: 4em;}\n",
+            "code.css_close": (
+                "\ntable.codetable, table.highlighttable { width: 100%;}\n"
+                ".codetable td.linenos, td.linenos { text-align: right; width: 3.5em; "
+                "padding-right: 0.5em; background: rgba(127, 127, 127, 0.2) }\n"
+                ".codetable td.code, td.code { padding-left: 0.5em; }\n"),
         }
         tasks = {}
         code_css_path = os.path.join(kw['output_folder'], 'assets', 'css', 'code.css')
@@ -63,11 +69,20 @@ class CopyAssets(Task):
                                               files_folders=kw['files_folders'], output_dir=None)
         yield self.group_task()
 
+        main_theme = utils.get_theme_path(kw['themes'][0])
+        theme_ini = utils.parse_theme_meta(main_theme)
+        if theme_ini:
+            ignored_assets = theme_ini.get("Nikola", "ignored_assets", fallback='').split(',')
+            ignored_assets = [os.path.normpath(asset_name.strip()) for asset_name in ignored_assets]
+        else:
+            ignored_assets = []
+
         for theme_name in kw['themes']:
             src = os.path.join(utils.get_theme_path(theme_name), 'assets')
             dst = os.path.join(kw['output_folder'], 'assets')
             for task in utils.copy_tree(src, dst):
-                if task['name'] in tasks:
+                asset_name = os.path.relpath(task['name'], dst)
+                if task['name'] in tasks or asset_name in ignored_assets:
                     continue
                 tasks[task['name']] = task
                 task['uptodate'] = [utils.config_changed(kw, 'nikola.plugins.task.copy_assets')]
@@ -79,18 +94,18 @@ class CopyAssets(Task):
                 yield utils.apply_filters(task, kw['filters'])
 
         # Check whether or not there is a code.css file around.
-        if not code_css_input:
+        if not code_css_input and kw['code_color_scheme']:
             def create_code_css():
-                from pygments.formatters import get_formatter_by_name
-                formatter = get_formatter_by_name('html', style=kw["code_color_scheme"])
+                formatter = BetterHtmlFormatter(style=kw["code_color_scheme"])
                 utils.makedirs(os.path.dirname(code_css_path))
-                with io.open(code_css_path, 'w+', encoding='utf8') as outf:
+                with io.open(code_css_path, 'w+', encoding='utf-8') as outf:
                     outf.write(kw["code.css_head"])
-                    outf.write(formatter.get_style_defs(kw["code.css_selectors"]))
+                    outf.write(formatter.get_style_defs(
+                        kw["code.css_selectors"], kw["code.css_wrappers"]))
                     outf.write(kw["code.css_close"])
 
             if os.path.exists(code_css_path):
-                with io.open(code_css_path, 'r', encoding='utf-8') as fh:
+                with io.open(code_css_path, 'r', encoding='utf-8-sig') as fh:
                     testcontents = fh.read(len(kw["code.css_head"])) == kw["code.css_head"]
             else:
                 testcontents = False