From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 10 Feb 2018 23:26:38 +0000 (+0100)
Subject: doxygen: properly bubble search keywords from sections upwards.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=d81ef22ec1c43abb2c7560ace3900fec7753f499;p=blog.git

doxygen: properly bubble search keywords from sections upwards.
---

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index e2f58b77..b6ba50ef 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -851,7 +851,10 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
                         out.parsed += '<aside class="m-note">'
                         logging.warning("{}: ignoring {} kind of <simplesect>".format(state.current, i.attrib['kind']))
 
-                out.parsed += parse_desc(state, i)
+                parsed, search_keywords = parse_desc_keywords(state, i)
+                out.parsed += parsed
+                if search_keywords:
+                    out.search_keywords += search_keywords
 
                 # There's something after, close it
                 if i.tail and i.tail.strip():
@@ -1247,6 +1250,15 @@ def parse_desc(state: State, element: ET.Element) -> str:
     assert not parsed.section # might be problematic
     return parsed.parsed
 
+def parse_desc_keywords(state: State, element: ET.Element) -> str:
+    if element is None: return ''
+
+    # Verify that we didn't ignore any important info by accident
+    parsed = parse_desc_internal(state, element)
+    assert not parsed.templates and not parsed.params and not parsed.return_value
+    assert not parsed.section # might be problematic
+    return parsed.parsed, parsed.search_keywords
+
 def parse_enum_desc(state: State, element: ET.Element) -> str:
     # Verify that we didn't ignore any important info by accident
     parsed = parse_desc_internal(state, element.find('detaileddescription'))