summaryrefslogtreecommitdiffstats
path: root/markup/markup.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-17 13:04:00 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-24 18:59:50 +0100
commit08fdca9d9365eaf1e496a12e2af5e18617bd0e66 (patch)
tree6c6942d1b74a4160d93a997860bafd52b92025f5 /markup/markup.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 'markup/markup.go')
-rw-r--r--markup/markup.go13
1 files changed, 5 insertions, 8 deletions
diff --git a/markup/markup.go b/markup/markup.go
index 287db7369..13e5f3042 100644
--- a/markup/markup.go
+++ b/markup/markup.go
@@ -39,11 +39,8 @@ func NewConverterProvider(cfg converter.ProviderConfig) (ConverterProvider, erro
return nil, err
}
- if cfg.Highlight == nil {
- h := highlight.New(markupConfig.Highlight)
- cfg.Highlight = func(code, lang, optsStr string) (string, error) {
- return h.Highlight(code, lang, optsStr)
- }
+ if cfg.Highlighter == nil {
+ cfg.Highlighter = highlight.New(markupConfig.Highlight)
}
cfg.MarkupConfig = markupConfig
@@ -95,7 +92,7 @@ type ConverterProvider interface {
Get(name string) converter.Provider
// Default() converter.Provider
GetMarkupConfig() markup_config.Config
- Highlight(code, lang, optsStr string) (string, error)
+ GetHighlighter() highlight.Highlighter
}
type converterRegistry struct {
@@ -112,8 +109,8 @@ func (r *converterRegistry) Get(name string) converter.Provider {
return r.converters[strings.ToLower(name)]
}
-func (r *converterRegistry) Highlight(code, lang, optsStr string) (string, error) {
- return r.config.Highlight(code, lang, optsStr)
+func (r *converterRegistry) GetHighlighter() highlight.Highlighter {
+ return r.config.Highlighter
}
func (r *converterRegistry) GetMarkupConfig() markup_config.Config {