doxygen: properly bubble up also enum-values-as-keywords from sections.

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index b6ba50ef2f6b4d62640a695febdfcc5ff1792ccd..b742cfa6213bf4429dd7927a351a5b840deccfc2 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -851,10 +851,13 @@ 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']))
 
-                parsed, search_keywords = parse_desc_keywords(state, i)
+                # Parse the section contents and bubble important stuff up
+                parsed, search_keywords, search_enum_values_as_keywords = parse_desc_keywords(state, i)
                 out.parsed += parsed
                 if search_keywords:
                     out.search_keywords += search_keywords
+                if search_enum_values_as_keywords:
+                    out.search_enum_values_as_keywords = True
 
                 # There's something after, close it
                 if i.tail and i.tail.strip():
@@ -1257,7 +1260,7 @@ def parse_desc_keywords(state: State, element: ET.Element) -> str:
     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
+    return parsed.parsed, parsed.search_keywords, parsed.search_enum_values_as_keywords
 
 def parse_enum_desc(state: State, element: ET.Element) -> str:
     # Verify that we didn't ignore any important info by accident

diff --git a/doxygen/test/search/Dir/File.h b/doxygen/test/search/Dir/File.h
index 8785fe33e9d36165fa8d87539d1cc20606d7fcf3..97b5fd5980a760ed0d5328529dd273228f8ff5bb 100644 (file)
--- a/doxygen/test/search/Dir/File.h
+++ b/doxygen/test/search/Dir/File.h
@@ -58,7 +58,8 @@ typedef int Typedef;
  * @brief An enum
  *
  * @m_keywords{GL_ENUM}
- * @m_enum_values_as_keywords
+ * @see Enum values as keywords should be propagated outside as well:
+ *      @m_enum_values_as_keywords
  */
 enum class Enum {
     /**