From f84a7209375e57eef5d05d5b42203411055d8337 Mon Sep 17 00:00:00 2001
From: "lina.wolf" <lwolf@w-commerce.de>
Date: Tue, 22 Oct 2024 17:58:38 +0200
Subject: [PATCH] [BUGFIX] Fix menu directive

---
 .../template/body/menu/menu.html.twig         |  8 +++++--
 .../tests-full/breadcrumb/expected/index.html |  3 +--
 .../tests-full/breadcrumb/expected/page.html  |  3 +--
 .../breadcrumb/expected/yetAnotherPage.html   |  3 +--
 ...87616-RemovedHookForAlteringPageLinks.html |  6 ++---
 .../expected/Changelog/12.0/Index.html        |  6 ++---
 .../tests-full/changelog/expected/Index.html  |  6 ++---
 .../changelog/expected/Sitemap.html           | 12 ++++------
 .../expected/index.html                       |  3 +--
 .../expected/page1.html                       |  3 +--
 .../main-menu-json/expected/index.html        |  3 +--
 .../menu-subpages-max-1/expected/index.html   |  3 +--
 .../expected/index.html                       |  3 +--
 .../expected/index.html                       |  3 +--
 .../menu-subpages/expected/index.html         | 22 +++++++++++++++++--
 .../tests-full/menu-subpages/input/index.rst  |  9 ++++++++
 .../expected/anotherPage.html                 |  3 +--
 .../navigation-title/expected/index.html      |  3 +--
 .../expected/yetAnotherPage.html              |  3 +--
 .../next-prev-by-toctree/expected/four.html   |  3 +--
 .../next-prev-by-toctree/expected/i.html      |  3 +--
 .../next-prev-by-toctree/expected/index.html  |  3 +--
 .../next-prev-by-toctree/expected/one.html    |  3 +--
 .../expected/three/index.html                 |  3 +--
 .../expected/three/pi.html                    |  3 +--
 .../expected/three/three.html                 |  3 +--
 .../expected/three/threepointfive.html        |  3 +--
 .../next-prev-by-toctree/expected/two.html    |  3 +--
 .../tests-full/next-prev/expected/index.html  |  3 +--
 .../tests-full/next-prev/expected/page.html   |  3 +--
 .../next-prev/expected/yetAnotherPage.html    |  3 +--
 .../page-with-subpages/expected/index.html    |  3 +--
 .../expected/sub/index.html                   |  3 +--
 .../project-issue-github/expected/index.html  |  3 +--
 .../report-issue-forge/expected/index.html    |  3 +--
 .../report-issue-github/expected/index.html   |  3 +--
 .../report-issue-internal/expected/index.html |  3 +--
 .../tests-full/sitemap/expected/Sitemap.html  |  6 ++---
 .../tests-full/sitemap/expected/index.html    |  3 +--
 .../sitemap/expected/subpages/subpage1.html   |  3 +--
 .../two-toctrees/expected/index.html          |  6 ++---
 41 files changed, 81 insertions(+), 96 deletions(-)

diff --git a/packages/typo3-docs-theme/resources/template/body/menu/menu.html.twig b/packages/typo3-docs-theme/resources/template/body/menu/menu.html.twig
index 5a1cc1062..ce1d3a4b1 100644
--- a/packages/typo3-docs-theme/resources/template/body/menu/menu.html.twig
+++ b/packages/typo3-docs-theme/resources/template/body/menu/menu.html.twig
@@ -1,12 +1,16 @@
-
 {% if node.options.menu == 'mainmenu' %}
     {% include "structure/navigation/menu.html.twig" %}
 {% elseif node.options.menu == 'sitemap' %}
     {% include "body/menu/sitemap.html.twig" %}
 {% else %}
     <div class="toctree-wrapper compound">
+        {% if node.caption -%}
+            <p class="topic-title">{{ renderNode(node.caption) }}</p>
+        {% elseif node.options['caption'] -%}
+            <p class="topic-title">{{ node.options['caption'] }}</p>
+        {% endif -%}
         <ul>
-            {% for entry in node.entries -%}
+            {% for entry in node.menuEntries -%}
                 {{ renderNode(entry) }}
             {% endfor %}
         </ul>
