Merge 35e36b7a89 into f31082dec8

2023-10-04 12:38:51 +00:00 · 2023-10-04 12:38:51 +00:00 · b873587e99
parent f31082dec8 35e36b7a89
commit b873587e99
6 changed files with 117 additions and 124 deletions
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@ -12,6 +12,7 @@ autoSwitchAppearance = true
 enableSearch = true
 enableCodeCopy = true
 enableImageLazyLoading = true
+enableWebp = true

 # robots = ""
 fingerprintAlgorithm = "sha256"
--- a/exampleSite/content/samples/markdown/index.md
+++ b/exampleSite/content/samples/markdown/index.md
@ -9,6 +9,10 @@ This article offers a sample of basic Markdown formatting that can be used in Co

 <!--more-->

+## Image
+
+![sample image](thumb-surendran-mp-IhWYiwSxm8g-unsplash.jpg)
+
 ## Headings

 The following HTML `<h1>`—`<h6>` elements represent six levels of section headings. `<h1>` is the highest section level while `<h6>` is the lowest.
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@ -1,64 +1,4 @@
-{{ $url := urls.Parse .Destination }}
-{{ $altText := .Text }}
-{{ $caption := .Title }}
-{{ $lazyLoad := $.Page.Site.Params.enableImageLazyLoading | default true }}
-{{ if findRE "^https?" $url.Scheme }}
-  <figure>
-    <img
-      class="mx-auto my-0 rounded-md"
-      src="{{ $url.String }}"
-      alt="{{ $altText }}" 
-      {{ if $lazyLoad }}
-        loading="lazy"
-      {{ end }}
-    />
-    {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
-  </figure>
-{{ else }}
-  {{ $resource := "" }}
-  {{ if $.Page.Resources.GetMatch ($url.String) }}
-    {{ $resource = $.Page.Resources.GetMatch ($url.String) }}
-  {{ else if resources.GetMatch ($url.String) }}
-    {{ $resource = resources.Get ($url.String) }}
-  {{ end }}
-  {{ with $resource }}
-    <figure>
-      <img
-        class="mx-auto my-0 rounded-md"
-        {{ if eq .MediaType.SubType "svg" }}
-          src="{{ .RelPermalink }}"
-        {{ else }}
-          width="{{ .Width }}"
-          height="{{ .Height }}"
-          {{ if lt .Width 660 }}
-            src="{{ .RelPermalink }}"
-          {{ else }}
-            srcset="
-            {{- (.Resize "330x").RelPermalink }} 330w,
-            {{- (.Resize "660x").RelPermalink }} 660w,
-            {{- (.Resize "1024x").RelPermalink }} 1024w,
-            {{- (.Resize "1320x").RelPermalink }} 2x"
-            src="{{ (.Resize "660x").RelPermalink }}"
-          {{ end }}
-        {{ end }}
-        alt="{{ $altText }}"
-        {{ if $lazyLoad }}
-          loading="lazy"
-        {{ end }}
-      />
-      {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
-    </figure>
-  {{ else }}
-    <figure>
-      <img
-        class="mx-auto my-0 rounded-md"
-        src="{{ $url.String }}"
-        alt="{{ $altText }}"
-        {{ if $lazyLoad }}
-          loading="lazy"
-        {{ end }}
-      />
-      {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
-    </figure>
-  {{ end }}
-{{ end }}
+<figure>
+  {{ partial "picture.html" (dict "context" . "src" .Destination "alt" .Text) }}
+  {{ with .Title }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
+</figure>
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -1,7 +1,8 @@
 {{ define "main" }}
  {{- $images := .Resources.ByType "image" }}
  {{- $cover := $images.GetMatch (.Params.cover | default "*cover*") }}
-  {{- $feature := $images.GetMatch (.Params.feature | default "*feature*") | default $cover }}
+  {{- $feature := (.Params.feature | default "*feature*") | default $cover }}
+  {{- $featureImg := $images.GetMatch $feature }}
  <article>
    <header class="max-w-prose">
      {{ if .Params.showBreadcrumbs | default (.Site.Params.article.showBreadcrumbs | default false) }}
@ -13,27 +14,10 @@
      <div class="mt-8 mb-12 text-base text-neutral-500 dark:text-neutral-400 print:hidden">
        {{ partial "article-meta.html" (dict "context" . "scope" "single") }}
      </div>
-      {{ with $feature }}
+      {{ if $featureImg }}
        <div class="prose">
-          <img
-            class="mb-6 -mt-4 rounded-md"
-            {{ if eq .MediaType.SubType "svg" }}
-              src="{{ .RelPermalink }}"
-            {{ else }}
-              width="{{ .Width }}"
-              height="{{ .Height }}"
-              {{ if lt .Width 660 }}
-                src="{{ .RelPermalink }}"
-              {{ else }}
-                srcset="
-                {{- (.Resize "330x").RelPermalink }} 330w,
-                {{- (.Resize "660x").RelPermalink }} 660w,
-                {{- (.Resize "1024x").RelPermalink }} 1024w,
-                {{- (.Resize "1320x").RelPermalink }} 2x"
-              {{ end }}
-            {{ end }}
-            alt="{{ $.Params.featureAlt | default $.Params.coverAlt | default "" }}"
-          />
+          {{ $alt := $.Params.featureAlt | default $.Params.coverAlt | default "" }}
+          {{ partial "picture.html" (dict "context" . "src" $feature "alt" $alt "class" "mb-6 -mt-4 rounded-md") }}
          {{ with $.Params.coverCaption }}
            <figcaption class="mb-6 -mt-3 text-center">{{ . | markdownify }}</figcaption>
          {{ end }}
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@ -0,0 +1,100 @@
+{{ $url := urls.Parse .src }}
+{{ $altText := .alt }}
+{{ $class := .class | default "mx-auto my-0 rounded-md" }}
+
+{{ $lazyLoad := .context.Page.Site.Params.enableImageLazyLoading | default true }}
+{{ $webp := .context.Page.Site.Params.enableWebp | default true }}
+
+{{ if findRE "^https?" $url.Scheme }}
+  <img
+    class="{{ $class }}"
+    src="{{ $url.String }}"
+    alt="{{ $altText }}" 
+    {{ if $lazyLoad }}
+      loading="lazy"
+    {{ end }}
+  />
+{{ else }}
+  {{ $resource := "" }}
+  {{ if .context.Page.Resources.GetMatch ($url.String) }}
+    {{ $resource = .context.Page.Resources.GetMatch ($url.String) }}
+  {{ else if resources.GetMatch ($url.String) }}
+    {{ $resource = resources.Get ($url.String) }}
+  {{ end }}
+  {{ with $resource }}
+    <picture>
+      {{ if (and (ne .MediaType.SubType "svg") $webp) }}
+        <source 
+          {{ if lt .Width 660 }}
+            {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
+              src="{{ .RelPermalink }}"
+            {{ end }}
+          {{ else }}
+            srcset="
+              {{- (.Resize "330x webp").RelPermalink }} 330w,
+              {{- (.Resize "660x webp").RelPermalink }} 660w,
+              {{- (.Resize "1024x webp").RelPermalink }} 1024w,
+              {{- (.Resize "1320x webp").RelPermalink }} 2x"
+            src="{{ (.Resize "660x webp").RelPermalink }}" 
+          {{ end }}
+          type="image/webp" 
+        />
+      {{ end }}
+      {{ $width := ""}}
+      {{ $height := ""}}
+      {{ if eq .MediaType.SubType "svg" }}
+        {{ $svgContent := $resource.Content }}
+        {{ range (findRESubmatch `width=["']?(\d*)` $svgContent 1) }}
+          {{ $width = index . 1 }}
+        {{ end }}
+        {{ range (findRESubmatch `height=["']?(\d*)` $svgContent 1) }}
+          {{ $height = index . 1 }}
+        {{ end }}
+        {{ if (eq "" $width $height) }}
+          {{ range (findRESubmatch `viewBox=["']?(\d*) (\d*) (\d*) (\d*)` $svgContent 1) }}
+            {{ $width = index . 3 }}
+            {{ $height = index . 4 }}
+          {{ end }}
+        {{ end }}
+      {{ else }}
+        {{ $width = .Width }}
+        {{ $height = .Height }}
+      {{ end}}
+      <img
+        class="{{ $class }}"
+        width="{{ $width }}"
+        height="{{ $height }}"
+        {{ if eq .MediaType.SubType "svg" }}
+          src="{{ .RelPermalink }}"
+        {{ else }}
+          decoding="async"
+          {{ if lt .Width 660 }}
+            src="{{ .RelPermalink }}"
+          {{ else }}
+            srcset="
+            {{- (.Resize "330x").RelPermalink }} 330w,
+            {{- (.Resize "660x").RelPermalink }} 660w,
+            {{- (.Resize "1024x").RelPermalink }} 1024w,
+            {{- (.Resize "1320x").RelPermalink }} 2x"
+            src="{{ (.Resize "660x").RelPermalink }}"
+          {{ end }}
+        {{ end }}
+        alt="{{ $altText }}"
+        {{ if $lazyLoad }}
+          loading="lazy"
+        {{ end }}
+      />
+    </picture>
+  {{ else }}
+    <img
+      class="{{ $class }}"
+      src="{{ $url.String }}"
+      alt="{{ $altText }}"
+      {{ if $lazyLoad }}
+        loading="lazy"
+      {{ end }}
+    />
+  {{ end }}
+{{ end }}
+
+
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@ -1,50 +1,14 @@
 {{ if .Get "default" }}
  {{ template "_internal/shortcodes/figure.html" . }}
 {{ else }}
-  {{ $url := urls.Parse (.Get "src") }}
-  {{ $altText := .Get "alt" }}
+  {{ $src := .Get "src" }}
+  {{ $alt := .Get "alt" }}
  {{ $caption := .Get "caption" }}
  {{ $href := .Get "href" }}
  {{ $class := .Get "class" }}
  <figure{{ with $class }} class="{{ . }}"{{ end }}>
    {{ with $href }}<a href="{{ . }}">{{ end }}
-    <img
-      class="mx-auto my-0 rounded-md"
-      alt="{{ $altText }}"
-      {{ if .Site.Params.enableImageLazyLoading | default true }}
-        loading="lazy"
-      {{ end }}
-      {{ if findRE "^https?" $url.Scheme }}
-        src="{{ $url.String }}"
-      {{ else }}
-        {{ $resource := "" }}
-        {{ if $.Page.Resources.GetMatch ($url.String) }}
-          {{ $resource = $.Page.Resources.GetMatch ($url.String) }}
-        {{ else if resources.GetMatch ($url.String) }}
-          {{ $resource = resources.Get ($url.String) }}
-        {{ end }}
-        {{ with $resource }}
-          {{ if eq .MediaType.SubType "svg" }}
-            src="{{ .RelPermalink }}"
-          {{ else }}
-            width="{{ .Width }}"
-            height="{{ .Height }}"
-            {{ if lt .Width 660 }}
-              src="{{ .RelPermalink }}"
-            {{ else }}
-              srcset="
-              {{- (.Resize "330x").RelPermalink }} 330w,
-              {{- (.Resize "660x").RelPermalink }} 660w,
-              {{- (.Resize "1024x").RelPermalink }} 1024w,
-              {{- (.Resize "1320x").RelPermalink }} 2x"
-              src="{{ (.Resize "660x").RelPermalink }}"
-            {{ end }}
-          {{ end }}
-        {{ else }}
-          src="{{ $url.String }}"
-        {{ end }}
-      {{ end }}
-    />
+    {{ partial "picture.html" (dict "context" . "src" $src "alt" $alt) }}
    {{ with $href }}</a>{{ end }}
    {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
  </figure>