From: Bjørn Erik Pedersen Date: Sun, 27 Feb 2022 12:36:58 +0000 (+0100) Subject: tpl/diagrams: Rename Body to Inner X-Git-Tag: v0.93.0~9 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5f671515504b56d7d1906fa2d17e72de49d84437;p=brevno-suite%2Fhugo tpl/diagrams: Rename Body to Inner This relates to #9577 – there's no concept a body element in SVG, so we might as well use an exsisting "Hugo term". --- diff --git a/tpl/diagrams/diagrams.go b/tpl/diagrams/diagrams.go index 1bdbc2a0..b0ddf5a4 100644 --- a/tpl/diagrams/diagrams.go +++ b/tpl/diagrams/diagrams.go @@ -25,9 +25,17 @@ import ( ) type SVGDiagram interface { - Body() template.HTML + // Inner returns the inner markup of the SVG. + // This allows for the container to be created manually. + Inner() template.HTML + + // SVG returns the diagram as an SVG, including the container. SVG() template.HTML + + // Width returns the width of the SVG. Width() int + + // Height returns the height of the SVG. Height() int } @@ -35,7 +43,7 @@ type goatDiagram struct { d goat.SVG } -func (d goatDiagram) Body() template.HTML { +func (d goatDiagram) Inner() template.HTML { return template.HTML(d.d.Body) } diff --git a/tpl/tplimpl/embedded/templates/_default/_markup/render-codeblock-goat.html b/tpl/tplimpl/embedded/templates/_default/_markup/render-codeblock-goat.html index f23fa046..35ec0b30 100644 --- a/tpl/tplimpl/embedded/templates/_default/_markup/render-codeblock-goat.html +++ b/tpl/tplimpl/embedded/templates/_default/_markup/render-codeblock-goat.html @@ -12,7 +12,7 @@ {{ else }} viewBox="0 0 {{ .Width }} {{ .Height }}" {{ end }}> - {{ .Body }} + {{ .Inner }} {{ end }}