translator: simplify v2 autodocs renderings

The following commit simplifies the markup content generated for
autodocs related nodes. Attempts to gracefully format with various
workarounds (e.g. nesting with panels and layouts) seems to constantly
change as Confluence updates its ADF processing. There does not appear
to be a perfect way to layout autodocs content -- so we will no longer
try (that much). We will rely on panels for now (since it appears the
only way to do some level of block indentation of content without
borders/colors), and all other field entries will be just added into
simple paragraphs. This allows the content to be somewhat readable for
users and does not add a lot of tags that makes the viewing experience
slow on v2 editors.

We can look at this in the future if there are either alternative ways
to render autodocs, or get to a point where we may not even bother.

Signed-off-by: James Knight <[email protected]>

Author: jdknight

sphinxcontrib/confluencebuilder/storage/translator.py

@@ -575,32 +575,16 @@ def depart_field_list(self, node):
             self.body.append(self.context.pop())  # table
 
     def visit_field(self, node):
-        if self.v2:
-            self.body.append(self._start_tag(node, 'ac:layout'))
-            self.context.append(self._end_tag(node, suffix=''))
-
-            self.body.append(self._start_tag(node, 'ac:layout-section',
-                **{
-                    'ac:type': 'two_left_sidebar',
-                    'ac:breakout-mode': 'default',
-                }))
-            self.context.append(self._end_tag(node))
-        else:
+        if not self.v2:
             self.body.append(self._start_tag(node, 'tr', suffix=self.nl))
             self.context.append(self._end_tag(node))
 
     def depart_field(self, node):
-        if self.v2:
-            self.body.append(self.context.pop())  # ac:layout-section
-            self.body.append(self.context.pop())  # ac:layout
-        else:
+        if not self.v2:
             self.body.append(self.context.pop())  # tr
 
     def visit_field_name(self, node):
-        if self.v2:
-            self.body.append(self._start_tag(node, 'ac:layout-cell'))
-            self.context.append(self._end_tag(node))
-        else:
+        if not self.v2:
             self.body.append(self._start_tag(node, 'td',
                 **{'style': 'border: none'}))
             self.context.append(self._end_tag(node))
@@ -612,22 +596,18 @@ def depart_field_name(self, node):
         self.body.append(':')
         self.body.append(self.context.pop())  # strong
 
-        if self.v2:
-            self.body.append(self.context.pop())  # ac:layout-cell
-        else:
+        if not self.v2:
             self.body.append(self.context.pop())  # td
 
     def visit_field_body(self, node):
-        if self.v2:
-            self.body.append(self._start_tag(node, 'ac:layout-cell'))
-        else:
+        if not self.v2:
             self.body.append(self._start_tag(node, 'td',
                 **{'style': 'border: none'}))
-
-        self.context.append(self._end_tag(node))
+            self.context.append(self._end_tag(node))
 
     def depart_field_body(self, node):
-        self.body.append(self.context.pop())  # td/ac:layout-cell
+        if not self.v2:
+            self.body.append(self.context.pop())  # td
 
     # -----------------------------
     # body elements -- option lists