markup/highlight: Add hl_inline option

If set to true, the highlighted code will not be wrapped in any div.

Closes #9442

diff --git a/markup/highlight/config.go b/markup/highlight/config.go
index 1142c5e11476022dbba6fabda3b5a2d836f4d37c..46ef79071a774d6f6bff2827fd12a4553510a19b 100644 (file)
--- a/markup/highlight/config.go
+++ b/markup/highlight/config.go
@@ -72,6 +72,9 @@ type Config struct {
        // A space separated list of line numbers, e.g. “3-8 10-20”.
        Hl_Lines string
 
+       // If set, the markup will not be wrapped in any container.
+       Hl_inline bool
+
        // A parsed and ready to use list of line ranges.
        HL_lines_parsed [][2]int `json:"-"`
 

diff --git a/markup/highlight/highlight.go b/markup/highlight/highlight.go
index 892cb72eed4e96066dc85204eb3ac9012d2bd0c2..7d108ebe134564233394f40f2ee27e3ebad8b769 100644 (file)
--- a/markup/highlight/highlight.go
+++ b/markup/highlight/highlight.go
@@ -75,11 +75,24 @@ func (h chromaHighlighter) Highlight(code, lang string, opts interface{}) (strin
        }
        var b strings.Builder
 
-       if _, _, err := highlight(&b, code, lang, nil, cfg); err != nil {
+       low, high, err := highlight(&b, code, lang, nil, cfg)
+
+       if err != nil {
                return "", err
        }
 
-       return b.String(), nil
+       if !cfg.Hl_inline {
+               return b.String(), nil
+       }
+
+       hr := HightlightResult{
+               highlighted: template.HTML(b.String()),
+               innerLow:    low,
+               innerHigh:   high,
+       }
+
+       return string(hr.Inner()), nil
+
 }
 
 func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts interface{}) (HightlightResult, error) {

diff --git a/markup/highlight/integration_test.go b/markup/highlight/integration_test.go
new file mode 100644 (file)
index 0000000..93d9a1d
--- /dev/null
+++ b/markup/highlight/integration_test.go
@@ -0,0 +1,53 @@
+// Copyright 2022 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package highlight_test
+
+import (
+       "testing"
+
+       "github.com/gohugoio/hugo/hugolib"
+)
+
+func TestHighlightInline(t *testing.T) {
+       t.Parallel()
+
+       files := `
+-- config.toml --
+[markup]
+[markup.highlight]
+codeFences = true
+noClasses = false
+-- content/p1.md --
+---
+title: "p1"
+---
+
+Inline:{{< highlight emacs "hl_inline=true" >}}(message "this highlight shortcode"){{< /highlight >}}:End.
+
+-- layouts/_default/single.html --
+{{ .Content }}
+`
+
+       b := hugolib.NewIntegrationTestBuilder(
+               hugolib.IntegrationTestConfig{
+                       T:           t,
+                       TxtarString: files,
+                       NeedsOsFS:   false,
+               },
+       ).Build()
+
+       b.AssertFileContent("public/p1/index.html", `
+       <p>Inline:<span class="line"><span class="cl"><span class="p">(</span><span class="nf">message</span> <span class="s">&#34;this highlight shortcode&#34;</span><span class="p">)</span></span></span>:End.</p>
+       `)
+}

diff --git a/markup/internal/attributes/attributes.go b/markup/internal/attributes/attributes.go
index a20690c4cc63d4f6e1a3756893439fd5a14807fb..0351bb54ca1cae61aeb83d153e947b416122bbf6 100644 (file)
--- a/markup/internal/attributes/attributes.go
+++ b/markup/internal/attributes/attributes.go
@@ -38,6 +38,7 @@ var chromaHightlightProcessingAttributes = map[string]bool{
        "nohl":               true,
        "style":              true,
        "tabWidth":           true,
+       "hl_inline":          true, // New in 0.94.0.
 }
 
 func init() {