doxygen: fix another nested paragraph corner case.

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 9d64b58654a199a8b4552d1df36678ffaef10c9d..fa4c38efff9a0524222f828f5757a866138ff940 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -232,13 +232,16 @@ def parse_desc_internal(state: State, element: ET.Element, trim = True):
 
             # Omit superfluous <p> for simple elments (list items, brief,
             # parameter and return value description)
-            if not parsed.write_start_tag or element.tag in ['listitem', 'briefdescription', 'parameterdescription'] or element.tag == 'simplesect' and element.attrib['kind'] == 'return':
+            if element.tag in ['listitem', 'briefdescription', 'parameterdescription'] or (element.tag == 'simplesect' and element.attrib['kind'] == 'return'):
+                # Not expecting any funny thing from there (this will bite back
+                # in the future)
+                assert parsed.write_start_tag and parsed.write_close_tag
                 out.parsed += parsed.parsed
+            # Otherwise behave like requested
             elif parsed.parsed:
-                if parsed.write_close_tag:
-                    out.parsed += '<p>{}</p>'.format(parsed.parsed)
-                else:
-                    out.parsed += '<p>{}'.format(parsed.parsed)
+                if parsed.write_start_tag: out.parsed += '<p>'
+                out.parsed += parsed.parsed
+                if parsed.write_close_tag: out.parsed += '</p>'
 
         elif i.tag == 'blockquote':
             out.parsed += '<blockquote>{}</blockquote>'.format(parse_desc(state, i))