mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-16 20:53:59 +02:00
markdown: Pass emoji codes to yuin/goldmark-emoji
Removes emoji code conversion from the page and shortcode parsers. Emoji codes in markdown are now passed to Goldmark, where the goldmark-emoji extension converts them to decimal numeric character references. This disables emoji rendering for the alternate content formats: html, asciidoc, org, pandoc, and rst. Fixes #7332 Fixes #11587 Closes #11598
This commit is contained in:
@@ -61,9 +61,7 @@ func (l *pageLexer) Input() []byte {
|
||||
return l.input
|
||||
}
|
||||
|
||||
type Config struct {
|
||||
EnableEmoji bool
|
||||
}
|
||||
type Config struct{}
|
||||
|
||||
// note: the input position here is normally 0 (start), but
|
||||
// can be set if position of first shortcode is known
|
||||
@@ -103,8 +101,6 @@ var (
|
||||
delimOrg = []byte("#+")
|
||||
htmlCommentStart = []byte("<!--")
|
||||
htmlCommentEnd = []byte("-->")
|
||||
|
||||
emojiDelim = byte(':')
|
||||
)
|
||||
|
||||
func (l *pageLexer) next() rune {
|
||||
@@ -276,34 +272,6 @@ func (l *pageLexer) consumeSpace() {
|
||||
}
|
||||
}
|
||||
|
||||
// lex a string starting at ":"
|
||||
func lexEmoji(l *pageLexer) stateFunc {
|
||||
pos := l.pos + 1
|
||||
valid := false
|
||||
|
||||
for i := pos; i < len(l.input); i++ {
|
||||
if i > pos && l.input[i] == emojiDelim {
|
||||
pos = i + 1
|
||||
valid = true
|
||||
break
|
||||
}
|
||||
r, _ := utf8.DecodeRune(l.input[i:])
|
||||
if !(isAlphaNumericOrHyphen(r) || r == '+') {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if valid {
|
||||
l.pos = pos
|
||||
l.emit(TypeEmoji)
|
||||
} else {
|
||||
l.pos++
|
||||
l.emit(tText)
|
||||
}
|
||||
|
||||
return lexMainSection
|
||||
}
|
||||
|
||||
type sectionHandlers struct {
|
||||
l *pageLexer
|
||||
|
||||
@@ -399,20 +367,6 @@ func createSectionHandlers(l *pageLexer) *sectionHandlers {
|
||||
|
||||
handlers := []*sectionHandler{shortCodeHandler, summaryDividerHandler}
|
||||
|
||||
if l.cfg.EnableEmoji {
|
||||
emojiHandler := §ionHandler{
|
||||
l: l,
|
||||
skipFunc: func(l *pageLexer) int {
|
||||
return l.indexByte(emojiDelim)
|
||||
},
|
||||
lexFunc: func(origin stateFunc, l *pageLexer) (stateFunc, bool) {
|
||||
return lexEmoji, true
|
||||
},
|
||||
}
|
||||
|
||||
handlers = append(handlers, emojiHandler)
|
||||
}
|
||||
|
||||
return §ionHandlers{
|
||||
l: l,
|
||||
handlers: handlers,
|
||||
|
Reference in New Issue
Block a user