From d0024703a9adae3a729db87701787dcc2816e1d8 Mon Sep 17 00:00:00 2001
From: Bruno Grossniklaus <grossnik@tuvok>
Date: Wed, 10 Jan 2018 12:07:38 +0100
Subject: [PATCH 1/4] fix figure (allow dots in path and filename)

---
 layouts/shortcodes/figure.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 4c6ff1f..1acb406 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -7,7 +7,8 @@
 {{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{ end }}
 {{- $.Page.Scratch.Add "figurecount" 1 -}}
 <!-- use either src or link-thumb for thumbnail image -->
-{{- $thumb := .Get "src" | default (printf "%s." (.Get "thumb") | replace (.Get "link") ".") }}
+{{- $filetype := index (findRE "[^.]+$" (.Get "link") ) 0 }}
+{{- $thumb := .Get "src" | default (printf "%s.%s" (replaceRE "\\.[^.]+$" (.Get "thumb") (.Get "link") ) $filetype )  | relURL }}
 <div class="box{{ with .Get "caption-position" }} fancy-figure caption-position-{{.}}{{end}}{{ with .Get "caption-effect" }} caption-effect-{{.}}{{end}}" {{ with .Get "width" }}style="max-width:{{.}}"{{end}}>
   <figure {{ with .Get "class" }}class="{{.}}"{{ end }} itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
     <div class="img"{{ if .Parent }} style="background-image: url('{{ print .Site.BaseURL $thumb }}');"{{ end }}{{ with .Get "size" }} data-size="{{.}}"{{ end }}>

From f70e710f0f156489b8ad741592be87ba32060640 Mon Sep 17 00:00:00 2001
From: Bruno Grossniklaus <grossnik@tuvok>
Date: Wed, 10 Jan 2018 12:25:59 +0100
Subject: [PATCH 2/4] fix gallery (allow dots in path and filename)

---
 layouts/shortcodes/gallery.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html
index aac2ace..594cdb7 100644
--- a/layouts/shortcodes/gallery.html
+++ b/layouts/shortcodes/gallery.html
@@ -18,7 +18,8 @@
 			{{- if and $isimg (not $isthumb) }}
 				{{- $caption :=  .Name | replaceRE "\\..*" "" | humanize }}<!-- humanized filename without extension -->
 				{{- $linkURL := print $baseURL ($.Get "dir") "/" .Name | absURL }}<!-- absolute URL to hi-res image -->
-				{{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }}<!-- filename of thumbnail image -->
+        {{- $filetype := index (findRE "[^.]+$" .Name ) 0 }}<!-- file extension of image -->
+        {{- $thumb := .Name | replaceRE "\\.[^.]+$" (printf "%s.%s" $thumbext $filetype) }}<!-- filename of thumbnail image -->
 				{{- $thumbexists := where $files "Name" $thumb }}<!-- does a thumbnail image exist? --> 
 				{{- $thumbURL := print $baseURL ($.Get "dir") "/" $thumb | absURL }}<!-- absolute URL to thumbnail image -->
 				<div class="box">

From 956b7a34cebcb6fc1c98b177cbf6576f8030ea54 Mon Sep 17 00:00:00 2001
From: Bruno Grossniklaus <grossnik@tuvok>
Date: Wed, 10 Jan 2018 13:03:41 +0100
Subject: [PATCH 3/4] untabify

---
 layouts/shortcodes/gallery.html | 60 ++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html
index 594cdb7..710c6c3 100644
--- a/layouts/shortcodes/gallery.html
+++ b/layouts/shortcodes/gallery.html
@@ -7,36 +7,36 @@
 {{- $.Page.Scratch.Add "figurecount" 1 }}
 {{ $baseURL := .Site.BaseURL }}
 <div class="gallery caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
-	{{- with (.Get "dir") -}}
-		<!-- If a directory was specified, generate figures for all of the images in the directory -->
-		{{- $files := readDir (print "/static/" .) }}
-		{{- range $files -}}
-			<!-- skip files that aren't images, or that inlcude the thumb suffix in their name -->
-			{{- $thumbext := $.Get "thumb" | default "-thumb" }}
-			{{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }}<!-- is the current file a thumbnail image? -->
-			{{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }}<!-- is the current file an image? -->
-			{{- if and $isimg (not $isthumb) }}
-				{{- $caption :=  .Name | replaceRE "\\..*" "" | humanize }}<!-- humanized filename without extension -->
-				{{- $linkURL := print $baseURL ($.Get "dir") "/" .Name | absURL }}<!-- absolute URL to hi-res image -->
+  {{- with (.Get "dir") -}}
+    <!-- If a directory was specified, generate figures for all of the images in the directory -->
+    {{- $files := readDir (print "/static/" .) }}
+    {{- range $files -}}
+      <!-- skip files that aren't images, or that inlcude the thumb suffix in their name -->
+      {{- $thumbext := $.Get "thumb" | default "-thumb" }}
+      {{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }}<!-- is the current file a thumbnail image? -->
+      {{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }}<!-- is the current file an image? -->
+      {{- if and $isimg (not $isthumb) }}
+        {{- $caption :=  .Name | replaceRE "\\..*" "" | humanize }}<!-- humanized filename without extension -->
+        {{- $linkURL := print $baseURL ($.Get "dir") "/" .Name | absURL }}<!-- absolute URL to hi-res image -->
         {{- $filetype := index (findRE "[^.]+$" .Name ) 0 }}<!-- file extension of image -->
         {{- $thumb := .Name | replaceRE "\\.[^.]+$" (printf "%s.%s" $thumbext $filetype) }}<!-- filename of thumbnail image -->
-				{{- $thumbexists := where $files "Name" $thumb }}<!-- does a thumbnail image exist? --> 
-				{{- $thumbURL := print $baseURL ($.Get "dir") "/" $thumb | absURL }}<!-- absolute URL to thumbnail image -->
-				<div class="box">
-				  <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
-				    <div class="img" style="background-image: url('{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}');" >
-				      <img itemprop="thumbnail" src="{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}" alt="{{ $caption }}" /><!-- <img> hidden if in .gallery -->
-				    </div>
-			      <figcaption>
-		          <p>{{ $caption }}</p>
-			      </figcaption>
-				    <a href="{{ $linkURL }}" itemprop="contentUrl"></a><!-- put <a> last so it is stacked on top -->
-				  </figure>
-				</div>
-			{{- end }}
-		{{- end }}
-	{{- else -}}
-		<!-- If no directory was specified, include any figure shortcodes called within the gallery -->
-	  {{ .Inner }}
-	{{- end }}
+        {{- $thumbexists := where $files "Name" $thumb }}<!-- does a thumbnail image exist? --> 
+        {{- $thumbURL := print $baseURL ($.Get "dir") "/" $thumb | absURL }}<!-- absolute URL to thumbnail image -->
+        <div class="box">
+          <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+            <div class="img" style="background-image: url('{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}');" >
+              <img itemprop="thumbnail" src="{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}" alt="{{ $caption }}" /><!-- <img> hidden if in .gallery -->
+            </div>
+            <figcaption>
+              <p>{{ $caption }}</p>
+            </figcaption>
+            <a href="{{ $linkURL }}" itemprop="contentUrl"></a><!-- put <a> last so it is stacked on top -->
+          </figure>
+        </div>
+      {{- end }}
+    {{- end }}
+  {{- else -}}
+    <!-- If no directory was specified, include any figure shortcodes called within the gallery -->
+    {{ .Inner }}
+  {{- end }}
 </div>

From 52adf4ffb8bccb09b991ea72009dd2f1889a4de7 Mon Sep 17 00:00:00 2001
From: Bruno Grossniklaus <grossnik@tuvok>
Date: Thu, 11 Jan 2018 08:52:38 +0100
Subject: [PATCH 4/4] fix baseurl issue (relURL)

---
 layouts/shortcodes/figure.html                | 6 +++---
 layouts/shortcodes/gallery.html               | 2 +-
 layouts/shortcodes/load-photoswipe-theme.html | 4 ++--
 layouts/shortcodes/load-photoswipe.html       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 1acb406..8005cab 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -4,17 +4,17 @@
 Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 -->
 <!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{ end }}
