Merge branch 'feature/render-pages-content-in-order' of https://githu…

…b.com/teslabs/breathe #651
breathe-doc · Mar 29, 2021 · 52fbb88 · 52fbb88
2 parents bc009b5 + a46be23
commit 52fbb88
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/breathe/parser/compound.py b/breathe/parser/compound.py
@@ -968,6 +968,8 @@ def __init__(self, char=None, valueOf_=''):
         self.programlisting = []
         self.images = []
 
+        self.ordered_children = []
+
     def buildChildren(self, child_, nodeName_):
         supermod.docParaType.buildChildren(self, child_, nodeName_)
 
@@ -1058,6 +1060,11 @@ def buildChildren(self, child_, nodeName_):
             obj_ = supermod.docTableType.factory()
             obj_.build(child_)
             self.content.append(obj_)
+        else:
+            obj_ = None
+
+        if obj_:
+            self.ordered_children.append(obj_)
 
 
 supermod.docParaType.subclass = docParaTypeSub

diff --git a/breathe/renderer/sphinxrenderer.py b/breathe/renderer/sphinxrenderer.py
@@ -1318,22 +1318,27 @@ def visit_docpara(self, node) -> List[Node]:
         neighbouring instances of these things tend to each be in a separate neighbouring para tag.
         """
 
-        nodelist = self.render_iterable(node.content)
-        nodelist.extend(self.render_iterable(node.images))
+        nodelist = []
 
-        if self.app.config.breathe_order_parameters_first:  # type: ignore
-            # Order parameters before simplesects, which mainly are return/warnings/remarks
-            definition_nodes = self.render_iterable(node.parameterlist)
-            definition_nodes.extend(self.render_iterable(node.simplesects))
+        if self.context and self.context.directive_args[0] == "doxygenpage":
+            nodelist.extend(self.render_iterable(node.ordered_children))
         else:
-            # Returns, user par's, etc
-            definition_nodes = self.render_iterable(node.simplesects)
-            # Parameters/Exceptions
-            definition_nodes.extend(self.render_iterable(node.parameterlist))
-
-        if definition_nodes:
-            definition_list = nodes.definition_list("", *definition_nodes)
-            nodelist.append(definition_list)
+            nodelist.extend(self.render_iterable(node.content))
+            nodelist.extend(self.render_iterable(node.images))
+
+            if self.app.config.breathe_order_parameters_first:  # type: ignore
+                # Order parameters before simplesects, which mainly are return/warnings/remarks
+                definition_nodes = self.render_iterable(node.parameterlist)
+                definition_nodes.extend(self.render_iterable(node.simplesects))
+            else:
+                # Returns, user par's, etc
+                definition_nodes = self.render_iterable(node.simplesects)
+                # Parameters/Exceptions
+                definition_nodes.extend(self.render_iterable(node.parameterlist))
+
+            if definition_nodes:
+                definition_list = nodes.definition_list("", *definition_nodes)
+                nodelist.append(definition_list)
 
         return [nodes.paragraph("", "", *nodelist)]