Update vendor (#1414)

1 files changed, 28 insertions, 3 deletions

diff --git a/vendor/github.com/gomarkdown/markdown/parser/block.go b/vendor/github.com/gomarkdown/markdown/parser/block.go
index 5ef55e98..cec667b5 100644
--- a/vendor/github.com/gomarkdown/markdown/parser/block.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/block.go
@@ -1204,7 +1204,9 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 	}
 
 	n := len(data)
+	colspans := 0 // keep track of total colspan in this row.
 	for col = 0; col < len(columns) && i < n; col++ {
+		colspan := 0
 		for i < n && data[i] == ' ' {
 			i++
 		}
@@ -1218,7 +1220,15 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 		cellEnd := i
 
 		// skip the end-of-cell marker, possibly taking us past end of buffer
-		i++
+		// each _extra_ | means a colspan
+		for data[i] == '|' && !isBackslashEscaped(data, i) {
+			i++
+			colspan++
+		}
+		// only colspan > 1 make sense.
+		if colspan < 2 {
+			colspan = 0
+		}
 
 		for cellEnd > cellStart && cellEnd-1 < n && data[cellEnd-1] == ' ' {
 			cellEnd--
@@ -1227,9 +1237,19 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 		block := &ast.TableCell{
 			IsHeader: header,
 			Align:    columns[col],
+			ColSpan:  colspan,
 		}
 		block.Content = data[cellStart:cellEnd]
-		p.addBlock(block)
+		if cellStart == cellEnd && colspans > 0 {
+			// an empty cell that we should ignore, it exists because of colspan
+			colspans--
+		} else {
+			p.addBlock(block)
+		}
+
+		if colspan > 0 {
+			colspans += colspan - 1
+		}
 	}
 
 	// pad it out with empty columns to get the right number
@@ -1247,7 +1267,12 @@ func (p *Parser) tableRow(data []byte, columns []ast.CellAlignFlags, header bool
 // tableFooter parses the (optional) table footer.
 func (p *Parser) tableFooter(data []byte) bool {
 	colCount := 1
-	for i := 0; i < len(data) && data[i] != '\n'; i++ {
+	i := 0
+	n := len(data)
+	for i < 3 && i < n && data[i] == ' ' { // ignore up to 3 spaces
+		i++
+	}
+	for ; i < n && data[i] != '\n'; i++ {
 		if data[i] == '|' && !isBackslashEscaped(data, i) {
 			colCount++
 			continue