Merge branch 'table-spans' of https://github.com/utzig/breathe

#642

breathe/parser/compound.py

@@ -704,8 +704,8 @@ class docEntryTypeSub(supermod.docEntryType):
 
     node_type = "docentry"
 
-    def __init__(self, thead=None, para=None):
-        supermod.docEntryType.__init__(self, thead, para)
+    def __init__(self, thead=None, align=None, rowspan=None, colspan=None, para=None):
+        supermod.docEntryType.__init__(self, thead, align, rowspan, colspan, para)
 
 
 supermod.docEntryType.subclass = docEntryTypeSub

breathe/parser/compoundsuper.py

@@ -4641,8 +4641,11 @@ def buildChildren(self, child_, nodeName_):
 class docEntryType(GeneratedsSuper):
     subclass = None
     superclass = None
-    def __init__(self, thead=None, para=None):
+    def __init__(self, thead=None, align=None, rowspan=None, colspan=None, para=None):
         self.thead = thead
+        self.align = align
+        self.rowspan = rowspan
+        self.colspan = colspan
         if para is None:
             self.para = []
         else:
@@ -4659,6 +4662,12 @@ def add_para(self, value): self.para.append(value)
     def insert_para(self, index, value): self.para[index] = value
     def get_thead(self): return self.thead
     def set_thead(self, thead): self.thead = thead
+    def get_align(self): return self.align
+    def set_align(self, align): self.align = align
+    def get_rowspan(self): return self.rowspan
+    def set_rowspan(self, rowspan): self.rowspan = rowspan
+    def get_colspan(self): return self.colspan
+    def set_colspan(self, colspan): self.colspan = colspan
     def export(self, outfile, level, namespace_='', name_='docEntryType', namespacedef_=''):
         showIndent(outfile, level)
         outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, ))
@@ -4673,6 +4682,12 @@ def export(self, outfile, level, namespace_='', name_='docEntryType', namespaced
     def exportAttributes(self, outfile, level, namespace_='', name_='docEntryType'):
         if self.thead is not None:
             outfile.write(' thead=%s' % (quote_attrib(self.thead), ))
+        if self.align is not None:
+            outfile.write(' align=%s' % (quote_attrib(self.align), ))
+        if self.rowspan is not None:
+            outfile.write(' rowspan=%s' % (quote_attrib(self.rowspan), ))
+        if self.colspan is not None:
+            outfile.write(' colspan=%s' % (quote_attrib(self.colspan), ))
     def exportChildren(self, outfile, level, namespace_='', name_='docEntryType'):
         for para_ in self.para:
             para_.export(outfile, level, namespace_, name_='para')
@@ -4692,6 +4707,12 @@ def build(self, node_):
     def buildAttributes(self, attrs):
         if attrs.get('thead'):
             self.thead = attrs.get('thead').value
+        if attrs.get('align'):
+            self.align = attrs.get('align').value
+        if attrs.get('rowspan'):
+            self.rowspan = attrs.get('rowspan').value
+        if attrs.get('colspan'):
+            self.colspan = attrs.get('colspan').value
     def buildChildren(self, child_, nodeName_):
         if child_.nodeType == Node.ELEMENT_NODE and \
             nodeName_ == 'para':

breathe/renderer/sphinxrenderer.py

@@ -1666,6 +1666,10 @@ def visit_docentry(self, node) -> List[Node]:
         col += self.render_iterable(node.para)
         if node.thead == 'yes':
             col['heading'] = True
+        if node.rowspan:
+            col['morerows'] = int(node.rowspan) - 1
+        if node.colspan:
+            col['morecols'] = int(node.colspan) - 1
         return [col]
 
     def visit_docrow(self, node) -> List[Node]:
@@ -1688,7 +1692,26 @@ def visit_doctable(self, node) -> List[Node]:
             colspec.attributes['colwidth'] = 'auto'
             tgroup += colspec
         table += tgroup
-        tgroup += self.render_iterable(node.row)
+        rows = self.render_iterable(node.row)
+
+        # this code depends on visit_docrow(), and expects the same elements used to
+        # "envelop" rows there, namely thead and tbody (eg it will need to be updated
+        # if Doxygen one day adds support for tfoot)
+
+        tags = {row.starttag(): [] for row in rows}  # type: Dict[str, List]
+        for row in rows:
+            tags[row.starttag()].append(row.next_node())
+
+        def merge_row_types(root, elem, elems):
+            for node in elems:
+                elem += node
+            root += elem
+
+        for klass in [nodes.thead, nodes.tbody]:
+            obj = klass()
+            if obj.starttag() in tags:
+                merge_row_types(tgroup, obj, tags[obj.starttag()])
+
         return [table]
 
     def visit_mixedcontainer(self, node) -> List[Node]: