From 41e508d08783f61b35f3f66d2c3b3c3c1e2ec39f Mon Sep 17 00:00:00 2001
From: Anders Johansson <mejlaandersj@gmail.com>
Date: Sun, 24 May 2020 16:16:20 +0200
Subject: [PATCH 1/5] Use new paths dist/reveal.js etc. instead of js/reveal.js

---
 org-re-reveal.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/org-re-reveal.el b/org-re-reveal.el
index 1c2e531..49952b3 100644
--- a/org-re-reveal.el
+++ b/org-re-reveal.el
@@ -223,12 +223,12 @@ browsing that file, subtree export to file."
   :set #'org-re-reveal-define-menu)
 
 (defcustom org-re-reveal-root "./reveal.js"
-  "Specify root directory of reveal.js containing js/reveal.js."
+  "Specify root directory of reveal.js containing dist/reveal.js."
   :group 'org-export-re-reveal
   :type '(radio (const :tag "Online at https://revealjs.com" "https://revealjs.com")
                 (string :tag "Other directory path")))
 
-(defcustom org-re-reveal-script-files '("lib/js/head.min.js" "js/reveal.js")
+(defcustom org-re-reveal-script-files '("dist/reveal.js")
   "Specify files to initialize reveal.js.
 Note that file names here are relative under `org-re-reveal-root'.
 On 2018-10-04, head.min.js was removed on the dev branch of reveal.js.
@@ -1038,9 +1038,9 @@ Reveal.addEventListener( 'slidechanged', function( event ) {
 (defun org-re-reveal-stylesheets (info)
   "Return HTML code for reveal stylesheets using INFO and `org-re-reveal-root'."
   (let* ((root-path (file-name-as-directory (plist-get info :reveal-root)))
-         (reveal-css (concat root-path "css/reveal.css"))
+         (reveal-css (concat root-path "dist/reveal.css"))
          (theme (plist-get info :reveal-theme))
-         (theme-css (concat root-path "css/theme/" theme ".css"))
+         (theme-css (concat root-path "dist/theme/" theme ".css"))
          (extra-css (plist-get info :reveal-extra-css))
          (in-single-file (plist-get info :reveal-single-file)))
     (concat
-- 
GitLab


From 5e53d05e0beeae88bd599e2543ee075d79ce1527 Mon Sep 17 00:00:00 2001
From: Anders Johansson <mejlaandersj@gmail.com>
Date: Sun, 24 May 2020 16:17:05 +0200
Subject: [PATCH 2/5] Remove print css code

---
 org-re-reveal.el | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/org-re-reveal.el b/org-re-reveal.el
index 49952b3..ce32772 100644
--- a/org-re-reveal.el
+++ b/org-re-reveal.el
@@ -1068,22 +1068,7 @@ Reveal.addEventListener( 'slidechanged', function( event ) {
        "")
 
      ;; Include CSS for klipse if necessary
-     (org-re-reveal--klipsify-header info)
-
-     ;; print-pdf
-     (if in-single-file ""
-       (format "\n<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = '%scss/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
-"
-               root-path)))))
+     (org-re-reveal--klipsify-header info))))
 
 (defun org-re-reveal-mathjax-scripts (info)
   "Return HTML code for declaring MathJax scripts for INFO."
-- 
GitLab


From e0da679fdaf13a36d2715f3201c01b28f320f23d Mon Sep 17 00:00:00 2001
From: Anders Johansson <mejlaandersj@gmail.com>
Date: Sun, 24 May 2020 17:32:58 +0200
Subject: [PATCH 3/5] Adapt config of theme and transition to 4.0

- Remove 'theme' from config initialization
- Disable setting transition from query (getQueryHash is not available
when initializing)
---
 org-re-reveal.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/org-re-reveal.el b/org-re-reveal.el
index ce32772..5998962 100644
--- a/org-re-reveal.el
+++ b/org-re-reveal.el
@@ -1228,10 +1228,9 @@ Otherwise, raise error."
    (let ((max-scale (string-to-number (plist-get info :reveal-max-scale))))
      (if (> max-scale 0) (format "maxScale: %.2f,\n" max-scale) ""))
 
-   ;; thems and transitions
+   ;; transitions
    (format "
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || '%s', // see README of reveal.js for options
+transition: '%s',
 transitionSpeed: '%s',\n"
            (plist-get info :reveal-trans)
            (plist-get info :reveal-speed))
@@ -1322,7 +1321,7 @@ Use INFO and custom variable `org-re-reveal-root'."
    ;; Create <script> tag for Reveal.initialize(...).
    "<script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 "
    ;; plugin configures/frags
-- 
GitLab


From 6fd1173a47dccf5df30501225e3a0ac400eb08aa Mon Sep 17 00:00:00 2001
From: Anders Johansson <mejlaandersj@gmail.com>
Date: Sun, 24 May 2020 18:08:40 +0200
Subject: [PATCH 4/5] Update test cases

---
 test-cases/expect-extra-scripts.html          | 20 ++++------------
 test-cases/expect-highlightjs.html            | 23 ++++---------------
 test-cases/expect-klipsify-python.html        | 23 ++++---------------
 test-cases/expect-klipsify.html               | 23 ++++---------------
 test-cases/expect-multiplex.html              | 23 ++++---------------
 test-cases/expect-noslide.html                | 23 ++++---------------
 test-cases/expect-options.html                | 23 ++++---------------
 test-cases/expect-reveal-toc.html             | 23 ++++---------------
 .../expect-slide-numbers-reveal-toc.html      | 23 ++++---------------
 test-cases/expect-slide-numbers-toc.html      | 23 ++++---------------
 test-cases/expect-slide-numbers.html          | 23 ++++---------------
 test-cases/expect-split.html                  | 23 ++++---------------
 test-cases/expect-title-slide.html            | 23 ++++---------------
 13 files changed, 64 insertions(+), 232 deletions(-)

diff --git a/test-cases/expect-extra-scripts.html b/test-cases/expect-extra-scripts.html
index bfe421a..c9d130d 100644
--- a/test-cases/expect-extra-scripts.html
+++ b/test-cases/expect-extra-scripts.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -45,7 +34,7 @@
 <script>console.log("Empty script.")</script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -64,8 +53,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-highlightjs.html b/test-cases/expect-highlightjs.html
index 67a5f6c..a8f5a86 100644
--- a/test-cases/expect-highlightjs.html
+++ b/test-cases/expect-highlightjs.html
@@ -7,21 +7,10 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 <link rel="stylesheet" href="./reveal.js/lib/css/zenburn.css"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
 </head>
 <body>
 <div class="reveal">
@@ -107,11 +96,10 @@ const (
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -130,8 +118,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-klipsify-python.html b/test-cases/expect-klipsify-python.html
index 6345f11..7fa31c7 100644
--- a/test-cases/expect-klipsify-python.html
+++ b/test-cases/expect-klipsify-python.html
@@ -7,9 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 <link rel="stylesheet" href="./reveal.js/plugin/klipse/codemirror.css"/>
 <style>
 /* Position computations of klipse get confused by reveal.js's scaling.
@@ -29,17 +29,6 @@ codemirror_root: './reveal.js/plugin/klipse',
         selector_eval_python_client: '.language-klipse-python'
     };
 </script>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
 </head>
 <body>
 <div class="reveal">
@@ -86,11 +75,10 @@ plugin folder of reveal.js</li>
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -111,8 +99,7 @@ height: 1000,
 minScale: 1.00,
 maxScale: 1.00,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-klipsify.html b/test-cases/expect-klipsify.html
index 162cf43..4459044 100644
--- a/test-cases/expect-klipsify.html
+++ b/test-cases/expect-klipsify.html
@@ -7,9 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 <link rel="stylesheet" href="https://storage.googleapis.com/app.klipse.tech/css/codemirror.css"/>
 <style>
 /* Position computations of klipse get confused by reveal.js's scaling.
@@ -39,17 +39,6 @@ autoCloseBrackets: true
         selector_sql: '.language-klipse-sql'
     };
 </script>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
 </head>
 <body>
 <div class="reveal">
@@ -187,11 +176,10 @@ x
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -212,8 +200,7 @@ height: 1000,
 minScale: 1.00,
 maxScale: 1.00,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-multiplex.html b/test-cases/expect-multiplex.html
index da2561b..5cfd69a 100644
--- a/test-cases/expect-multiplex.html
+++ b/test-cases/expect-multiplex.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -165,11 +154,10 @@ that generates this presentation</li>
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -188,8 +176,7 @@ overview: true,
 width: 1280,
 height: 960,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 multiplex: {
     secret: '15664574924923436538', // null if client
diff --git a/test-cases/expect-noslide.html b/test-cases/expect-noslide.html
index 9c05367..6b91aaf 100644
--- a/test-cases/expect-noslide.html
+++ b/test-cases/expect-noslide.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -56,11 +45,10 @@
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -77,8 +65,7 @@ pdfSeparateFragments: true,
 
 overview: true,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-options.html b/test-cases/expect-options.html
index 350825f..531fb35 100644
--- a/test-cases/expect-options.html
+++ b/test-cases/expect-options.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -41,11 +30,10 @@
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -64,8 +52,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 controlsTutorial: false, controlsLayout: 'edges',
 
diff --git a/test-cases/expect-reveal-toc.html b/test-cases/expect-reveal-toc.html
index de87e53..e8891b7 100644
--- a/test-cases/expect-reveal-toc.html
+++ b/test-cases/expect-reveal-toc.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -69,11 +58,10 @@ With text
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -90,8 +78,7 @@ pdfSeparateFragments: true,
 
 overview: true,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-slide-numbers-reveal-toc.html b/test-cases/expect-slide-numbers-reveal-toc.html
index 9eacb00..aa0537b 100644
--- a/test-cases/expect-slide-numbers-reveal-toc.html
+++ b/test-cases/expect-slide-numbers-reveal-toc.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -136,11 +125,10 @@ Hello world!
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -159,8 +147,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-slide-numbers-toc.html b/test-cases/expect-slide-numbers-toc.html
index 0cbb2e7..2e2583f 100644
--- a/test-cases/expect-slide-numbers-toc.html
+++ b/test-cases/expect-slide-numbers-toc.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -138,11 +127,10 @@ Hello world!
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -161,8 +149,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-slide-numbers.html b/test-cases/expect-slide-numbers.html
index 7f0cb36..47bd636 100644
--- a/test-cases/expect-slide-numbers.html
+++ b/test-cases/expect-slide-numbers.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -135,11 +124,10 @@ Hello world!
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -158,8 +146,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-split.html b/test-cases/expect-split.html
index 77176bc..0776680 100644
--- a/test-cases/expect-split.html
+++ b/test-cases/expect-split.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -98,11 +87,10 @@ Default background again.
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -121,8 +109,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
diff --git a/test-cases/expect-title-slide.html b/test-cases/expect-title-slide.html
index f84c6e7..56ac5c5 100644
--- a/test-cases/expect-title-slide.html
+++ b/test-cases/expect-title-slide.html
@@ -7,20 +7,9 @@
 <style type="text/css">
 .underline { text-decoration: underline; }
 </style>
-<link rel="stylesheet" href="./reveal.js/css/reveal.css"/>
+<link rel="stylesheet" href="./reveal.js/dist/reveal.css"/>
 
-<link rel="stylesheet" href="./reveal.js/css/theme/black.css" id="theme"/>
-
-<!-- If the query includes 'print-pdf', include the PDF print sheet -->
-<script>
-    if( window.location.search.match( /print-pdf/gi ) ) {
-        var link = document.createElement( 'link' );
-        link.rel = 'stylesheet';
-        link.type = 'text/css';
-        link.href = './reveal.js/css/print/pdf.css';
-        document.getElementsByTagName( 'head' )[0].appendChild( link );
-    }
-</script>
+<link rel="stylesheet" href="./reveal.js/dist/theme/black.css" id="theme"/>
 </head>
 <body>
 <div class="reveal">
@@ -41,11 +30,10 @@
 </section>
 </div>
 </div>
-<script src="./reveal.js/lib/js/head.min.js"></script>
-<script src="./reveal.js/js/reveal.js"></script>
+<script src="./reveal.js/dist/reveal.js"></script>
 <script>
 // Full list of configuration options available here:
-// https://github.com/hakimel/reveal.js#configuration
+// https://revealjs.com/config/
 Reveal.initialize({
 
 controls: true,
@@ -64,8 +52,7 @@ overview: true,
 width: 1400,
 height: 1000,
 
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || 'convex', // see README of reveal.js for options
+transition: 'convex',
 transitionSpeed: 'default',
 
 // Optional libraries used to extend reveal.js
-- 
GitLab


From 1fd3a640e04c388781f616188ee38b49c254d8e4 Mon Sep 17 00:00:00 2001
From: Anders Johansson <mejlaandersj@gmail.com>
Date: Tue, 2 Jun 2020 21:24:53 +0200
Subject: [PATCH 5/5] New plugins, unclean solution

---
 org-re-reveal.el | 105 +++++++++++++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 39 deletions(-)

diff --git a/org-re-reveal.el b/org-re-reveal.el
index 5998962..164e5c4 100644
--- a/org-re-reveal.el
+++ b/org-re-reveal.el
@@ -1128,6 +1128,12 @@ This includes reveal.js libraries in `org-re-reveal-script-files' under
          (extra-script-elements
           (cl-remove-if-not (lambda (s) (string-prefix-p "<script>" s))
                             extra-scripts))
+         (enabled-builtin-plugins (org-re-reveal--parse-listoption
+                                   info :reveal-plugins))
+         (builtin-paths (mapcar (lambda (plugin) (let ((pl (symbol-name plugin)))
+                                              (concat root-path "plugin/" pl "/" pl  ".js")))
+                                enabled-builtin-plugins))
+         (extra-script-files (append extra-script-files builtin-paths))
          (in-single-file (plist-get info :reveal-single-file)))
     (concat
      (if in-single-file
@@ -1255,53 +1261,71 @@ transitionSpeed: '%s',\n"
        (plist-get info :reveal-multiplex-id)
        (plist-get info :reveal-multiplex-url)))))
 
