diff --git a/CHANGES b/CHANGES index a8b8b002740..91353c0a66d 100644 --- a/CHANGES +++ b/CHANGES @@ -68,26 +68,18 @@ Bugs fixed Testing -------- -Release 6.0.1 (in development) -============================== +Release 6.0.1 (released Jan 05, 2023) +===================================== Dependencies ------------ -Incompatible changes --------------------- - -Deprecated ----------- - -Features added --------------- +* Require Pygments 2.13 or later. Bugs fixed ---------- -Testing --------- +* #10944: imgmath: Fix resolving image paths for files in nested folders. Release 6.0.0 (released Dec 29, 2022) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index f88de426c4b..55dbe27f2a6 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -30,11 +30,11 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (6, 0, 1, 'beta', 0) +version_info = (6, 0, 1, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) -_in_development = True +_in_development = False if _in_development: # Only import subprocess if needed import subprocess diff --git a/sphinx/ext/imgmath.py b/sphinx/ext/imgmath.py index d3a6a25d253..5e8064d1cf9 100644 --- a/sphinx/ext/imgmath.py +++ b/sphinx/ext/imgmath.py @@ -209,10 +209,9 @@ def render_math( """Render the LaTeX math expression *math* using latex and dvipng or dvisvgm. - Return the filename relative to the built document and the "depth", + Return the image absolute filename and the "depth", that is, the distance of image bottom and baseline in pixels, if the option to use preview_latex is switched on. - Also return the temporary and destination files. Error handling may seem strange, but follows a pattern: if LaTeX or dvipng (dvisvgm) aren't available, only a warning is generated (since that enables @@ -319,7 +318,8 @@ def html_visit_math(self: HTML5Translator, node: nodes.math) -> None: image_format = self.builder.config.imgmath_image_format.lower() img_src = render_maths_to_base64(image_format, rendered_path) else: - relative_path = path.relpath(rendered_path, self.builder.outdir) + bname = path.basename(rendered_path) + relative_path = path.join(self.builder.imgpath, 'math', bname) img_src = relative_path.replace(path.sep, '/') c = f' Non image_format = self.builder.config.imgmath_image_format.lower() img_src = render_maths_to_base64(image_format, rendered_path) else: - relative_path = path.relpath(rendered_path, self.builder.outdir) + bname = path.basename(rendered_path) + relative_path = path.join(self.builder.imgpath, 'math', bname) img_src = relative_path.replace(path.sep, '/') self.body.append(f'

\n')