doxygen: fix parsing of two consecutive HTML navbar links.

Of course I have bugz!

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index ff88aabfa2e329e8436c0eee43d26df7f87e66c5..13d9fc9e89627aa382fa6547a1b1e66e37209dba 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1926,7 +1926,7 @@ def postprocess_state(state: State):
                 if i.startswith('<a'):
                     end = i.index('</a>') + 4
                     links += [i[0:end]]
-                    i = i[end:]
+                    i = i[end:].lstrip()
                 else:
                     firstAndRest = i.split(None, 1)
                     if len(firstAndRest):

diff --git a/doxygen/test/layout_navbar_html/Doxyfile b/doxygen/test/layout_navbar_html/Doxyfile
index 124959d727c3bccd709a6a0547cd8f374f201214..5d014db113bab7bd64d1b3c5de22c3ce3ed45b3c 100644 (file)
--- a/doxygen/test/layout_navbar_html/Doxyfile
+++ b/doxygen/test/layout_navbar_html/Doxyfile
@@ -4,7 +4,7 @@ XML_OUTPUT              =
 ##!     "<a href=\"javascript:alert('hello!');\">Say hello</a> annotated" \
 ##!     "files"
 ##! M_LINKS_NAVBAR2 = \
-##!     "pages <a href=\"mailto:mosra@centrum.cz\">This is an e-mail</a> namespaces" \
+##!     "pages <a href=\"mailto:mosra@centrum.cz\">This is an e-mail</a> <a href=\"#\">Another link</a> namespaces" \
 ##!     "<a href=\"https://github.com/mosra/m.css\">GitHub</a>"
 ##! M_PAGE_FINE_PRINT   =
 ##! M_THEME_COLOR       =

diff --git a/doxygen/test/layout_navbar_html/index.html b/doxygen/test/layout_navbar_html/index.html
index 12cf07ec0ef9d80fb6b21c27c3a754bf32f6ec68..6de951a831c054f26dd12ff74b0f463bae18cc11 100644 (file)
--- a/doxygen/test/layout_navbar_html/index.html
+++ b/doxygen/test/layout_navbar_html/index.html
@@ -32,6 +32,7 @@
               <a href="pages.html">Pages</a>
               <ol>
                 <li><a href="mailto:mosra@centrum.cz">This is an e-mail</a></li>
+                <li><a href="#">Another link</a></li>
                 <li><a href="namespaces.html">Namespaces</a></li>
               </ol>
             </li>
@@ -54,4 +55,4 @@
   </div>
 </article></main>
 </body>
-</html>
\ No newline at end of file
+</html>