doxygen: count also all aliases to the search symbol count.

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index b00dfc86deceb68f6ba90b83412d8b068d306f99..e7b47559c10263e72297035b6dc24178c2b91192 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1782,6 +1782,7 @@ def build_search_data(state: State, merge_subtrees=True, add_lookahead_barriers=
     def strip_tags(text):
         return strip_tags_re.sub('', text)
 
+    symbol_count = 0
     for result in state.search:
         # Decide on prefix joiner. Defines are among the :: ones as well,
         # because we need to add the function macros twice -- but they have no
@@ -1854,7 +1855,10 @@ def build_search_data(state: State, merge_subtrees=True, add_lookahead_barriers=
             keyword_index = map.add(title, '', alias=index, suffix_length=suffix_length)
             trie.insert(search.lower(), keyword_index)
 
-    return serialize_search_data(trie, map, len(state.search), merge_subtrees=merge_subtrees, merge_prefixes=merge_prefixes)
+        # Add this symbol and all its aliases to total symbol count
+        symbol_count += len(result.keywords) + 1
+
+    return serialize_search_data(trie, map, symbol_count, merge_subtrees=merge_subtrees, merge_prefixes=merge_prefixes)
 
 def base85encode_search_data(data: bytearray) -> bytearray:
     return (b"/* Generated by http://mcss.mosra.cz/doxygen/. Do not edit. */\n" +

diff --git a/doxygen/test/test_search.py b/doxygen/test/test_search.py
index 6a8ee77d11f94883946d0d53fc896a0706cd7fa7..d080814f424be44608cd828b41f973e7ecb1d993 100755 (executable)
--- a/doxygen/test/test_search.py
+++ b/doxygen/test/test_search.py
@@ -376,7 +376,7 @@ class Search(IntegrationTestCase):
         #print(search_data_pretty)
         self.assertEqual(len(serialized), 4572)
         self.assertEqual(search_data_pretty, """
-36 symbols
+52 symbols
 deprecated_macro [0]
 ||        |     ($
 ||        |      ) [1]