IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

imgmath: Fix relative file path (#10965)

Browse Source
This commit is contained in:
Julien Schueller 2023-01-05 12:54:32 +01:00 committed by GitHub
parent 965768bfda
commit 222d366ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -16,6 +16,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #10944: imgmath: Fix resolving image paths for files in nested folders.
Testing Testing
-------- --------

9
sphinx/ext/imgmath.py
View File

@ -207,10 +207,9 @@ def render_math(
"""Render the LaTeX math expression *math* using latex and dvipng or """Render the LaTeX math expression *math* using latex and dvipng or
dvisvgm. 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 that is, the distance of image bottom and baseline in pixels, if the
option to use preview_latex is switched on. 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 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 (dvisvgm) aren't available, only a warning is generated (since that enables
@ -317,7 +316,8 @@ def html_visit_math(self: HTMLTranslator, node: nodes.math) -> None:
image_format = self.builder.config.imgmath_image_format.lower() image_format = self.builder.config.imgmath_image_format.lower()
img_src = render_maths_to_base64(image_format, rendered_path) img_src = render_maths_to_base64(image_format, rendered_path)
else: 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, '/') img_src = relative_path.replace(path.sep, '/')
c = f'<img class="math" src="{img_src}"' + get_tooltip(self, node) c = f'<img class="math" src="{img_src}"' + get_tooltip(self, node)
if depth is not None: if depth is not None:
@ -357,7 +357,8 @@ def html_visit_displaymath(self: HTMLTranslator, node: nodes.math_block) -> None
image_format = self.builder.config.imgmath_image_format.lower() image_format = self.builder.config.imgmath_image_format.lower()
img_src = render_maths_to_base64(image_format, rendered_path) img_src = render_maths_to_base64(image_format, rendered_path)
else: 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, '/') img_src = relative_path.replace(path.sep, '/')
self.body.append(f'<img src="{img_src}"' + get_tooltip(self, node) + self.body.append(f'<img src="{img_src}"' + get_tooltip(self, node) +
'/></p>\n</div>') '/></p>\n</div>')