Merge 618a3a3014 into f31082dec8

Improve extraction of SVG dimensions
2023-10-05 09:51:15 +00:00 · 2023-10-05 11:51:06 +02:00
1 changed files with 6 additions and 6 deletions
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@ -44,14 +44,14 @@
      {{ $height := ""}}
      {{ if eq .MediaType.SubType "svg" }}
        {{ $svgContent := $resource.Content }}
-        {{ range (findRESubmatch `width=["']?(\d*)` $svgContent 1) }}
+        {{ range (findRESubmatch `<svg[^>]*width=["']([.0-9]*)["'a-zA-Z]` $svgContent 1) }}
          {{ $width = index . 1 }}
        {{ end }}
-        {{ range (findRESubmatch `height=["']?(\d*)` $svgContent 1) }}
+        {{ range (findRESubmatch `<svg[^>]*height=["']([.0-9]*)["'a-zA-Z]` $svgContent 1) }}
          {{ $height = index . 1 }}
        {{ end }}
        {{ if (eq "" $width $height) }}
-          {{ range (findRESubmatch `viewBox=["']?(\d*) (\d*) (\d*) (\d*)` $svgContent 1) }}
+        {{ range (findRESubmatch `<svg[^>]*viewBox=["']?([.0-9]*) ([.0-9]*) ([.0-9]*) ([.0-9]*)` $svgContent 1) }}
          {{ $width = index . 3 }}
          {{ $height = index . 4 }}
        {{ end }}
Author	SHA1	Message	Date
stereobooster	3f12b1344b	Merge `618a3a3014` into `f31082dec8`	2023-10-05 09:51:15 +00:00
stereobooster	618a3a3014	Improve extraction of SVG dimensions	2023-10-05 11:51:06 +02:00