diff --git a/tests/Integration/tests-full/breadcrumb/expected/index.html b/tests/Integration/tests-full/breadcrumb/expected/index.html
index f99624cf5..0dcc08063 100644
--- a/tests/Integration/tests-full/breadcrumb/expected/index.html
+++ b/tests/Integration/tests-full/breadcrumb/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page.html">
         Page 
diff --git a/tests/Integration/tests-full/breadcrumb/expected/page.html b/tests/Integration/tests-full/breadcrumb/expected/page.html
index 85ad4c90d..0b9606d66 100644
--- a/tests/Integration/tests-full/breadcrumb/expected/page.html
+++ b/tests/Integration/tests-full/breadcrumb/expected/page.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Page 
diff --git a/tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html b/tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html
index 1ca0da13d..967f2c4b2 100644
--- a/tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html
+++ b/tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page.html">
         Page TYPO3 Extension oauth2 (mfc/oauth2)
diff --git a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
index 0a806250c..cfc295b69 100644
--- a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
+++ b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
@@ -95,16 +95,14 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" active">
     <a href="../../Changelog-12.html">
         ChangeLog v12
     </a>        <ul class="menu-level-1"><li class=" active">
     <a href="Index.html">
         12.0 Changes
-    </a></li></ul></li>    </ul>
-    <ul class="menu-level-1">
+    </a></li></ul></li>    </ul>    <ul class="menu-level-1">
     <li class="">
     <a href="../../Sitemap.html">
         Sitemap
diff --git a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
index 8049373ee..c0723bd79 100644
--- a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
+++ b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
@@ -96,16 +96,14 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" active">
     <a href="../../Changelog-12.html">
         ChangeLog v12
     </a>        <ul class="menu-level-1"><li class=" current active">
     <a href="#" aria-current="page">
         12.0 Changes
-    </a></li></ul></li>    </ul>
-    <ul class="menu-level-1">
+    </a></li></ul></li>    </ul>    <ul class="menu-level-1">
     <li class="">
     <a href="../../Sitemap.html">
         Sitemap
diff --git a/tests/Integration/tests-full/changelog/expected/Index.html b/tests/Integration/tests-full/changelog/expected/Index.html
index a8f1fa394..863f55388 100644
--- a/tests/Integration/tests-full/changelog/expected/Index.html
+++ b/tests/Integration/tests-full/changelog/expected/Index.html
@@ -94,16 +94,14 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="Changelog-12.html">
         ChangeLog v12
     </a>        <ul class="menu-level-1"><li class="">
     <a href="Changelog/12.0/Index.html">
         12.0 Changes
-    </a></li></ul></li>    </ul>
-    <ul class="menu-level-1">
+    </a></li></ul></li>    </ul>    <ul class="menu-level-1">
     <li class="">
     <a href="Sitemap.html">
         Sitemap
diff --git a/tests/Integration/tests-full/changelog/expected/Sitemap.html b/tests/Integration/tests-full/changelog/expected/Sitemap.html
index fff655d7a..5f39d5b80 100644
--- a/tests/Integration/tests-full/changelog/expected/Sitemap.html
+++ b/tests/Integration/tests-full/changelog/expected/Sitemap.html
@@ -95,16 +95,14 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="Changelog-12.html">
         ChangeLog v12
     </a>        <ul class="menu-level-1"><li class="">
     <a href="Changelog/12.0/Index.html">
         12.0 Changes
-    </a></li></ul></li>    </ul>
-    <ul class="menu-level-1">
+    </a></li></ul></li>    </ul>    <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Sitemap
@@ -162,8 +160,7 @@
             <h1>Sitemap<a class="headerlink" href="#sitemap" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h1>
     </section>
 <div class="section">
-    
-    <div class="sitemap">
+        <div class="sitemap">
     <ul>
         <li class="toctree-l0">
     <a href="Changelog-12.html"
@@ -174,8 +171,7 @@ <h1>Sitemap<a class="headerlink" href="#sitemap" data-bs-toggle="modal" data-bs-
        class="reference internal">
         12.0 Changes
     </a></li></ul></li>            </ul>
-</div>
-    <div class="sitemap">
+</div>    <div class="sitemap">
     <ul>
         <li class="toctree-l0">
     <a href="#"
