From 5c6c8770b1710f6f2281b801bccb655c01d7fdb9 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sun, 15 Dec 2019 15:52:53 +0000
Subject: [PATCH] feat: add support for Hugo v0.60

Slides now work correctly in Hugo v0.60.

Close #1479
---
 exampleSite/content/slides/example/index.md | 8 ++++----
 layouts/partials/slides.html                | 9 ++++++---
 layouts/slides/baseof.html                  | 8 ++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/exampleSite/content/slides/example/index.md b/exampleSite/content/slides/example/index.md
index b5a4425a..d3dc3842 100644
--- a/exampleSite/content/slides/example/index.md
+++ b/exampleSite/content/slides/example/index.md
@@ -13,9 +13,9 @@ slides:
   highlight_style: dracula
 ---
 
-# Welcome to Slides
+# Create slides in Markdown with Academic
 
-[Academic](https://sourcethemes.com/academic/)
+[Academic](https://sourcethemes.com/academic/) | [Documentation](https://sourcethemes.com/academic/docs/managing-content/#create-slides)
 
 ---
 
@@ -161,6 +161,6 @@ Create `assets/css/reveal_custom.css` with:
 
 # Questions?
 
-[Ask](https://discourse.gohugo.io)
+[Ask](https://spectrum.chat/academic)
 
-[Documentation](https://sourcethemes.com/academic/docs/)
+[Documentation](https://sourcethemes.com/academic/docs/managing-content/#create-slides)
diff --git a/layouts/partials/slides.html b/layouts/partials/slides.html
index 0cdfd9a3..4f87c5f8 100644
--- a/layouts/partials/slides.html
+++ b/layouts/partials/slides.html
@@ -5,10 +5,13 @@
     {{ if ne (len .Content) 0 }}
 
     {{/* Must remove `<hr />` generated by Blackfriday footnotes as conflicts with slide delimiter. */}}
-    {{ $content := replace .Content "<div class=\"footnotes\">\n\n<hr />" "<div class=\"footnotes\">" }}
+    {{/* Commented out workaround as Blackfriday has been superseded by Goldmark in Hugo 0.60. */}}
+    {{/* TODO: reintroduce a similar workaround if Goldmark requires it. */}}
+    {{/* $content := replace .Content "<div class=\"footnotes\">\n\n<hr />" "<div class=\"footnotes\">" */}}
+    {{ $content := .Content }}{{/* For Goldmark. */}}
 
-    {{/* Let `<hr />` delimit slides. */}}
-    {{ range (split $content "<hr />") }}
+    {{/* Let `---` delimit slides. In Goldmark, that is `<hr>`. Alternatively, for Blackfriday, use `<hr />`. */}}
+    {{ range (split $content "<hr>") }}
 
     {{/* Each `<section>` defines a new slide. */}}
     {{/* Only begin new slide `<section>` if not already added by custom `slide` shortcode. */}}
diff --git a/layouts/slides/baseof.html b/layouts/slides/baseof.html
index 2e2d57ec..cbe384c9 100644
--- a/layouts/slides/baseof.html
+++ b/layouts/slides/baseof.html
@@ -43,18 +43,22 @@
 
   {{ block "main" . }}{{ end }}
 
-  <script src="{{ $cdn_url_reveal }}/lib/js/head.min.js"></script>
   <script src="{{ $cdn_url_reveal }}/js/reveal.min.js"></script>
 
   <script>
     window.revealPlugins = { dependencies: [
+      // Interpret Markdown in <section> elements.
       { src: '{{ $cdn_url_reveal }}/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
       { src: '{{ $cdn_url_reveal }}/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+      // Enable code highlighting.
       { src: '{{ $cdn_url_reveal }}/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+      // Enable zooming.
       { src: '{{ $cdn_url_reveal }}/plugin/zoom-js/zoom.js', async: true },
+      // Enable math.
       { src: '{{ $cdn_url_reveal }}/plugin/math/math.js', async: true },
+      // Enable exporting deck to PDF.
       { src: '{{ $cdn_url_reveal }}/plugin/print-pdf/print-pdf.js', async: true },
-      // Notes plugin must be loaded locally as CDN is missing `notes.html`.
+      // Enable speaker notes. Notes plugin must be loaded locally as CDN is missing `notes.html`.
       { src: '{{ "js/vendor/reveal.js/plugin/notes/notes.js" | relURL }}', async: true }
     ]};