danog/blackfriday
1
0
Fork 0
mirror of https://github.com/danog/blackfriday.git synced 2024-11-26 20:14:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove callback from List renderer event

Browse Source 
Split List into two events: BeginList and EndList, removing the need for
callback.
This commit is contained in:
Vytautas Šaltenis 2015-10-26 20:32:33 +02:00
parent 82be6cab6d
commit af1b26fa04
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block.go
View File

@ -1050,19 +1050,18 @@ func (p *parser) dliPrefix(data []byte) int {
func (p *parser) list(out *bytes.Buffer, data []byte, flags ListType) int {
i := 0
flags |= ListItemBeginningOfList
work := func() {
for i < len(data) {
skip := p.listItem(out, data[i:], &flags)
i += skip
p.r.BeginList(out, flags)
if skip == 0 || flags&ListItemEndOfList != 0 {
break
}
flags &= ^ListItemBeginningOfList
for i < len(data) {
skip := p.listItem(out, data[i:], &flags)
i += skip
if skip == 0 || flags&ListItemEndOfList != 0 {
break
}
flags &= ^ListItemBeginningOfList
}
p.r.List(out, work, flags)
p.r.EndList(out, flags)
return i
}

10
html.go
View File

@ -345,7 +345,9 @@ func (options *Html) TableCell(out *bytes.Buffer, text []byte, align int) {
func (options *Html) Footnotes(out *bytes.Buffer, text func()) {
out.WriteString("<div class=\"footnotes\">\n")
options.HRule(out)
options.List(out, text, ListTypeOrdered)
options.BeginList(out, ListTypeOrdered)
text()
options.EndList(out, ListTypeOrdered)
out.WriteString("</div>\n")
}
@ -372,7 +374,7 @@ func (options *Html) FootnoteItem(out *bytes.Buffer, name, text []byte, flags Li
out.WriteString("</li>\n")
}
func (options *Html) List(out *bytes.Buffer, text func(), flags ListType) {
func (options *Html) BeginList(out *bytes.Buffer, flags ListType) {
doubleSpace(out)
if flags&ListTypeDefinition != 0 {
@ -382,7 +384,9 @@ func (options *Html) List(out *bytes.Buffer, text func(), flags ListType) {
} else {
out.WriteString("<ul>")
}
text()
}
func (r *Html) EndList(out *bytes.Buffer, flags ListType) {
if flags&ListTypeDefinition != 0 {
out.WriteString("</dl>\n")
} else if flags&ListTypeOrdered != 0 {

6
latex.go
View File

@ -98,13 +98,15 @@ func (options *Latex) HRule(out *bytes.Buffer) {
out.WriteString("\n\\HRule\n")
}
func (options *Latex) List(out *bytes.Buffer, text func(), flags ListType) {
func (r *Latex) BeginList(out *bytes.Buffer, flags ListType) {
if flags&ListTypeOrdered != 0 {
out.WriteString("\n\\begin{enumerate}\n")
} else {
out.WriteString("\n\\begin{itemize}\n")
}
text()
}
func (r *Latex) EndList(out *bytes.Buffer, flags ListType) {
if flags&ListTypeOrdered != 0 {
out.WriteString("\n\\end{enumerate}\n")
} else {

3
markdown.go
View File

@ -166,7 +166,8 @@ type Renderer interface {
BeginHeader(out *bytes.Buffer, level int, id string) int
EndHeader(out *bytes.Buffer, level int, id string, tocMarker int)
HRule(out *bytes.Buffer)
List(out *bytes.Buffer, text func(), flags ListType)
BeginList(out *bytes.Buffer, flags ListType)
EndList(out *bytes.Buffer, flags ListType)
ListItem(out *bytes.Buffer, text []byte, flags ListType)
Paragraph(out *bytes.Buffer, text func())
Table(out *bytes.Buffer, header []byte, body []byte, columnData []int)