shithub: hugo

Info  •  Files  •  Log  •  Branches

Add support for height argument to figure shortcode

Fixes #4014

--- a/docs/content/content-management/shortcodes.md

+++ b/docs/content/content-management/shortcodes.md

@@ -88,6 +88,7 @@

 * `attr` (i.e., attribution)

 * `attrlink`

 * `alt`

+* `height`

 #### Example `figure` Input

--- a/hugolib/shortcode_test.go

+++ b/hugolib/shortcode_test.go

@@ -299,6 +299,16 @@

 	CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" alt="apple" width="100px" %}}`, "\n<figure class=\"bananas orange\">\n    \n        <img src=\"/found/here\" alt=\"apple\" width=\"100px\" />\n    \n    \n</figure>\n", nil)

 }

+func TestFigureImgHeight(t *testing.T) {

+	t.Parallel()

+	CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" alt="apple" height="100px" %}}`, "\n<figure class=\"bananas orange\">\n    \n        <img src=\"/found/here\" alt=\"apple\" height=\"100px\" />\n    \n    \n</figure>\n", nil)

+}

+

+func TestFigureImgWidthAndHeight(t *testing.T) {

+	t.Parallel()

+	CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" alt="apple" width="50" height="100" %}}`, "\n<figure class=\"bananas orange\">\n    \n        <img src=\"/found/here\" alt=\"apple\" width=\"50\" height=\"100\" />\n    \n    \n</figure>\n", nil)

+}

+

 const testScPlaceholderRegexp = "HAHAHUGOSHORTCODE-\\d+HBHB"

 func TestExtractShortcodes(t *testing.T) {

--- a/tpl/tplimpl/template_embedded.go

+++ b/tpl/tplimpl/template_embedded.go

@@ -21,7 +21,7 @@

 	t.addInternalShortcode("figure.html", `<!-- image -->

 <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>

     {{ with .Get "link"}}<a href="{{.}}">{{ end }}

-        <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" {{ end }}{{ with .Get "width" }}width="{{.}}" {{ end }}/>

+        <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" {{ end }}{{ with .Get "width" }}width="{{.}}" {{ end }}{{ with .Get "height" }}height="{{.}}" {{ end }}/>

     {{ if .Get "link"}}</a>{{ end }}

     {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}

     <figcaption>{{ if isset .Params "title" }}