From: Vladimír Vondruš Date: Wed, 6 Dec 2017 21:46:51 +0000 (+0100) Subject: doxygen: reduce recursion a bit. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=b1929a0454871caf0224d9c5fc02d9fb645278c1;p=blog.git doxygen: reduce recursion a bit. --- diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py index f7c78fb1..d6825d71 100755 --- a/doxygen/dox2html5.py +++ b/doxygen/dox2html5.py @@ -302,17 +302,14 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. has_block_elements = True out.parsed += '
{}
'.format(parse_desc(state, i)) - elif i.tag == 'itemizedlist': + elif i.tag in ['itemizedlist', 'orderedlist']: has_block_elements = True - out.parsed += ''.format(parse_desc(state, i)) - - elif i.tag == 'orderedlist': - has_block_elements = True - out.parsed += '
    {}
'.format(parse_desc(state, i)) - - elif i.tag == 'listitem': - has_block_elements = True - out.parsed += '
  • {}
  • '.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 += '
  • {}
  • '.format(parse_desc(state, li)) + out.parsed += ''.format(tag) elif i.tag == 'simplesect': # Return value is separated from the text flow