Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-17 15:04:00 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-24 20:59:50 +0300
commit08fdca9d9365eaf1e496a12e2af5e18617bd0e66 (patch)
tree6c6942d1b74a4160d93a997860bafd52b92025f5 /hugolib/page.go
parent2c20f5bc00b604e72b3b7e401fbdbf9447fe3470 (diff)
Add Markdown diagrams and render hooks for code blocks
You can now create custom hook templates for code blocks, either one for all (`render-codeblock.html`) or for a given code language (e.g. `render-codeblock-go.html`). We also used this new hook to add support for diagrams in Hugo: * Goat (Go ASCII Tool) is built-in and enabled by default; just create a fenced code block with the language `goat` and start draw your Ascii diagrams. * Another popular alternative for diagrams in Markdown, Mermaid (supported by GitHub), can also be implemented with a simple template. See the Hugo documentation for more information. Updates #7765 Closes #9538 Fixes #9553 Fixes #8520 Fixes #6702 Fixes #9558
Diffstat (limited to 'hugolib/page.go')
-rw-r--r--hugolib/page.go64
1 files changed, 11 insertions, 53 deletions
diff --git a/hugolib/page.go b/hugolib/page.go
index 83b654cc0..7101af814 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -22,6 +22,8 @@ import (
"sort"
"strings"
+ "go.uber.org/atomic"
+
"github.com/gohugoio/hugo/identity"
"github.com/gohugoio/hugo/markup/converter"
@@ -47,7 +49,6 @@ import (
"github.com/gohugoio/hugo/common/collections"
"github.com/gohugoio/hugo/common/text"
- "github.com/gohugoio/hugo/markup/converter/hooks"
"github.com/gohugoio/hugo/resources"
"github.com/gohugoio/hugo/resources/page"
"github.com/gohugoio/hugo/resources/resource"
@@ -118,6 +119,9 @@ type pageState struct {
// formats (for all sites).
pageOutputs []*pageOutput
+ // Used to determine if we can reuse content across output formats.
+ pageOutputTemplateVariationsState *atomic.Uint32
+
// This will be shifted out when we start to render a new output format.
*pageOutput
@@ -125,6 +129,10 @@ type pageState struct {
*pageCommon
}
+func (p *pageState) reusePageOutputContent() bool {
+ return p.pageOutputTemplateVariationsState.Load() == 1
+}
+
func (p *pageState) Err() error {
return nil
}
@@ -394,56 +402,6 @@ func (ps *pageState) initCommonProviders(pp pagePaths) error {
return nil
}
-func (p *pageState) createRenderHooks(f output.Format) (hooks.Renderers, error) {
- layoutDescriptor := p.getLayoutDescriptor()
- layoutDescriptor.RenderingHook = true
- layoutDescriptor.LayoutOverride = false
- layoutDescriptor.Layout = ""
-
- var renderers hooks.Renderers
-
- layoutDescriptor.Kind = "render-link"
- templ, templFound, err := p.s.Tmpl().LookupLayout(layoutDescriptor, f)
- if err != nil {
- return renderers, err
- }
- if templFound {
- renderers.LinkRenderer = hookRenderer{
- templateHandler: p.s.Tmpl(),
- SearchProvider: templ.(identity.SearchProvider),
- templ: templ,
- }
- }
-
- layoutDescriptor.Kind = "render-image"
- templ, templFound, err = p.s.Tmpl().LookupLayout(layoutDescriptor, f)
- if err != nil {
- return renderers, err
- }
- if templFound {
- renderers.ImageRenderer = hookRenderer{
- templateHandler: p.s.Tmpl(),
- SearchProvider: templ.(identity.SearchProvider),
- templ: templ,
- }
- }
-
- layoutDescriptor.Kind = "render-heading"
- templ, templFound, err = p.s.Tmpl().LookupLayout(layoutDescriptor, f)
- if err != nil {
- return renderers, err
- }
- if templFound {
- renderers.HeadingRenderer = hookRenderer{
- templateHandler: p.s.Tmpl(),
- SearchProvider: templ.(identity.SearchProvider),
- templ: templ,
- }
- }
-
- return renderers, nil
-}
-
func (p *pageState) getLayoutDescriptor() output.LayoutDescriptor {
p.layoutDescriptorInit.Do(func() {
var section string
@@ -867,7 +825,7 @@ func (p *pageState) shiftToOutputFormat(isRenderingSite bool, idx int) error {
if isRenderingSite {
cp := p.pageOutput.cp
- if cp == nil {
+ if cp == nil && p.reusePageOutputContent() {
// Look for content to reuse.
for i := 0; i < len(p.pageOutputs); i++ {
if i == idx {
@@ -875,7 +833,7 @@ func (p *pageState) shiftToOutputFormat(isRenderingSite bool, idx int) error {
}
po := p.pageOutputs[i]
- if po.cp != nil && po.cp.reuse {
+ if po.cp != nil {
cp = po.cp
break
}