+
+(defun org-re-reveal-scripts--plugins (info)
+  "Internal function for `org-re-reveal-scripts' with INFO."
+  (if-let ((enabled-builtin-plugins (org-re-reveal--parse-listoption
+                                     info :reveal-plugins))
+           (builtin-codes
+            (mapcar (lambda (p) (concat "Reveal" (upcase-initials (symbol-name p)))) enabled-builtin-plugins)))
+      ;; TODO: Also register external plugins here, instead of with
+      ;; old dependencies-framework
+      (concat
+       "
+// Optional plugins used to extend reveal.js
+plugins: ["
+       (mapconcat #'identity builtin-codes ", ")
+       "],\n")
+    ""))
+
 (defun org-re-reveal-scripts--dependencies (info)
   "Internal function for `org-re-reveal-scripts' with INFO."
   (let* ((root-path (file-name-as-directory (plist-get info :reveal-root)))
-         (in-single-file (plist-get info :reveal-single-file))
-         (enabled-builtin-plugins (org-re-reveal--parse-listoption
-                                   info :reveal-plugins)))
+         (in-single-file (plist-get info :reveal-single-file)))
     ;; optional JS library heading
     (if in-single-file ""
-      (concat
-       "
+      (let* (;; (highlight-url (plist-get info :reveal-highlight-url))
+             ;; (builtins
+             ;;               `(classList ,(format " { src: '%slib/js/classList.js', condition: function() { return !document.body.classList; } }" root-path)
+             ;;                           markdown ,(format " { src: '%splugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+             ;; { src: '%splugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }" root-path root-path)
+             ;;                           highlight ,(if highlight-url
+             ;;                                          (format " { src: '%s', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }" highlight-url)
+             ;;                                        (format " { src: '%splugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }" root-path))
+             ;;                           zoom ,(format " { src: '%splugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
+             ;;                           notes ,(format " { src: '%splugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
+             ;;                           search ,(format " { src: '%splugin/search/search.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
+             ;;                           remotes ,(format " { src: '%splugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
+             ;;                           multiplex ,(format " { src: '%s', async: true },\n%s"
+             ;;                                              (plist-get info :reveal-multiplex-socketio-url)
+             ;;                                              ;; following ensures that either client.js or master.js is included depending on defvar org-re-reveal-client-multiplex value state
+             ;;                                              (if (not org-re-reveal-client-multiplex)
+             ;;                                                  (progn
+             ;;                                                    (if (not (string= "" (plist-get info :reveal-multiplex-secret)))
+             ;;                                                        (setq org-re-reveal-client-multiplex t))
+             ;;                                                    (format " { src: '%splugin/multiplex/master.js', async: true }" root-path))
+             ;;                                                (format " { src: '%splugin/multiplex/client.js', async: true }" root-path)))))
+             ;; (builtin-codes
+             ;;  (mapcar (lambda (p) (plist-get builtins p)) enabled-builtin-plugins))
+             (external-plugins
+              (org-re-reveal--external-plugin-init info root-path))
+             (extra-codes (plist-get info :reveal-extra-js))
+             (total-codes
+              (if (string= "" extra-codes)
+                  external-plugins
+                (append (list extra-codes) external-plugins)))
+             (total-deps (mapconcat 'identity total-codes ",\n")))
+        (if (string-blank-p total-deps)
+            ""
+          (concat
+           "
 // Optional libraries used to extend reveal.js
 dependencies: [
 "
-       ;; JS libraries
-       (let* ((highlight-url (plist-get info :reveal-highlight-url))
-              (builtins
-               `(classList ,(format " { src: '%slib/js/classList.js', condition: function() { return !document.body.classList; } }" root-path)
-                           markdown ,(format " { src: '%splugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
- { src: '%splugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }" root-path root-path)
-                           highlight ,(if highlight-url
-                                          (format " { src: '%s', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }" highlight-url)
-                                        (format " { src: '%splugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }" root-path))
-                           zoom ,(format " { src: '%splugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
-                           notes ,(format " { src: '%splugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
-                           search ,(format " { src: '%splugin/search/search.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
-                           remotes ,(format " { src: '%splugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }" root-path)
-                           multiplex ,(format " { src: '%s', async: true },\n%s"
-                                              (plist-get info :reveal-multiplex-socketio-url)
-                                              ;; following ensures that either client.js or master.js is included depending on defvar org-re-reveal-client-multiplex value state
-                                              (if (not org-re-reveal-client-multiplex)
-                                                  (progn
-                                                    (if (not (string= "" (plist-get info :reveal-multiplex-secret)))
-                                                        (setq org-re-reveal-client-multiplex t))
-                                                    (format " { src: '%splugin/multiplex/master.js', async: true }" root-path))
-                                                (format " { src: '%splugin/multiplex/client.js', async: true }" root-path)))))
-              (builtin-codes
-               (mapcar (lambda (p) (plist-get builtins p)) enabled-builtin-plugins))
-              (external-plugins
-               (org-re-reveal--external-plugin-init info root-path))
-              (all-plugins (if external-plugins (append external-plugins builtin-codes) builtin-codes))
-              (extra-codes (plist-get info :reveal-extra-js))
-              (total-codes
-               (if (string= "" extra-codes)
-                   all-plugins
-                 (append (list extra-codes) all-plugins))))
-         (mapconcat 'identity total-codes ",\n"))
-       "]\n\n"))))
+           total-deps ;; JS libraries
+           "]\n\n"))
+        )
+      )))
 
 (defun org-re-reveal-scripts--init-script (info)
   "Internal function for `org-re-reveal-scripts' with INFO."
@@ -1333,6 +1357,9 @@ Reveal.initialize({
    ;; multiplexing - depends on defvar 'org-re-reveal-client-multiplex'
    (org-re-reveal-scripts--multiplex info)
 
+   ;; install plugins
+   (org-re-reveal-scripts--plugins info)
+
    ;; load dependency js
    (org-re-reveal-scripts--dependencies info)
 
-- 
GitLab