From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sun, 14 Oct 2018 13:08:07 +0000 (+0200)
Subject: doxygen: fix parsing of two consecutive HTML navbar links.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=75c2284c460501a8c02051a0c1020b869f93595d;p=blog.git

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 ff88aabf..13d9fc9e 100755
--- 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 124959d7..5d014db1 100644
--- 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 12cf07ec..6de951a8 100644
--- 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>