StarMirror/blackfriday
1
0
Fork 0
mirror of https://github.com/russross/blackfriday.git synced 2024-03-22 13:40:34 +08:00
Code Issues Projects Releases Wiki Activity

Remove a couple calls to Truncate() from parser

Browse Source 
Link parser used to truncate in two cases: when parsing image links and
inline footnotes. In order to avoid this truncation, introduce a
separate callback for each of these cases and avoid writing extra
characters instead of truncating them after the fact.
This commit is contained in:
Vytautas Šaltenis 2015-10-26 20:47:20 +02:00
parent 29f02f7d01
commit ef087889f4
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
inline.go
View File

@ -198,6 +198,20 @@ func isReferenceStyleLink(data []byte, pos int, t linkType) bool {
return pos < len(data)-1 && data[pos] == '[' && data[pos+1] != '^'
}
func maybeImage(p *parser, out *bytes.Buffer, data []byte, offset int) int {
if offset < len(data)-1 && data[offset+1] == '[' {
return link(p, out, data, offset)
}
return 0
}
func maybeInlineFootnote(p *parser, out *bytes.Buffer, data []byte, offset int) int {
if offset < len(data)-1 && data[offset+1] == '[' {
return link(p, out, data, offset)
}
return 0
}
// '[': parse a link or an image or a footnote
func link(p *parser, out *bytes.Buffer, data []byte, offset int) int {
// no links allowed inside regular links, footnote, and deferred footnotes
@ -212,13 +226,15 @@ func link(p *parser, out *bytes.Buffer, data []byte, offset int) int {
case p.flags&Footnotes != 0 && len(data)-1 > offset && data[offset+1] == '^':
t = linkDeferredFootnote
// ![alt] == image
case offset > 0 && data[offset-1] == '!':
case offset >= 0 && data[offset] == '!':
t = linkImg
offset += 1
// ^[text] == inline footnote
// [^refId] == deferred footnote
case p.flags&Footnotes != 0:
if offset > 0 && data[offset-1] == '^' {
if offset >= 0 && data[offset] == '^' {
t = linkInlineFootnote
offset += 1
} else if len(data)-1 > offset && data[offset+1] == '^' {
t = linkDeferredFootnote
}
@ -533,22 +549,12 @@ func link(p *parser, out *bytes.Buffer, data []byte, offset int) int {
}
case linkImg:
outSize := out.Len()
outBytes := out.Bytes()
if outSize > 0 && outBytes[outSize-1] == '!' {
out.Truncate(outSize - 1)
}
p.r.Image(out, uLink, title, content.Bytes())
i += 1
case linkInlineFootnote:
outSize := out.Len()
outBytes := out.Bytes()
if outSize > 0 && outBytes[outSize-1] == '^' {
out.Truncate(outSize - 1)
}
p.r.FootnoteRef(out, link, noteId)
i += 1
case linkDeferredFootnote:
p.r.FootnoteRef(out, link, noteId)

2
markdown.go
View File

@ -374,6 +374,8 @@ func MarkdownOptions(input []byte, renderer Renderer, opts Options) []byte {
p.inlineCallback['<'] = leftAngle
p.inlineCallback['\\'] = escape
p.inlineCallback['&'] = entity
p.inlineCallback['!'] = maybeImage
p.inlineCallback['^'] = maybeInlineFootnote
if extensions&Autolink != 0 {
p.inlineCallback[':'] = autoLink