diff --git a/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/index.html b/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/index.html
index d34f9ce73..9c0503376 100644
--- a/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/index.html
+++ b/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page1.html">
         Avatar ViewHelper &lt;be:avatar&gt;
diff --git a/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html b/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html
index 480fc4d3c..9d8aae918 100644
--- a/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html
+++ b/tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Avatar ViewHelper &lt;be:avatar&gt;
diff --git a/tests/Integration/tests-full/main-menu-json/expected/index.html b/tests/Integration/tests-full/main-menu-json/expected/index.html
index c6b82a075..e06ee3db4 100644
--- a/tests/Integration/tests-full/main-menu-json/expected/index.html
+++ b/tests/Integration/tests-full/main-menu-json/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="mainMenu.json.html">
         &lt;Unknown&gt;
diff --git a/tests/Integration/tests-full/menu-subpages-max-1/expected/index.html b/tests/Integration/tests-full/menu-subpages-max-1/expected/index.html
index 06aaec93e..748cbbe72 100644
--- a/tests/Integration/tests-full/menu-subpages-max-1/expected/index.html
+++ b/tests/Integration/tests-full/menu-subpages-max-1/expected/index.html
@@ -94,8 +94,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="someDirectory/index.html">
         Some Page
diff --git a/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-1/expected/index.html b/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-1/expected/index.html
index 6792bb947..6bae42fce 100644
--- a/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-1/expected/index.html
+++ b/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-1/expected/index.html
@@ -94,8 +94,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="someDirectory/index.html">
         Some Page
diff --git a/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-2/expected/index.html b/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-2/expected/index.html
index a0798b25a..69095f63e 100644
--- a/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-2/expected/index.html
+++ b/tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-2/expected/index.html
@@ -94,8 +94,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="someDirectory/index.html">
         Some Page
diff --git a/tests/Integration/tests-full/menu-subpages/expected/index.html b/tests/Integration/tests-full/menu-subpages/expected/index.html
index 6792bb947..c387dbc6e 100644
--- a/tests/Integration/tests-full/menu-subpages/expected/index.html
+++ b/tests/Integration/tests-full/menu-subpages/expected/index.html
@@ -94,8 +94,8 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <p class="caption"><span class="caption-text">This is the toctree</span></p>
+<ul class="menu-level-1">
     <li class="">
     <a href="someDirectory/index.html">
         Some Page
@@ -151,6 +151,7 @@ <h1>Document Title<a class="headerlink" href="#document-title" data-bs-toggle="m
     <p>Lorem Ipsum Dolor.</p>
 
             <div class="toctree-wrapper compound">
+            <p class="topic-title">This is the toctree</p>
         <ul class="menu-level">
     <li class="toc-item">
     <a href="someDirectory/index.html#some-page">Some Page</a>
@@ -159,6 +160,23 @@ <h1>Document Title<a class="headerlink" href="#document-title" data-bs-toggle="m
 </li>
     </ul>
 </div>
+                <div class="toctree-wrapper compound">
+        <p class="topic-title">This is a menu</p>
+        <ul>
+            <li class="toc-item">
+    <a href="someDirectory/index.html#some-page">Some Page</a>
+        <ul class="menu-level-1">
+            <li class="toc-item">
+    <a href="someDirectory/anotherDirectory/index.html#another-page">Another Page</a>
+
+
+</li>
+                    </ul>
+
+</li>
+                    </ul>
+    </div>
+
     </section>
         <!-- content end -->
     </div>
diff --git a/tests/Integration/tests-full/menu-subpages/input/index.rst b/tests/Integration/tests-full/menu-subpages/input/index.rst
index e5666dbfc..f0e98e1f1 100644
--- a/tests/Integration/tests-full/menu-subpages/input/index.rst
+++ b/tests/Integration/tests-full/menu-subpages/input/index.rst
@@ -13,8 +13,17 @@ Document Title
 Lorem Ipsum Dolor.
 
 ..  toctree::
+    :caption: This is the toctree
     :glob:
     :titlesonly:
     :maxdepth: 1
 
     */index
+
+..  menu::
+    :caption: This is a menu
+    :glob:
+    :titlesonly:
+    :maxdepth: 2
+
+    */index
diff --git a/tests/Integration/tests-full/navigation-title/expected/anotherPage.html b/tests/Integration/tests-full/navigation-title/expected/anotherPage.html
index 69c4217c1..427d9d3da 100644
--- a/tests/Integration/tests-full/navigation-title/expected/anotherPage.html
+++ b/tests/Integration/tests-full/navigation-title/expected/anotherPage.html
@@ -95,8 +95,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Another Page
diff --git a/tests/Integration/tests-full/navigation-title/expected/index.html b/tests/Integration/tests-full/navigation-title/expected/index.html
index a5cdef275..20a9ea7e5 100644
--- a/tests/Integration/tests-full/navigation-title/expected/index.html
+++ b/tests/Integration/tests-full/navigation-title/expected/index.html
@@ -94,8 +94,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="anotherPage.html">
         Another Page
diff --git a/tests/Integration/tests-full/navigation-title/expected/yetAnotherPage.html b/tests/Integration/tests-full/navigation-title/expected/yetAnotherPage.html
index a2eff0a16..04fb01490 100644
--- a/tests/Integration/tests-full/navigation-title/expected/yetAnotherPage.html
+++ b/tests/Integration/tests-full/navigation-title/expected/yetAnotherPage.html
@@ -94,8 +94,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="anotherPage.html">
         Another Page
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/four.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/four.html
index 6c698b10f..6f0bbfcb7 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/four.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/four.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/i.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/i.html
index 5fabe0ee5..a80917dfa 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/i.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/i.html
@@ -82,8 +82,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/index.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/index.html
index 08111fcc3..e74166a57 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/index.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/one.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/one.html
index e267bbf42..58a3ec907 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/one.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/one.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/index.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/index.html
index eba7027c5..7fa172ae8 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/index.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/index.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="../one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/pi.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/pi.html
index 862c32670..9fed09d30 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/pi.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/pi.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="../one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/three.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/three.html
index 21d30fe47..f792eb504 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/three.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/three.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="../one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/threepointfive.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/threepointfive.html
index 618cfd6da..1de14bfe4 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/three/threepointfive.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/three/threepointfive.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="../one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev-by-toctree/expected/two.html b/tests/Integration/tests-full/next-prev-by-toctree/expected/two.html
index 435cc73fd..16712b1ec 100644
--- a/tests/Integration/tests-full/next-prev-by-toctree/expected/two.html
+++ b/tests/Integration/tests-full/next-prev-by-toctree/expected/two.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="one.html">
         One
diff --git a/tests/Integration/tests-full/next-prev/expected/index.html b/tests/Integration/tests-full/next-prev/expected/index.html
index 312ae00e6..d8e250c4e 100644
--- a/tests/Integration/tests-full/next-prev/expected/index.html
+++ b/tests/Integration/tests-full/next-prev/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page.html">
         Page
diff --git a/tests/Integration/tests-full/next-prev/expected/page.html b/tests/Integration/tests-full/next-prev/expected/page.html
index 27917760a..01f0991cc 100644
--- a/tests/Integration/tests-full/next-prev/expected/page.html
+++ b/tests/Integration/tests-full/next-prev/expected/page.html
@@ -81,8 +81,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Page
diff --git a/tests/Integration/tests-full/next-prev/expected/yetAnotherPage.html b/tests/Integration/tests-full/next-prev/expected/yetAnotherPage.html
index 3696e548c..8036d3bee 100644
--- a/tests/Integration/tests-full/next-prev/expected/yetAnotherPage.html
+++ b/tests/Integration/tests-full/next-prev/expected/yetAnotherPage.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page.html">
         Page
diff --git a/tests/Integration/tests-full/page-with-subpages/expected/index.html b/tests/Integration/tests-full/page-with-subpages/expected/index.html
index 99abd81ea..ad31a8c58 100644
--- a/tests/Integration/tests-full/page-with-subpages/expected/index.html
+++ b/tests/Integration/tests-full/page-with-subpages/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="sub/index.html">
         Sub index
diff --git a/tests/Integration/tests-full/page-with-subpages/expected/sub/index.html b/tests/Integration/tests-full/page-with-subpages/expected/sub/index.html
index c78781c0d..8093c85c3 100644
--- a/tests/Integration/tests-full/page-with-subpages/expected/sub/index.html
+++ b/tests/Integration/tests-full/page-with-subpages/expected/sub/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" current active">
     <a href="#" aria-current="page">
         Sub index
