Merge pull request #430 from kakawait/hotfix/hugo-0.71-reg0.4.8-BETA

hugo 0.71 regression on "and" syntax

11 files changed, 15 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 331b17c..da0e493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.4.8-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/23) - 29 mai 2020
+
+- Fix regression from Hugo 0.71 ([#429](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/429))
+
 ## [0.4.7-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/22) - 15 aug 2019
 
 - Fix regression from Hugo 0.57 ([#371](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/371))
diff --git a/README.md b/README.md
index 1ec45e1..33b0d44 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.7-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.8-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features
diff --git a/docs/developer.md b/docs/developer.md
index 2754c81..f54e81e 100644
--- a/docs/developer.md
+++ b/docs/developer.md
@@ -28,7 +28,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General ##
 
 - **Author** : Thibaud Leprêtre
-- **Version** : 0.4.7-BETA (based on Hexo version 1.10.0)
+- **Version** : 0.4.8-BETA (based on Hexo version 1.10.0)
 - **Compatibility** : Hugo v0.53
 
 ## Requirements ##
diff --git a/docs/user.md b/docs/user.md
index a85562c..c9ce53f 100644
--- a/docs/user.md
+++ b/docs/user.md
@@ -55,7 +55,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.7-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.8-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index c7b9fcc..68bd29b 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -1,5 +1,5 @@
 # Tranquilpeak
-# Version : 0.4.7-BETA
+# Version : 0.4.8-BETA
 # Author : Thibaud Leprêtre
 
 # I STRONGLY recommend you to use a CDN to speed up loading of pages.
diff --git a/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md b/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
index 3747719..e06e242 100644
--- a/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
+++ b/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
@@ -1,5 +1,5 @@
 ---
-title: "Welcome to Tranquilpeak 0.4.7-BETA"
+title: "Welcome to Tranquilpeak 0.4.8-BETA"
 date: 2015-06-15
 categories:
 - tranquilpeak
@@ -65,7 +65,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.7-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.8-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index d0eba4d..f45ed5c 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,7 +1,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.4.7-BETA">
+<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.4.8-BETA">
 <meta name="author" content="{{ .Site.Author.name }}">
 <meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">
 <meta name="description" content="{{ if .Description }}{{ .Description }}{{ else if .IsPage }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}">
diff --git a/layouts/shortcodes/codeblock.html b/layouts/shortcodes/codeblock.html
index 9e210d2..95fa365 100644
--- a/layouts/shortcodes/codeblock.html
+++ b/layouts/shortcodes/codeblock.html
@@ -20,7 +20,7 @@
 {{ $trimmedContent := trim .Inner "\n" }}
 <figure class="highlight {{ $.Scratch.Get "c-language" }} language-{{ with ($.Scratch.Get "c-language") }}{{ . }}{{ end }}">
   <figcaption>
-    {{ if and (($.Scratch.Get "c-url") ($.Scratch.Get "c-title")) }}
+    {{ if and ($.Scratch.Get "c-url") ($.Scratch.Get "c-title") }}
       <span>{{ $.Scratch.Get "c-title" }}</span><a href="{{ ($.Scratch.Get "c-url") | safeURL }}" target="_blank" rel="external">{{ $.Scratch.Get "c-link-text" | default ($.Scratch.Get "c-title") }}</a>
     {{ else if $.Scratch.Get "c-title" }}
       <span>{{ $.Scratch.Get "c-title" }}</span>
diff --git a/layouts/shortcodes/tabbed-codeblock.html b/layouts/shortcodes/tabbed-codeblock.html
index 8cacb7d..8e27ee3 100644
--- a/layouts/shortcodes/tabbed-codeblock.html
+++ b/layouts/shortcodes/tabbed-codeblock.html
@@ -19,7 +19,7 @@
 {{ end }}
 <figure class="codeblock codeblock--tabbed">
   <figcaption>
-    {{ if and (($.Scratch.Get "tc-url") ($.Scratch.Get "tc-title")) }}
+    {{ if and ($.Scratch.Get "tc-url") ($.Scratch.Get "tc-title") }}
       <span><a href="{{ ($.Scratch.Get "tc-url") | safeURL }}">{{ $.Scratch.Get "tc-title" }}</a></span>
     {{ else if $.Scratch.Get "tc-title" }}
       <span>{{ $.Scratch.Get "tc-title" }}</span>
diff --git a/package-lock.json b/package-lock.json
index d02947c..6bce73d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-tranquilpeak-theme",
-  "version": "0.4.7-BETA",
+  "version": "0.4.8-BETA",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 609acea..097c33a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-tranquilpeak-theme",
-  "version": "0.4.7-BETA",
+  "version": "0.4.8-BETA",
   "description": "A gorgeous responsive theme for Hugo blog framework",
   "main": "Gruntfile.js",
   "scripts": {