Support complex revision tables in overlay

asciidoc/overlay/overlay.go

@@ -123,17 +123,17 @@ func preparseFile(cxt OverlayContext, pps *overlayFileState, d *asciidoc.Documen
 			}
 			remove = true
 		case *asciidoc.IfDef:
-			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el})
+			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el, addToCell: addToCell})
 			suppress = suppress || !el.Eval(pps)
 			remove = true
-			addToCell = el.Inline
+			addToCell = el.Inline || isContentIfDef(parent, index)
 		case *asciidoc.IfNDef:
-			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el})
+			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el, addToCell: addToCell})
 			suppress = suppress || !el.Eval(pps)
 			remove = true
-			addToCell = el.Inline
+			addToCell = el.Inline || isContentIfDef(parent, index)
 		case *asciidoc.IfEval:
-			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el})
+			suppressStack.Push(&conditionalBlock{suppress: suppress, open: el, addToCell: addToCell})
 			if !suppress {
 				var include bool
 				include, err = el.Eval(pps)
@@ -144,7 +144,7 @@ func preparseFile(cxt OverlayContext, pps *overlayFileState, d *asciidoc.Documen
 				suppress = !include
 			}
 			remove = true
-			addToCell = el.Inline
+			addToCell = el.Inline || isContentIfDef(parent, index)
 		case *asciidoc.IfDefBlock, *asciidoc.IfNDefBlock, *asciidoc.IfEvalBlock:
 			err = fmt.Errorf("unexpected type in preparse: %T", el)
 			should = parse.SearchShouldStop
@@ -163,7 +163,7 @@ func preparseFile(cxt OverlayContext, pps *overlayFileState, d *asciidoc.Documen
 			}
 			suppress = cb.suppress
 			remove = true
-			addToCell = false
+			addToCell = cb.addToCell
 		case *asciidoc.InlineIfDef:
 			if !suppress {
 				if el.Eval(pps) {
@@ -365,3 +365,26 @@ func parseLevelOffset(el asciidoc.Parent, elements asciidoc.Elements) (leveloffs
 	leveloffset, relative, err = text.ParseRelativeNumber(val)
 	return
 }
+
+func isContentIfDef(parent asciidoc.ParentElement, index int) bool {
+	if _, ok := parent.(*asciidoc.Table); !ok {
+		return false
+	}
+	children := parent.Children()
+	depth := 0
+	for i := index + 1; i < len(children); i++ {
+		child := children[i]
+		switch child.(type) {
+		case *asciidoc.IfDef, *asciidoc.IfNDef, *asciidoc.IfEval:
+			depth++
+		case *asciidoc.EndIf:
+			if depth == 0 {
+				return true
+			}
+			depth--
+		case *asciidoc.TableRow:
+			return false
+		}
+	}
+	return false
+}

asciidoc/overlay/state.go

@@ -7,8 +7,9 @@ import (
 )
 
 type conditionalBlock struct {
-	open     asciidoc.Element
-	suppress bool
+	open      asciidoc.Element
+	suppress  bool
+	addToCell bool
 }
 
 type overlayState struct {

matter/spec/table_info.go

@@ -178,9 +178,6 @@ func (ti *TableInfo) ReadValue(reader asciidoc.Reader, row *asciidoc.TableRow, c
 func (ti *TableInfo) ReadValueByIndex(reader asciidoc.Reader, row *asciidoc.TableRow, offset int) (string, error) {
 	cell := row.Cell(offset)
 	cellElements := reader.Children(cell)
-	if len(cellElements) == 0 {
-		return "", nil
-	}
 	var value strings.Builder
 	err := readRowCellValueElements(reader, row, cell, cellElements, &value)
 	if err != nil {