mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-22 16:16:51 +00:00
Code Issues Releases Wiki Activity

Fix display text separators being recognised as table row separators

Browse Source
This commit is contained in:
bouncepaw 2021-01-10 18:33:36 +05:00
parent 09fa2b0716
commit cec494da30
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
markup/table.go
View File

@ -30,12 +30,18 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
t.pushRow() t.pushRow()
} }
var ( var (
inLink bool
skipNext bool
escaping bool escaping bool
lookingForNonSpace = !t.inMultiline lookingForNonSpace = !t.inMultiline
countingColspan bool countingColspan bool
) )
for i, r := range line { for i, r := range line {
switch { switch {
case skipNext:
skipNext = false
continue
case lookingForNonSpace && unicode.IsSpace(r): case lookingForNonSpace && unicode.IsSpace(r):
case lookingForNonSpace && (r == '!' || r == '|'): case lookingForNonSpace && (r == '!' || r == '|'):
t.currCellMarker = r t.currCellMarker = r
@ -50,6 +56,12 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
case escaping: case escaping:
t.currCellBuilder.WriteRune(r) t.currCellBuilder.WriteRune(r)
case inLink && r == ']' && len(line)-1 > i && line[i+1] == ']':
t.currCellBuilder.WriteString("]]")
inLink = false
skipNext = true
case inLink:
t.currCellBuilder.WriteRune(r)
case t.inMultiline && r == '}': case t.inMultiline && r == '}':
t.inMultiline = false t.inMultiline = false
@ -69,6 +81,10 @@ func (t *Table) Process(line string) (shouldGoBackToNormal bool) {
case r == '{': case r == '{':
t.inMultiline = true t.inMultiline = true
countingColspan = false countingColspan = false
case r == '[' && len(line)-1 > i && line[i+1] == '[':
t.currCellBuilder.WriteString("[[")
inLink = true
skipNext = true
case i == len(line)-1: case i == len(line)-1:
t.pushCell() t.pushCell()
default: default: