Fix toctree navigation

linaro-its · Sep 19, 2024 · c16a59c · c16a59c
1 parent adc172d
commit c16a59c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
@@ -1,6 +1,6 @@
 """The Sphinx documentation toolchain."""
 
-__version__ = '8.1.0+Linaro-240919b'
+__version__ = '8.1.0+Linaro-240919c'
 __display_version__ = __version__  # used for command line version
 
 # Keep this file executable as-is in Python 3!

diff --git a/sphinx/environment/adapters/toctree.py b/sphinx/environment/adapters/toctree.py
@@ -187,7 +187,11 @@ def _resolve_toctree(
     # generation time)
     for refnode in newnode.findall(nodes.reference):
         if url_re.match(refnode['refuri']) is None:
-            rel_uri = builder.get_relative_uri(docname, refnode['refuri'])
+            # PJC: Now that osutil/relative_uri accommodates / navigation in
+            # calculating the relative uri, this *doesn't* work for the navigation
+            # sidebar, so we deliberately pass "" instead of docname, just to get
+            # the correct URI back.
+            rel_uri = builder.get_relative_uri("", refnode['refuri'])
             refnode['refuri'] = rel_uri + refnode['anchorname']
     return newnode