From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sun, 11 Feb 2018 10:42:10 +0000 (+0100)
Subject: doxygen: properly bubble up also enum-values-as-keywords from sections.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=242ade30d6250885826f63e8ab11a508e94c01fd;p=blog.git

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

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index b6ba50ef..b742cfa6 100755
--- 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 8785fe33..97b5fd59 100644
--- 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 {
     /**