deps: Update Goldmark to v1.1.21

This is the first version of Goldmark that supports all the
Smartypants-style typographic punctuation transformations. Now, a
straight single quote in the middle of a word is translated into a curly
quote (e.g. "that's" becomes "that’s"). Earlier versions leave
them untouched. This brings Goldmark in line with Blackfriday.

Fixes #6571.

diff --git a/go.mod b/go.mod
index a741ed253e49407c19a560baef17a45c8762479b..d99cb010b3b98b6513491db16f81829b1135325b 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -52,7 +52,7 @@ require (
        github.com/spf13/pflag v1.0.5
        github.com/spf13/viper v1.6.1
        github.com/tdewolff/minify/v2 v2.7.0
-       github.com/yuin/goldmark v1.1.20
+       github.com/yuin/goldmark v1.1.21
        github.com/yuin/goldmark-highlighting v0.0.0-20191202084645-78f32c8dd6d5
        go.opencensus.io v0.22.0 // indirect
        gocloud.dev v0.15.0

diff --git a/go.sum b/go.sum
index 75bc08962439dc0e55c3213ff6c3380a8d925e5d..beb3423c46c5db56affb4c12e649fcf19ddf13b9 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -405,6 +405,8 @@ github.com/yuin/goldmark v1.1.18 h1:0Gpa+rpkhzQehagonRrmf0h1IHidn5DfSLM6oUjx5EU=
 github.com/yuin/goldmark v1.1.18/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.20 h1:WZzdEFW2cYKjlc9wvNRh1+t2n7m8h+g0mB0ssg9nzHQ=
 github.com/yuin/goldmark v1.1.20/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.21 h1:3C7Pl/UmcuHHXd5d4olaBZZnh6A/ci78c90rrihLFc8=
+github.com/yuin/goldmark v1.1.21/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark-highlighting v0.0.0-20191202084645-78f32c8dd6d5 h1:QbH7ca1qtgZHrzvcVAEoiJIwBqrXxMOfHYfwZIniIK0=
 github.com/yuin/goldmark-highlighting v0.0.0-20191202084645-78f32c8dd6d5/go.mod h1:4QGn5rJFOASBa2uK4Q2h3BRTyJqRfsAucPFIipSTcaM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index 66439a7a5f71f11c6640f5756458dd581f4c9ee0..9bcfc1fc88e070c1fc38a0e8d4423a5da6a9f040 100644 (file)
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -702,7 +702,7 @@ func TestTableOfContents(t *testing.T) {
 
        p := s.RegularPages()[0]
 
-       checkPageContent(t, p, "<p>For some moments the old man did not reply. He stood with bowed head, buried in deep thought. But at last he spoke.</p><h2 id=\"aa\">AA</h2> <p>I have no idea, of course, how long it took me to reach the limit of the plain, but at last I entered the foothills, following a pretty little canyon upward toward the mountains. Beside me frolicked a laughing brooklet, hurrying upon its noisy way down to the silent sea. In its quieter pools I discovered many small fish, of four-or five-pound weight I should imagine. In appearance, except as to size and color, they were not unlike the whale of our own seas. As I watched them playing about I discovered, not only that they suckled their young, but that at intervals they rose to the surface to breathe as well as to feed upon certain grasses and a strange, scarlet lichen which grew upon the rocks just above the water line.</p><h3 id=\"aaa\">AAA</h3> <p>I remember I felt an extraordinary persuasion that I was being played with, that presently, when I was upon the very verge of safety, this mysterious death&ndash;as swift as the passage of light&ndash;would leap after me from the pit about the cylinder and strike me down. ## BB</p><h3 id=\"bbb\">BBB</h3> <p>&ldquo;You're a great Granser,&rdquo; he cried delightedly, &ldquo;always making believe them little marks mean something.&rdquo;</p>")
+       checkPageContent(t, p, "<p>For some moments the old man did not reply. He stood with bowed head, buried in deep thought. But at last he spoke.</p><h2 id=\"aa\">AA</h2> <p>I have no idea, of course, how long it took me to reach the limit of the plain, but at last I entered the foothills, following a pretty little canyon upward toward the mountains. Beside me frolicked a laughing brooklet, hurrying upon its noisy way down to the silent sea. In its quieter pools I discovered many small fish, of four-or five-pound weight I should imagine. In appearance, except as to size and color, they were not unlike the whale of our own seas. As I watched them playing about I discovered, not only that they suckled their young, but that at intervals they rose to the surface to breathe as well as to feed upon certain grasses and a strange, scarlet lichen which grew upon the rocks just above the water line.</p><h3 id=\"aaa\">AAA</h3> <p>I remember I felt an extraordinary persuasion that I was being played with, that presently, when I was upon the very verge of safety, this mysterious death&ndash;as swift as the passage of light&ndash;would leap after me from the pit about the cylinder and strike me down. ## BB</p><h3 id=\"bbb\">BBB</h3> <p>&ldquo;You&rsquo;re a great Granser,&rdquo; he cried delightedly, &ldquo;always making believe them little marks mean something.&rdquo;</p>")
        checkPageTOC(t, p, "<nav id=\"TableOfContents\">\n  <ul>\n    <li><a href=\"#aa\">AA</a>\n      <ul>\n        <li><a href=\"#aaa\">AAA</a></li>\n        <li><a href=\"#bbb\">BBB</a></li>\n      </ul>\n    </li>\n  </ul>\n</nav>")
 }
 

diff --git a/markup/goldmark/convert_test.go b/markup/goldmark/convert_test.go
index 31799b2a53c58f0960b3d87a251b4d450d1e73d2..7714933fd0e8e67f2b39aa184a656a04f869714c 100644 (file)
--- a/markup/goldmark/convert_test.go
+++ b/markup/goldmark/convert_test.go
@@ -97,6 +97,7 @@ LINE1
 * Straight double "quotes" and single 'quotes' into “curly” quote HTML entities
 * Dashes (“--” and “---”) into en- and em-dash entities
 * Three consecutive dots (“...”) into an ellipsis entity
+* Apostrophes are also converted: "That was back in the '90s, that's a long time ago"
 
 ## Footnotes
 
@@ -153,6 +154,7 @@ description
        c.Assert(got, qt.Contains, `Straight double “quotes” and single ‘quotes’`)
        c.Assert(got, qt.Contains, `Dashes (“–” and “—”) `)
        c.Assert(got, qt.Contains, `Three consecutive dots (“…”)`)
+       c.Assert(got, qt.Contains, `“That was back in the ’90s, that’s a long time ago”`)
        c.Assert(got, qt.Contains, `footnote.<sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup>`)
        c.Assert(got, qt.Contains, `<section class="footnotes" role="doc-endnotes">`)
        c.Assert(got, qt.Contains, `<dt>date</dt>`)