From: Vladimír Vondruš <mosra@centrum.cz>
Date: Mon, 9 Apr 2018 10:00:19 +0000 (+0200)
Subject: doxygen: don't crash when encountering xrefs in the form of @_1@.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=2922d69660cb69407c9305785447742f29823dad;p=blog.git

doxygen: don't crash when encountering xrefs in the form of @_1@.

Triggered by Android NDK docs.
---

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index b341de72..aafe43fe 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -340,7 +340,7 @@ def serialize_search_data(trie: Trie, map: ResultMap, symbol_count, merge_subtre
     # magic header, version, symbol count, offset of result map
     return search_data_header_struct.pack(b'MCS', 0, symbol_count, len(serialized_trie) + 10) + serialized_trie + serialized_map
 
-xref_id_rx = re.compile(r"""(.*)_1(_[a-z-]+[0-9]+)$""")
+xref_id_rx = re.compile(r"""(.*)_1(_[a-z-]+[0-9]+|@)$""")
 slugify_nonalnum_rx = re.compile(r"""[^\w\s-]""")
 slugify_hyphens_rx = re.compile(r"""[-\s]+""")