michaelh/hugo-academic-mirror
1
0
Fork 0
mirror of https://github.com/gcushen/hugo-academic.git synced 2025-07-26 19:15:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat: enable Figure to be nested within a {{% Markdown shortcode

Browse source 
Based on user request to parse both Markdown and nested HTML shortcodes (Figures) within Callout shortcode: https://discord.com/channels/722225264733716590/742863504515793149/813105748283883570

Uses `{{-` to unindent HTML so that Figure shortcode can be nested within a `{{%` Markdown shortcode, such as Callout, without the HTML being rendered as a Markdown code block. This way we utilise Hugo's HTML in Markdown approach (aka Goldmark `unsafe`) rather than separating HTML from Markdown.

Previously, Figure could only be nested within a `{{<` HTML shortcode.
This commit is contained in:
George Cushen 2021-02-21 21:24:03 +00:00
commit e27cbaca79
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wowchemy/layouts/shortcodes/callout.html
View file

@ -1,5 +1,5 @@
<div class="alert alert-{{ .Get 0 }}"> <div class="alert alert-{{ .Get 0 }}">
<div> <div>
{{ .Inner }} {{ .Inner | markdownify | emojify }}
</div> </div>
</div> </div>

12
wowchemy/layouts/shortcodes/figure.html
View file

@ -1,5 +1,7 @@
{{/* Figure Shortcode for Wowchemy. */}} {{/* Figure Shortcode for Wowchemy. */}}
{{/* Load image from page dir falling back to media library at `assets/media/` and then to remote URI. */}} {{/* Load image from page dir falling back to media library at `assets/media/` and then to remote URI. */}}
{{/* Note: Uses `{{-` to unindent HTML so that Figure shortcode can be nested within a `{{%` Markdown shortcode,
such as Callout, without the HTML being rendered as a Markdown code block. */}}
{{ $destination := .Get "src" }} {{ $destination := .Get "src" }}
{{ $caption := .Get "caption" | default (.Get "title") | default "" }}{{/* Support legacy `title` option. */}} {{ $caption := .Get "caption" | default (.Get "title") | default "" }}{{/* Support legacy `title` option. */}}
@ -16,13 +18,13 @@
{{- if $img -}} {{- if $img -}}
{{ $isSVG := eq $img.MediaType.SubType "svg" }} {{ $isSVG := eq $img.MediaType.SubType "svg" }}
{{ if $isSVG }} {{ if $isSVG -}}
<img alt="{{ $alt }}" <img alt="{{ $alt }}"
src="{{ $img.RelPermalink }}" src="{{ $img.RelPermalink }}"
loading="lazy" loading="lazy"
{{ if $zoom }}data-zoomable{{end}} {{ if $zoom }}data-zoomable{{end}}
{{ with .Get "width" }}width="{{.}}"{{end}} {{ with .Get "height" }}height="{{.}}"{{end}} /> {{ with .Get "width" }}width="{{.}}"{{end}} {{ with .Get "height" }}height="{{.}}"{{end}} />
{{ else }} {{- else }}
{{- $img_lg := $img.Fit "1200x1200" -}} {{- $img_lg := $img.Fit "1200x1200" -}}
{{- $img_md := $img_lg.Fit "760x760" -}}{{/* Match `.docs-article-container` max-width */}} {{- $img_md := $img_lg.Fit "760x760" -}}{{/* Match `.docs-article-container` max-width */}}
{{- $img_sm := $img_md.Fit "400x400" -}} {{- $img_sm := $img_md.Fit "400x400" -}}
@ -37,7 +39,7 @@
height="{{ $height }}" height="{{ $height }}"
loading="lazy" loading="lazy"
{{ if $zoom }}data-zoomable{{end}} /> {{ if $zoom }}data-zoomable{{end}} />
{{ end }} {{- end }}
{{- else -}} {{- else -}}
<img src="{{ $destination | safeURL }}" alt="{{ $alt }}" loading="lazy" {{ if $zoom }}data-zoomable{{end}} <img src="{{ $destination | safeURL }}" alt="{{ $alt }}" loading="lazy" {{ if $zoom }}data-zoomable{{end}}
{{ with .Get "width" }}width="{{.}}"{{end}} {{ with .Get "height" }}height="{{.}}"{{end}} /> {{ with .Get "width" }}width="{{.}}"{{end}} {{ with .Get "height" }}height="{{.}}"{{end}} />
@ -45,9 +47,9 @@
{{ if $caption }} {{ if $caption }}
{{/* Localize the figure numbering (if enabled). */}} {{/* Localize the figure numbering (if enabled). */}}
{{ $figure := split (i18n "figure" | default "Figure %d:") "%d" }} {{- $figure := split (i18n "figure" | default "Figure %d:") "%d" -}}
<figcaption{{ if eq (.Get "numbered") "true" }} data-pre="{{- trim (index $figure 0) " " -}}&nbsp;" data-post="{{ index $figure 1 }}&nbsp;" class="numbered"{{ end }}> <figcaption{{ if eq (.Get "numbered") "true" }} data-pre="{{- trim (index $figure 0) " " -}}&nbsp;" data-post="{{ index $figure 1 }}&nbsp;" class="numbered"{{ end }}>
{{ $caption | markdownify | emojify }} {{ $caption | markdownify | emojify }}
</figcaption> </figcaption>
{{ end }} {{- end -}}
</figure> </figure>