diff --git a/tests/Integration/tests-full/report-issue/project-issue-github/expected/index.html b/tests/Integration/tests-full/report-issue/project-issue-github/expected/index.html
index abeb09531..e08ce05b6 100644
--- a/tests/Integration/tests-full/report-issue/project-issue-github/expected/index.html
+++ b/tests/Integration/tests-full/report-issue/project-issue-github/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="report.html">
         Report an issue
diff --git a/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html b/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
index 9acfd639b..d01b1ec6b 100644
--- a/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
+++ b/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="report.html">
         Report an issue
diff --git a/tests/Integration/tests-full/report-issue/report-issue-github/expected/index.html b/tests/Integration/tests-full/report-issue/report-issue-github/expected/index.html
index 1857af63a..f3f7a4d58 100644
--- a/tests/Integration/tests-full/report-issue/report-issue-github/expected/index.html
+++ b/tests/Integration/tests-full/report-issue/report-issue-github/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="report.html">
         Report an issue
diff --git a/tests/Integration/tests-full/report-issue/report-issue-internal/expected/index.html b/tests/Integration/tests-full/report-issue/report-issue-internal/expected/index.html
index 1f5bb96af..b309b2255 100644
--- a/tests/Integration/tests-full/report-issue/report-issue-internal/expected/index.html
+++ b/tests/Integration/tests-full/report-issue/report-issue-internal/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="report.html">
         Report an issue
diff --git a/tests/Integration/tests-full/sitemap/expected/Sitemap.html b/tests/Integration/tests-full/sitemap/expected/Sitemap.html
index bd56a863d..ff038fe93 100644
--- a/tests/Integration/tests-full/sitemap/expected/Sitemap.html
+++ b/tests/Integration/tests-full/sitemap/expected/Sitemap.html
@@ -82,8 +82,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="subpages/index.html">
         Subpages
@@ -141,8 +140,7 @@
             <h1>Sitemap<a class="headerlink" href="#sitemap" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h1>
     </section>
 <div class="section">
-    
-    <div class="sitemap">
+        <div class="sitemap">
     <ul>
         <li class="toctree-l0">
     <a href="subpages/index.html"
diff --git a/tests/Integration/tests-full/sitemap/expected/index.html b/tests/Integration/tests-full/sitemap/expected/index.html
index c6fae479b..fcc58bf3a 100644
--- a/tests/Integration/tests-full/sitemap/expected/index.html
+++ b/tests/Integration/tests-full/sitemap/expected/index.html
@@ -80,8 +80,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="subpages/index.html">
         Subpages
diff --git a/tests/Integration/tests-full/sitemap/expected/subpages/subpage1.html b/tests/Integration/tests-full/sitemap/expected/subpages/subpage1.html
index 7ccba3d69..0b3975c0e 100644
--- a/tests/Integration/tests-full/sitemap/expected/subpages/subpage1.html
+++ b/tests/Integration/tests-full/sitemap/expected/subpages/subpage1.html
@@ -82,8 +82,7 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class=" active">
     <a href="index.html">
         Subpages
diff --git a/tests/Integration/tests-full/two-toctrees/expected/index.html b/tests/Integration/tests-full/two-toctrees/expected/index.html
index cab036b7c..b4418fffe 100644
--- a/tests/Integration/tests-full/two-toctrees/expected/index.html
+++ b/tests/Integration/tests-full/two-toctrees/expected/index.html
@@ -94,16 +94,14 @@
 </div>                    <div class="toc-collapse">
                                                 <div aria-label="main navigation" class="toc" role="navigation">
                                 <div aria-label="Main navigation" class="main_menu" role="navigation">
-        
-    <ul class="menu-level-1">
+            <ul class="menu-level-1">
     <li class="">
     <a href="page1.html">
         Page 1
     </a></li>    <li class="">
     <a href="page2.html">
         Page 2
-    </a></li>    </ul>
-    <ul class="menu-level-1">
+    </a></li>    </ul>    <ul class="menu-level-1">
     <li class="">
     <a href="Sitemap.html">
         Sitemap