chiark / gitweb /
doxygen: reduce recursion a bit.
authorVladimír Vondruš <mosra@centrum.cz>
Wed, 6 Dec 2017 21:46:51 +0000 (22:46 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Thu, 7 Dec 2017 01:23:41 +0000 (02:23 +0100)
doxygen/dox2html5.py

index f7c78fb13782b9309d0fc7c076b882cc07d101d8..d6825d7168ce54b26bdf1195fa9070c9d7d559e6 100755 (executable)
@@ -302,17 +302,14 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
             has_block_elements = True
             out.parsed += '<blockquote>{}</blockquote>'.format(parse_desc(state, i))
 
-        elif i.tag == 'itemizedlist':
+        elif i.tag in ['itemizedlist', 'orderedlist']:
             has_block_elements = True
-            out.parsed += '<ul>{}</ul>'.format(parse_desc(state, i))
-
-        elif i.tag == 'orderedlist':
-            has_block_elements = True
-            out.parsed += '<ol>{}</ol>'.format(parse_desc(state, i))
-
-        elif i.tag == 'listitem':
-            has_block_elements = True
-            out.parsed += '<li>{}</li>'.format(parse_desc(state, i))
+            tag = 'ul' if i.tag == 'itemizedlist' else 'ol'
+            out.parsed += '<{}>'.format(tag)
+            for li in i:
+                assert li.tag == 'listitem'
+                out.parsed += '<li>{}</li>'.format(parse_desc(state, li))
+            out.parsed += '</{}>'.format(tag)
 
         elif i.tag == 'simplesect':
             # Return value is separated from the text flow