<!--more--><!--more--> exactly, i.e. all lowercase with no whitespace, otherwise it would be treated as regular comment and ignored.
+If there is nothing but spaces and newlines after the summary divider then `.Truncated` will be false.
## Showing Summaries
diff --git a/hugolib/handler_page.go b/hugolib/handler_page.go
index 01c041ffc..a47758f84 100644
--- a/hugolib/handler_page.go
+++ b/hugolib/handler_page.go
@@ -14,7 +14,6 @@
package hugolib
import (
- "bytes"
"fmt"
"github.com/spf13/hugo/helpers"
@@ -127,10 +126,7 @@ func commonConvert(p *Page) HandledResult {
p.workContent = helpers.Emojify(p.workContent)
}
- // We have to replace the with something that survives all the
- // rendering engines.
- // TODO(bep) inline replace
- p.workContent = bytes.Replace(p.workContent, []byte(helpers.SummaryDivider), internalSummaryDivider, 1)
+ p.workContent = p.replaceDivider(p.workContent)
p.workContent = p.renderContent(p.workContent)
return HandledResult{err: nil}
diff --git a/hugolib/page.go b/hugolib/page.go
index f532758d8..6af6a2da5 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -414,6 +414,23 @@ var (
internalSummaryDivider = []byte("HUGOMORE42")
)
+// We have to replace the with something that survives all the
+// rendering engines.
+// TODO(bep) inline replace
+func (p *Page) replaceDivider(content []byte) []byte {
+ sections := bytes.Split(content, helpers.SummaryDivider)
+
+ // If the raw content has nothing but whitespace after the summary
+ // marker then the page shouldn't be marked as truncated. This check
+ // is simplest against the raw content because different markup engines
+ // (rst and asciidoc in particular) add div and p elements after the
+ // summary marker.
+ p.Truncated = (len(sections) == 2 &&
+ len(bytes.Trim(sections[1], " \n\r")) > 0)
+
+ return bytes.Join(sections, internalSummaryDivider)
+}
+
// Returns the page as summary and main if a user defined split is provided.
func (p *Page) setUserDefinedSummaryIfProvided(rawContentCopy []byte) (*summaryContent, error) {
@@ -428,12 +445,6 @@ func (p *Page) setUserDefinedSummaryIfProvided(rawContentCopy []byte) (*summaryC
return nil, nil
}
- p.Truncated = true
- if len(sc.content) < 20 {
- // only whitespace?
- p.Truncated = len(bytes.Trim(sc.content, " \n\r")) > 0
- }
-
p.Summary = helpers.BytesToHTML(sc.summary)
return sc, nil
@@ -441,9 +452,8 @@ func (p *Page) setUserDefinedSummaryIfProvided(rawContentCopy []byte) (*summaryC
// Make this explicit so there is no doubt about what is what.
type summaryContent struct {
- summary []byte
- content []byte
- contentWithoutSummary []byte
+ summary []byte
+ content []byte
}
func splitUserDefinedSummaryAndContent(markup string, c []byte) (sc *summaryContent, err error) {
@@ -467,7 +477,6 @@ func splitUserDefinedSummaryAndContent(markup string, c []byte) (sc *summaryCont
startMarkup []byte
endMarkup []byte
addDiv bool
- divStart = []byte("Summary Same LineHUGOMORE42
-Some more text
`, "Summary Same Line
", "Summary Same Line
\n\nSome more text
", "Some more text
"}, +Some more text
`, "Summary Same Line
", "Summary Same Line
\n\nSome more text
"}, {"asciidoc", `sn
HUGOMORE42Some more text
sn
sn
Some more text
Some more text
sn
Some more text
Summary Next Line
HUGOMORE42Some more text
Summary Next Line
Summary Next Line
Some more text
Some more text
a
b
HUGOMORE42c
", "a
b
", "a
b
c
", "c
"}, - {"markdown", "a
b
cHUGOMORE42
", "a
b
c
", "a
b
c
", ""}, - {"markdown", "a
bHUGOMORE42
c
", "a
b
", "a
b
c
", "c
"}, - {"markdown", "aHUGOMORE42
b
c
", "a
", "a
b
c
", "b
c
"}, - {"markdown", " HUGOMORE42 ", "", "", ""}, - {"markdown", "HUGOMORE42", "", "", ""}, - {"markdown", "HUGOMORE42", "
", "
", ""}, - {"markdown", "HUGOMORE42
", "", "
", "
"}, - {"markdown", "\n\n
HUGOMORE42
\n", "", "", ""}, + "Summary Next Line
Some more text
a
b
HUGOMORE42c
", "a
b
", "a
b
c
"}, + {"markdown", "a
b
cHUGOMORE42
", "a
b
c
", "a
b
c
"}, + {"markdown", "a
bHUGOMORE42
c
", "a
b
", "a
b
c
"}, + {"markdown", "aHUGOMORE42
b
c
", "a
", "a
b
c
"}, + {"markdown", " HUGOMORE42 ", "", ""}, + {"markdown", "HUGOMORE42", "", ""}, + {"markdown", "HUGOMORE42", "
", "
"}, + {"markdown", "HUGOMORE42
", "", "
"}, + {"markdown", "\n\n
HUGOMORE42
\n", "", ""}, // Issue #2586 // Note: Hugo will not split mid-sentence but will look for the closest // paragraph end marker. This may be a change from Hugo 0.16, but it makes sense. {"markdown", `this is an example HUGOMORE42of the issue.
`, "this is an example of the issue.
", - "this is an example of the issue.
", ""}, + "this is an example of the issue.
"}, // Issue: #2538 {"markdown", fmt.Sprintf(`%s
HUGOMORE42%s
`, strings.Repeat("A", 10), strings.Repeat("B", 31)), fmt.Sprintf(`%s
`, strings.Repeat("A", 10)), fmt.Sprintf(`%s
%s
`, strings.Repeat("A", 10), strings.Repeat("B", 31)), - fmt.Sprintf(`%s
`, strings.Repeat("B", 31)), }, } { @@ -714,7 +718,6 @@ func TestSplitSummaryAndContent(t *testing.T) { require.NotNil(t, sc, fmt.Sprintf("[%d] Nil %s", i, this.markup)) require.Equal(t, this.expectedSummary, string(sc.summary), fmt.Sprintf("[%d] Summary markup %s", i, this.markup)) require.Equal(t, this.expectedContent, string(sc.content), fmt.Sprintf("[%d] Content markup %s", i, this.markup)) - require.Equal(t, this.expectedContentWithoutSummary, string(sc.contentWithoutSummary), fmt.Sprintf("[%d] Content without summary, markup %s", i, this.markup)) } } @@ -850,6 +853,16 @@ func TestPageWithMoreTag(t *testing.T) { testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiterSameLine) } +func TestPageWithMoreTagOnlySummary(t *testing.T) { + + assertFunc := func(t *testing.T, ext string, pages Pages) { + p := pages[0] + checkTruncation(t, p, false, "page with summary delimiter at end") + } + + testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiterOnlySummary) +} + func TestPageWithDate(t *testing.T) { t.Parallel() cfg, fs := newTestCfg()