Merge pull request #61 from sbesson/docutils_0.18.1

Docutils 0.18.1: stylesheet vs stylesheet_path
mgedmin · Nov 29, 2021 · aabdc56 · aabdc56
2 parents 4e2b8d0 + 10ddcc0
commit aabdc56
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/restview/restviewhttp.py b/src/restview/restviewhttp.py
@@ -456,12 +456,17 @@ def rest_to_html(self, rest_input, settings=None, mtime=None, filename=None):
             writer.translator_class = SyntaxHighlightingHTMLTranslator
         if self.stylesheets:
             stylesheet_dirs = writer.default_stylesheet_dirs + [DATA_PATH]
-            # docutils can't embed http:// or https:// URLs
-            embed_stylesheet = '//' not in self.stylesheets
-            settings_overrides = {'stylesheet': self.stylesheets,
-                                  'stylesheet_path': None,
-                                  'stylesheet_dirs': stylesheet_dirs,
-                                  'embed_stylesheet': embed_stylesheet}
+            if '//' not in self.stylesheets:
+                settings_overrides = {'stylesheet': None,
+                                      'stylesheet_path': self.stylesheets,
+                                      'stylesheet_dirs': stylesheet_dirs,
+                                      'embed_stylesheet': True}
+            else:
+                # docutils can't embed http:// or https:// URLs
+                settings_overrides = {'stylesheet': self.stylesheets,
+                                      'stylesheet_path': None,
+                                      'stylesheet_dirs': stylesheet_dirs,
+                                      'embed_stylesheet': False}
         else:
             settings_overrides = {}
         settings_overrides['syntax_highlight'] = 'short'