+{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="{{ relURL "/css/hugo-easy-gallery.css" }}" />{{ end }}
 {{- $.Page.Scratch.Add "figurecount" 1 -}}
 <!-- use either src or link-thumb for thumbnail image -->
 {{- $filetype := index (findRE "[^.]+$" (.Get "link") ) 0 }}
 {{- $thumb := .Get "src" | default (printf "%s.%s" (replaceRE "\\.[^.]+$" (.Get "thumb") (.Get "link") ) $filetype )  | relURL }}
 <div class="box{{ with .Get "caption-position" }} fancy-figure caption-position-{{.}}{{end}}{{ with .Get "caption-effect" }} caption-effect-{{.}}{{end}}" {{ with .Get "width" }}style="max-width:{{.}}"{{end}}>
   <figure {{ with .Get "class" }}class="{{.}}"{{ end }} itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
-    <div class="img"{{ if .Parent }} style="background-image: url('{{ print .Site.BaseURL $thumb }}');"{{ end }}{{ with .Get "size" }} data-size="{{.}}"{{ end }}>
+    <div class="img"{{ if .Parent }} style="background-image: url('{{ print ($thumb | relURL) }}');"{{ end }}{{ with .Get "size" }} data-size="{{.}}"{{ end }}>
       <img itemprop="thumbnail" src="{{ $thumb }}" {{ with .Get "alt" | default (.Get "caption") }}alt="{{.}}"{{ end }}/><!-- <img> hidden if in .gallery -->
     </div>
-    {{ with .Get "link" | default (.Get "src") }}<a href="{{.}}" itemprop="contentUrl"></a>{{ end }}
+    {{ with .Get "link" | default (.Get "src") }}<a href="{{. | relURL}}" itemprop="contentUrl"></a>{{ end }}
     {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
       <figcaption>
         {{- with .Get "title" }}<h4>{{.}}</h4>{{ end }}
diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html
index 710c6c3..70422e8 100644
--- a/layouts/shortcodes/gallery.html
+++ b/layouts/shortcodes/gallery.html
@@ -3,7 +3,7 @@
 Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 -->
 <!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{ end }}
+{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="{{ relURL "/css/hugo-easy-gallery.css" }}" />{{ end }}
 {{- $.Page.Scratch.Add "figurecount" 1 }}
 {{ $baseURL := .Site.BaseURL }}
 <div class="gallery caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
diff --git a/layouts/shortcodes/load-photoswipe-theme.html b/layouts/shortcodes/load-photoswipe-theme.html
index 4b3bfad..fd444cd 100644
--- a/layouts/shortcodes/load-photoswipe-theme.html
+++ b/layouts/shortcodes/load-photoswipe-theme.html
@@ -14,7 +14,7 @@
 -->
 <!-- these files are loaded in the theme footer
 <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-<script src="/js/load-photoswipe.js"></script>
+<script src="{{.Site.BaseURL}}/js/load-photoswipe.js"></script>
 -->
 
 <!-- Photoswipe css/js libraries -->
@@ -72,4 +72,4 @@
     </div>
     </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/shortcodes/load-photoswipe.html b/layouts/shortcodes/load-photoswipe.html
index 9eec863..dab63b0 100644
--- a/layouts/shortcodes/load-photoswipe.html
+++ b/layouts/shortcodes/load-photoswipe.html
@@ -13,7 +13,7 @@
 - If your template already loads jQuery in the footer, then you could load load-photoswipe.js from the footer instead
 -->
 <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-<script src="/js/load-photoswipe.js"></script>
+<script src="{{.Site.BaseURL}}/js/load-photoswipe.js"></script>
 
 <!-- Photoswipe css/js libraries -->
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe.min.css" integrity="sha256-sCl5PUOGMLfFYctzDW3MtRib0ctyUvI9Qsmq2wXOeBY=" crossorigin="anonymous" />
@@ -68,4 +68,4 @@
     </div>
     </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}