From dd5bafff806e993a24dbd9b2ff1fae4a361af81b Mon Sep 17 00:00:00 2001 From: franz haas Date: Sat, 2 Mar 2024 18:19:06 +0100 Subject: [PATCH 1/7] - adding mermaid --- share/templates/reveal/index.html.j2 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/share/templates/reveal/index.html.j2 b/share/templates/reveal/index.html.j2 index b4f5ae6fc..44f75af76 100644 --- a/share/templates/reveal/index.html.j2 +++ b/share/templates/reveal/index.html.j2 @@ -33,10 +33,6 @@ {%- endblock html_head_js_requirejs -%} {%- block html_head_js_mermaidjs -%} - {%- endblock html_head_js_mermaidjs -%} {%- endblock html_head_js -%} @@ -145,10 +141,11 @@ require( }, [ "{{ reveal_url_prefix }}/dist/reveal.js", - "{{ reveal_url_prefix }}/plugin/notes/notes.js" + "{{ reveal_url_prefix }}/plugin/notes/notes.js", + "https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js" ], - function(Reveal, RevealNotes){ + function(Reveal, RevealNotes, RevealMermaid){ // Full list of configuration options available here: https://github.com/hakimel/reveal.js#configuration Reveal.initialize({ controls: true, @@ -156,10 +153,9 @@ require( history: true, transition: "{{reveal_transition}}", slideNumber: "{{reveal_number}}", - plugins: [RevealNotes], + plugins: [RevealNotes, RevealMermaid], width: {{reveal_width}}, - height: {{reveal_height}}, - + height: {{reveal_height}}, }); var update = function(event){ From 5c130a26854b637de1930f416ebb6f3a04c2d891 Mon Sep 17 00:00:00 2001 From: franz haas Date: Sun, 3 Mar 2024 20:03:01 +0100 Subject: [PATCH 2/7] - incorporeted feedback from bollwyvl --- nbconvert/exporters/slides.py | 5 ++++- share/templates/reveal/index.html.j2 | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nbconvert/exporters/slides.py b/nbconvert/exporters/slides.py index e571a90c0..856d76564 100644 --- a/nbconvert/exporters/slides.py +++ b/nbconvert/exporters/slides.py @@ -119,6 +119,10 @@ def _template_extension_default(self): """ ).tag(config=True) + reveal_mermaid_js_url = Unicode( + help="specifies the mermaid reveal plugin url. defaults to cdn 2.2.0", + ).tag(config=True, default="https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js") + @default("reveal_url_prefix") def _reveal_url_prefix_default(self): if "RevealHelpPreprocessor.url_prefix" in self.config: @@ -129,7 +133,6 @@ def _reveal_url_prefix_default(self): ) return self.config.RevealHelpPreprocessor.url_prefix return "https://unpkg.com/reveal.js@4.0.2" - reveal_theme = Unicode( "simple", help=""" diff --git a/share/templates/reveal/index.html.j2 b/share/templates/reveal/index.html.j2 index 44f75af76..02cb19252 100644 --- a/share/templates/reveal/index.html.j2 +++ b/share/templates/reveal/index.html.j2 @@ -142,7 +142,7 @@ require( [ "{{ reveal_url_prefix }}/dist/reveal.js", "{{ reveal_url_prefix }}/plugin/notes/notes.js", - "https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js" + {% if reveal_mermaid_js_url %}"{{ reveal_mermaid_js_url }}",{% endif %}, ], function(Reveal, RevealNotes, RevealMermaid){ @@ -153,7 +153,10 @@ require( history: true, transition: "{{reveal_transition}}", slideNumber: "{{reveal_number}}", - plugins: [RevealNotes, RevealMermaid], + plugins: [ + RevealNotes, + {% if reveal_mermaid_js_url %}RevealMermaid,{% endif %} + ], width: {{reveal_width}}, height: {{reveal_height}}, }); From ffd0ed5b4294f48958dad059e9b68d8303c35d05 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 3 Mar 2024 19:27:07 +0000 Subject: [PATCH 3/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- nbconvert/exporters/slides.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nbconvert/exporters/slides.py b/nbconvert/exporters/slides.py index 856d76564..ba1da4081 100644 --- a/nbconvert/exporters/slides.py +++ b/nbconvert/exporters/slides.py @@ -121,7 +121,10 @@ def _template_extension_default(self): reveal_mermaid_js_url = Unicode( help="specifies the mermaid reveal plugin url. defaults to cdn 2.2.0", - ).tag(config=True, default="https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js") + ).tag( + config=True, + default="https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js", + ) @default("reveal_url_prefix") def _reveal_url_prefix_default(self): @@ -133,6 +136,7 @@ def _reveal_url_prefix_default(self): ) return self.config.RevealHelpPreprocessor.url_prefix return "https://unpkg.com/reveal.js@4.0.2" + reveal_theme = Unicode( "simple", help=""" From 1fc7811945c338661feb027e859bdabc5fee04c4 Mon Sep 17 00:00:00 2001 From: franz haas Date: Tue, 5 Mar 2024 11:22:40 +0100 Subject: [PATCH 4/7] - use unpkg, celaned --- nbconvert/exporters/slides.py | 4 ++-- share/templates/reveal/index.html.j2 | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nbconvert/exporters/slides.py b/nbconvert/exporters/slides.py index ba1da4081..4831d42b8 100644 --- a/nbconvert/exporters/slides.py +++ b/nbconvert/exporters/slides.py @@ -120,10 +120,9 @@ def _template_extension_default(self): ).tag(config=True) reveal_mermaid_js_url = Unicode( - help="specifies the mermaid reveal plugin url. defaults to cdn 2.2.0", + help="specifies the mermaid reveal plugin url. defaults to https://unpkg.com/reveal.js-mermaid-plugin@2.2.0", ).tag( config=True, - default="https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0/plugin/mermaid/mermaid.js", ) @default("reveal_url_prefix") @@ -213,4 +212,5 @@ def _init_resources(self, resources): resources["reveal"]["number"] = self.reveal_number resources["reveal"]["height"] = self.reveal_height resources["reveal"]["width"] = self.reveal_width + resources["reveal"]["reveal_mermaid_js_url"] = self.reveal_mermaid_js_url return resources diff --git a/share/templates/reveal/index.html.j2 b/share/templates/reveal/index.html.j2 index 02cb19252..069bde5a5 100644 --- a/share/templates/reveal/index.html.j2 +++ b/share/templates/reveal/index.html.j2 @@ -3,6 +3,8 @@ {% from 'jupyter_widgets.html.j2' import jupyter_widgets %} {% set reveal_url_prefix = resources.reveal.url_prefix | default('https://unpkg.com/reveal.js@4.0.2', true) %} +{% set reveal_mermaid_js_url = resources.reveal.reveal_mermaid_js_url | default("https://unpkg.com/reveal.js-mermaid-plugin@2.2.0", true) %} + {% set reveal_theme = resources.reveal.theme | default('white', true) %} {% set reveal_transition = resources.reveal.transition | default('slide', true) %} {% set reveal_number = resources.reveal.number | default('', true) %} @@ -145,7 +147,9 @@ require( {% if reveal_mermaid_js_url %}"{{ reveal_mermaid_js_url }}",{% endif %}, ], - function(Reveal, RevealNotes, RevealMermaid){ + function(Reveal, + RevealNotes, + {% if reveal_mermaid_js_url %}RevealMermaid,{% endif %}){ // Full list of configuration options available here: https://github.com/hakimel/reveal.js#configuration Reveal.initialize({ controls: true, From 6a79d05d5841dd213e0bb89fe68afc5ebbcaf6a9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:36:29 +0000 Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3459adb01..c8fd645b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1550,6 +1550,7 @@ raw template {%- endblock in_prompt -%} """ + exporter_attr = AttrExporter() output_attr, _ = exporter_attr.from_notebook_node(nb) assert "raw template" in output_attr From d69846274be0170abcfa9ff5f17f316ff0be80ae Mon Sep 17 00:00:00 2001 From: franz haas Date: Tue, 5 Mar 2024 14:33:19 +0100 Subject: [PATCH 6/7] - more inputs --- nbconvert/exporters/slides.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nbconvert/exporters/slides.py b/nbconvert/exporters/slides.py index 4831d42b8..450c786e3 100644 --- a/nbconvert/exporters/slides.py +++ b/nbconvert/exporters/slides.py @@ -119,12 +119,6 @@ def _template_extension_default(self): """ ).tag(config=True) - reveal_mermaid_js_url = Unicode( - help="specifies the mermaid reveal plugin url. defaults to https://unpkg.com/reveal.js-mermaid-plugin@2.2.0", - ).tag( - config=True, - ) - @default("reveal_url_prefix") def _reveal_url_prefix_default(self): if "RevealHelpPreprocessor.url_prefix" in self.config: @@ -136,6 +130,16 @@ def _reveal_url_prefix_default(self): return self.config.RevealHelpPreprocessor.url_prefix return "https://unpkg.com/reveal.js@4.0.2" + reveal_mermaid_js_url = Unicode( + help="Specifies the mermaid reveal plugin url.", + ).tag( + config=True, + ) + + @default("reveal_mermaid_js_url") + def _reveal_mermaid_js_url(self): + return "https://unpkg.com/reveal.js-mermaid-plugin@2.2.0" + reveal_theme = Unicode( "simple", help=""" From 27ce894ee3ac929d201c32eaef812ef748dca2eb Mon Sep 17 00:00:00 2001 From: franz haas Date: Tue, 5 Mar 2024 15:12:20 +0100 Subject: [PATCH 7/7] - even more inputs --- nbconvert/exporters/slides.py | 2 +- share/templates/reveal/index.html.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nbconvert/exporters/slides.py b/nbconvert/exporters/slides.py index 450c786e3..dbb87a615 100644 --- a/nbconvert/exporters/slides.py +++ b/nbconvert/exporters/slides.py @@ -138,7 +138,7 @@ def _reveal_url_prefix_default(self): @default("reveal_mermaid_js_url") def _reveal_mermaid_js_url(self): - return "https://unpkg.com/reveal.js-mermaid-plugin@2.2.0" + return "https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0" reveal_theme = Unicode( "simple", diff --git a/share/templates/reveal/index.html.j2 b/share/templates/reveal/index.html.j2 index 069bde5a5..4d63e8edc 100644 --- a/share/templates/reveal/index.html.j2 +++ b/share/templates/reveal/index.html.j2 @@ -3,7 +3,7 @@ {% from 'jupyter_widgets.html.j2' import jupyter_widgets %} {% set reveal_url_prefix = resources.reveal.url_prefix | default('https://unpkg.com/reveal.js@4.0.2', true) %} -{% set reveal_mermaid_js_url = resources.reveal.reveal_mermaid_js_url | default("https://unpkg.com/reveal.js-mermaid-plugin@2.2.0", true) %} +{% set reveal_mermaid_js_url = resources.reveal.reveal_mermaid_js_url | default("https://cdn.jsdelivr.net/npm/reveal.js-mermaid-plugin@2.2.0", true) %} {% set reveal_theme = resources.reveal.theme | default('white', true) %} {% set reveal_transition = resources.reveal.transition | default('slide', true) %} @@ -144,7 +144,7 @@ require( [ "{{ reveal_url_prefix }}/dist/reveal.js", "{{ reveal_url_prefix }}/plugin/notes/notes.js", - {% if reveal_mermaid_js_url %}"{{ reveal_mermaid_js_url }}",{% endif %}, + {% if reveal_mermaid_js_url %}"{{ reveal_mermaid_js_url }}",{% endif %} ], function(Reveal,