upgrade to hugo 0.60.1

9 files changed, 94 insertions, 111 deletions

diff --git a/README.md b/README.md
index d973710..e64b55b 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ https://cupper-hugo-theme.netlify.com/
 
 ## Minimum Hugo version
 
-Hugo version `0.58.3` or higher is required. View the [Hugo releases](https://github.com/gohugoio/hugo/releases) and download the binary for your OS.
+Hugo version `0.60.1` or higher is required. View the [Hugo releases](https://github.com/gohugoio/hugo/releases) and download the binary for your OS.
 
 ## Installation
 
@@ -54,7 +54,7 @@ hugo server --themesDir ../..
 
 ## Configuration
 
-Copy the `config.toml` or `config.yaml` from the [`exampleSite`](https://github.com/zwbetz-gh/cupper-hugo-theme/tree/master/exampleSite), then edit as desired. 
+Copy `config.yaml` from the [`exampleSite`](https://github.com/zwbetz-gh/cupper-hugo-theme/tree/master/exampleSite), then edit as desired. 
 
 ## Logo
 
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
deleted file mode 100644
index 1facf93..0000000
--- a/exampleSite/config.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-baseURL = "https://example.com"
-languageCode = "en-us"
-defaultContentLanguage = "en"
-title = "Cupper"
-theme = "cupper-hugo-theme"
-googleAnalytics = "UA-123456789-1"
-disqusShortname = "yourdiscussshortname"
-enableGitInfo = true
-
-[taxonomies]
-  tag = "tags"
-
-[permalinks]
-  post = "/:filename/"
-
-[imaging]
-  quality = 99
-
-[params]
-  description = "An accessibility-friendly Hugo theme, ported from the [original Cupper](https://github.com/ThePacielloGroup/cupper) project."
-  homeMetaContent = "An accessibility-friendly Hugo theme, ported from the original Cupper project."
-  footer = "Made with [Hugo](https://gohugo.io/). Themed by [Cupper](https://github.com/zwbetz-gh/cupper-hugo-theme). Deployed to [Netlify](https://www.netlify.com/)."
-  # For more date formats see https://gohugo.io/functions/format/
-  dateFormat = "Jan 2, 2006"
-  codePenUser = "someUser"
-  katex = true
-
-[menu]
-  [[menu.nav]]
-    name = "Home"
-    url = "/"
-    weight = 1
-  [[menu.nav]]
-    name = "Blog"
-    url = "/post/"
-    weight = 2
-  [[menu.nav]]
-    name = "Tags"
-    url = "/tags/"
-    weight = 3
-  [[menu.nav]]
-    name = "About"
-    url = "/about/"
-    weight = 4
-  [[menu.nav]]
-    name = "RSS"
-    url = "/index.xml"
-    weight = 5
diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 2c3de32..52153a2 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -42,3 +42,34 @@ menu:
     - name: RSS
       url: /index.xml
       weight: 5
+
+markup:
+  defaultMarkdownHandler: goldmark
+  goldmark:
+    extensions:
+      definitionList: true
+      footnote: true
+      linkify: true
+      strikethrough: true
+      table: true
+      taskList: true
+      typographer: true
+    parser:
+      attribute: true
+      autoHeadingID: true
+    renderer:
+      hardWraps: false
+      unsafe: true
+      xHTML: false
+  highlight:
+    codeFences: false
+    hl_Lines: ""
+    lineNoStart: 1
+    lineNos: false
+    lineNumbersInTable: true
+    noClasses: true
+    style: monokai
+    tabWidth: 4
+  tableOfContents:
+    endLevel: 6
+    startLevel: 2
diff --git a/exampleSite/content/_index.md b/exampleSite/content/_index.md
index 526c1a8..1921c2e 100644
--- a/exampleSite/content/_index.md
+++ b/exampleSite/content/_index.md
@@ -5,10 +5,10 @@ title: "Home"
 
 Welcome to **Cupper**: An accessibility-friendly Hugo theme, ported from the [original Cupper](https://github.com/ThePacielloGroup/cupper) project. Here are some of its features:
 
-{{% ticks %}}
+{{< ticks >}}
 * Screen reader and keyboard accessible
 * Responsive
 * Numerous shortcodes
 * Toggleable dark theme
 * Toggleable table of contents per blog post
-{{% /ticks %}}
+{{< /ticks >}}
diff --git a/exampleSite/content/post/cupper-shortcodes/index.md b/exampleSite/content/post/cupper-shortcodes/index.md
index 7b957ce..76d3032 100644
--- a/exampleSite/content/post/cupper-shortcodes/index.md
+++ b/exampleSite/content/post/cupper-shortcodes/index.md
@@ -7,38 +7,38 @@ tags: [hugo, shortcodes]
 ## blockquote
 
 ```
-{{%/* blockquote author="Carl Jung" */%}}
+{{</* blockquote author="Carl Jung" */>}}
 Even a happy life cannot be without a measure of darkness, and the word happy would lose its meaning if it were not balanced by sadness. It is far better to take things as they come along with patience and equanimity.
-{{%/* /blockquote */%}}
+{{</* /blockquote */>}}
 ```
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Even a happy life cannot be without a measure of darkness, and the word happy would lose its meaning if it were not balanced by sadness. It is far better to take things as they come along with patience and equanimity.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
 ## note
 
 ```
-{{%/* note */%}}
+{{</* note */>}}
 This is a note! It's something the reader may like to know about but is supplementary to the main content. Use notes when something may be interesting but not critical.
-{{%/* /note */%}}
+{{</* /note */>}}
 ```
 
-{{% note %}}
+{{< note >}}
 This is a note! It's something the reader may like to know about but is supplementary to the main content. Use notes when something may be interesting but not critical.
-{{% /note %}}
+{{< /note >}}
 
 ## warning note
 
 ```
-{{%/* warning */%}}
+{{</* warning */>}}
 This is a warning! It's about something the reader should be careful to do or to avoid doing. Use warnings when something could go wrong.
-{{%/* /warning */%}}
+{{</* /warning */>}}
 ```
 
-{{% warning %}}
+{{< warning >}}
 This is a warning! It's about something the reader should be careful to do or to avoid doing. Use warnings when something could go wrong.
-{{% /warning %}}
+{{< /warning >}}
 
 ## cmd
 
@@ -115,35 +115,35 @@ To get syntax highlighting for your code, use markdown code fences, then specify
 ## codePen
 
 ```
-{{%/* codePen VpVNKW */%}}
+{{</* codePen VpVNKW */>}}
 ```
 
-{{% codePen VpVNKW %}}
+{{< codePen VpVNKW >}}
 
 ## colors
 
 ```
-{{%/* colors "#111111, #cccccc, #ffffff" */%}}
+{{</* colors "#111111, #cccccc, #ffffff" */>}}
 ```
 
-{{% colors "#111111, #cccccc, #ffffff" %}}
+{{< colors "#111111, #cccccc, #ffffff" >}}
 
 ## expandable
 
 ```
-{{%/* expandable label="A section of dummy text" level="2" */%}}
+{{</* expandable label="A section of dummy text" level="2" */>}}
 Here is some markdown including [a link](https://twitter.com/heydonworks). Donec erat est, feugiat a est sed, aliquet pharetra ipsum. Vivamus in arcu leo. Praesent feugiat, purus a molestie ultrices, libero massa iaculis ante, sit amet accumsan leo eros vel ligula.
-{{%/* /expandable */%}}
+{{</* /expandable */>}}
 ```
 
-{{% expandable label="A section of dummy text" level="2" %}}
+{{< expandable label="A section of dummy text" level="2" >}}
 Here is some markdown including [a link](https://twitter.com/heydonworks). Donec erat est, feugiat a est sed, aliquet pharetra ipsum. Vivamus in arcu leo. Praesent feugiat, purus a molestie ultrices, libero massa iaculis ante, sit amet accumsan leo eros vel ligula.
-{{% /expandable %}}
+{{< /expandable >}}
 
 ## fileTree
 
 ```
-{{%/* fileTree */%}}
+{{</* fileTree */>}}
 * Level 1 folder
     * Level 2 file
     * Level 2 folder
@@ -160,10 +160,10 @@ Here is some markdown including [a link](https://twitter.com/heydonworks). Donec
         * Level 3 file
     * Level 2 file
 * Level 1 file
-{{%/* /fileTree */%}}
+{{</* /fileTree */>}}
 ```
 
-{{% fileTree %}}
+{{< fileTree >}}
 * Level 1 folder
     * Level 2 file
     * Level 2 folder
@@ -180,23 +180,23 @@ Here is some markdown including [a link](https://twitter.com/heydonworks). Donec
         * Level 3 file
     * Level 2 file
 * Level 1 file
-{{% /fileTree %}}
+{{< /fileTree >}}
 
 ## ticks
 
 ```
-{{%/* ticks */%}}
+{{</* ticks */>}}
 * Selling point one
 * Selling point two
 * Selling point three
-{{%/* /ticks */%}}
+{{</* /ticks */>}}
 ```
 
-{{% ticks %}}
+{{< ticks >}}
 * Selling point one
 * Selling point two
 * Selling point three
-{{% /ticks %}}
+{{< /ticks >}}
 
 ## figureCupper
 
@@ -219,27 +219,27 @@ options="700x" >}}
 See the [full principles list](https://github.com/zwbetz-gh/cupper-hugo-theme/blob/master/data/principles.json).
 
 ```
-{{%/* principles include="Add value, Be consistent" descriptions="true" */%}}
+{{</* principles include="Add value, Be consistent" descriptions="true" */>}}
 ```
 
-{{% principles include="Add value, Be consistent" descriptions="true" %}}
+{{< principles include="Add value, Be consistent" descriptions="true" >}}
 
 ## wcag
 
 See the [full wcag list](https://github.com/zwbetz-gh/cupper-hugo-theme/blob/master/data/wcag.json). 
 
 ```
-{{%/* wcag include="1.2.1, 1.3.1, 4.1.2" */%}}
+{{</* wcag include="1.2.1, 1.3.1, 4.1.2" */>}}
 ```
 
-{{% wcag include="1.2.1, 1.3.1, 4.1.2" %}}
+{{< wcag include="1.2.1, 1.3.1, 4.1.2" >}}
 
 ## tested
 
 See the [full browser list](https://github.com/zwbetz-gh/cupper-hugo-theme/tree/master/static/images).
 
 ```
-{{%/* tested using="Firefox + JAWS, Chrome, Safari iOS + Voiceover, Edge" */%}}
+{{</* tested using="Firefox + JAWS, Chrome, Safari iOS + Voiceover, Edge" */>}}
 ```
 
-{{% tested using="Firefox + JAWS, Chrome, Safari iOS + Voiceover, Edge" %}}
+{{< tested using="Firefox + JAWS, Chrome, Safari iOS + Voiceover, Edge" >}}
diff --git a/exampleSite/content/post/migrate-from-jekyll.md b/exampleSite/content/post/migrate-from-jekyll.md
index 7a3e268..7c6f6c8 100644
--- a/exampleSite/content/post/migrate-from-jekyll.md
+++ b/exampleSite/content/post/migrate-from-jekyll.md
@@ -144,7 +144,7 @@ I simply changed:
 
 to this (this example uses a slightly extended version named `fig`, different than the built-in `figure`):
 
-    {{%/* fig class="full" src="http://farm5.staticflickr.com/4136/4829260124_57712e570a_o_d.jpg" title="One of my favorite touristy-type photos. I secretly waited for the good light while we were having fun and took this. Only regret: a stupid pole in the top-left corner of the frame I had to clumsily get rid of at post-processing." link="http://www.flickr.com/photos/alexnormand/4829260124/in/set-72157624547713078/" */%}}
+    {{</* fig class="full" src="http://farm5.staticflickr.com/4136/4829260124_57712e570a_o_d.jpg" title="One of my favorite touristy-type photos. I secretly waited for the good light while we were having fun and took this. Only regret: a stupid pole in the top-left corner of the frame I had to clumsily get rid of at post-processing." link="http://www.flickr.com/photos/alexnormand/4829260124/in/set-72157624547713078/" */>}}
 
 As a bonus, the shortcode named parameters are, arguably, more readable.
 
diff --git a/exampleSite/content/post/quotes-by-carl-jung.md b/exampleSite/content/post/quotes-by-carl-jung.md
index 805d950..a7a8fdb 100644
--- a/exampleSite/content/post/quotes-by-carl-jung.md
+++ b/exampleSite/content/post/quotes-by-carl-jung.md
@@ -4,46 +4,46 @@ date: 2018-12-26T00:29:41-06:00
 tags: ["quotes"]
 ---
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Even a happy life cannot be without a measure of darkness, and the word happy would lose its meaning if it were not balanced by sadness. It is far better to take things as they come along with patience and equanimity.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 The least of things with a meaning is worth more in life than the greatest of things without it.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Who looks outside, dreams; who looks inside, awakes.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Everything that irritates us about others can lead us to an understanding of ourselves.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Knowing your own darkness is the best method for dealing with the darknesses of other people.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 The meeting of two personalities is like the contact of two chemical substances: if there is any reaction, both are transformed.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 There is no coming to consciousness without pain.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 As far as we can discern, the sole purpose of human existence is to kindle a light of meaning in the darkness of mere being.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 We cannot change anything until we accept it. Condemnation does not liberate, it oppresses.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 In all chaos there is a cosmos, in all disorder a secret order.
-{{% /blockquote %}}
+{{< /blockquote >}}
 
-{{% blockquote author="Carl Jung" %}}
+{{< blockquote author="Carl Jung" >}}
 Show me a sane man and I will cure him for you.
-{{% /blockquote %}}
+{{< /blockquote >}}
diff --git a/netlify.toml b/netlify.toml
index b757aed..51edcce 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -3,6 +3,6 @@
   command = "cd exampleSite && hugo --gc --themesDir ../.."
 
 [build.environment]
-  HUGO_VERSION = "0.58.3"
+  HUGO_VERSION = "0.60.1"
   HUGO_THEME = "repo"
   HUGO_BASEURL = "https://cupper-hugo-theme.netlify.com/"
\ No newline at end of file
diff --git a/theme.toml b/theme.toml
index 516dfbe..8d8ef0c 100644
--- a/theme.toml
+++ b/theme.toml
@@ -5,7 +5,7 @@ description = "An accessibility-friendly Hugo theme, ported from the original Cu
 homepage = "https://github.com/zwbetz-gh/cupper-hugo-theme"
 tags = ["accessible", "blog", "documentation", "dark"]
 features = ["accessible", "blog", "documentation", "dark"]
-min_version = "0.58.3"
+min_version = "0.60.1"
 
 [author]
   name = "Zachary Betz"