nicolas
/
pyladoc
mirror of https://github.com/Nonannet/pyladoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code according to flake8 and mypy updated

This commit is contained in:
Nicolas 2025-05-19 11:45:34 +02:00 committed by Nicolas Kruse
parent 2083a6ed41
commit 507d88bc38
3 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pyladoc/__init__.py
View File

@ -336,7 +336,7 @@ class DocumentWriter():
def inline_repl(match: re.Match[str]) -> str: def inline_repl(match: re.Match[str]) -> str:
content = match.group(1) content = match.group(1)
return f'<latex>{content}</latex>' return f'<latex>{content}</latex>'
return inline_pattern.sub(inline_repl, result) return inline_pattern.sub(inline_repl, result)
def _get_equation_html(self, latex_equation: str, caption: str, reference: str, block: bool = False) -> str: def _get_equation_html(self, latex_equation: str, caption: str, reference: str, block: bool = False) -> str:
@ -385,8 +385,8 @@ class DocumentWriter():
self.block = attr_dict.get('type') == 'block' self.block = attr_dict.get('type') == 'block'
elif not self.in_latex: elif not self.in_latex:
tag_text = self.get_starttag_text() tag_text = self.get_starttag_text()
self.self_closing = tag_text.endswith('/>')
if tag_text: if tag_text:
self.self_closing = tag_text.endswith('/>')
self.modified_html.write(tag_text) self.modified_html.write(tag_text)
if tag == 'p': if tag == 'p':
self.p_tags += 1 self.p_tags += 1

4
src/pyladoc/svg_tools.py
View File

@ -1,7 +1,7 @@
import xml.etree.ElementTree as ET
import re import re
from re import Match from re import Match
def update_svg_ids(input_svg: str, unique_id: str) -> str: def update_svg_ids(input_svg: str, unique_id: str) -> str:
"""Add a unique ID part to all svg IDs and update references ti these IDs""" """Add a unique ID part to all svg IDs and update references ti these IDs"""
id_mapping: dict[str, str] = {} id_mapping: dict[str, str] = {}
@ -35,4 +35,4 @@ def clean_svg(svg_text: str) -> str:
svg_text = re.sub(r'<metadata>.*?</metadata>', '', svg_text, flags=re.DOTALL) svg_text = re.sub(r'<metadata>.*?</metadata>', '', svg_text, flags=re.DOTALL)
# remove illegal path-tags without d attribute: # remove illegal path-tags without d attribute:
return re.sub(r'<path(?![^>]*\sd=)\s.*?/>', '', svg_text, flags=re.DOTALL) return re.sub(r'<path(?![^>]*\sd=)\s.*?/>', '', svg_text, flags=re.DOTALL)

156
tests/test_svg.py
View File

@ -1,13 +1,14 @@
import pyladoc import pyladoc
def test_update_svg_ids(): def test_update_svg_ids():
test_str = r""" test_str = r"""
<g id="figure_1"> <g id="figure_1">
<g id="patch_1"> <g id="patch_1">
<path d="M 0 15.0336 <path d="M 0 15.0336
L 24.570183 15.0336 L 24.570183 15.0336
L 24.570183 0 L 24.570183 0
L 0 0 L 0 0
z z
" style="fill: #ffffff"/> " style="fill: #ffffff"/>
</g> </g>
@ -16,7 +17,7 @@ def test_update_svg_ids():
<!-- $\lambda_{\text{mix}}$ --> <!-- $\lambda_{\text{mix}}$ -->
<g transform="translate(3.042219 10.351343) scale(0.1 -0.1)"> <g transform="translate(3.042219 10.351343) scale(0.1 -0.1)">
<defs> <defs>
<path id="DejaVuSans-Oblique-3bb" d="M 2350 4316 <path id="DejaVuSans-Oblique-3bb" d="M 2350 4316
" clip-path="url(#p8dcad2f367)" style="fill: none; stroke: #000000; stroke-width: 1.5; stroke-linecap: square"/> " clip-path="url(#p8dcad2f367)" style="fill: none; stroke: #000000; stroke-width: 1.5; stroke-linecap: square"/>
@ -27,10 +28,9 @@ def test_update_svg_ids():
</clipPath> </clipPath>
</defs> </defs>
<path id="DejaVuSans-Oblique-78" d="M 3841 3500 <path id="DejaVuSans-Oblique-78" d="M 3841 3500
L 2234 1784 L 2234 1784
</defs> </defs>
<use xlink:href="#DejaVuSans-Oblique-78" transform="translate(0 0.3125)"/> <use xlink:href="#DejaVuSans-Oblique-78" transform="translate(0 0.3125)"/>
@ -39,16 +39,16 @@ def test_update_svg_ids():
</g> </g>
<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="24.570183pt" height="15.0336pt" viewBox="0 0 24.570183 15.0336" xmlns="http://www.w3.org/2000/svg" version="1.1"> <svg xmlns:xlink="http://www.w3.org/1999/xlink" width="24.570183pt" height="15.0336pt" viewBox="0 0 24.570183 15.0336" xmlns="http://www.w3.org/2000/svg" version="1.1">
<defs> <defs>
<style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style> <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
</defs> </defs>
<g id="figure_1"> <g id="figure_1">
<g id="patch_1"> <g id="patch_1">
<path d="M 0 15.0336 <path d="M 0 15.0336
L 24.570183 15.0336 L 24.570183 15.0336
L 24.570183 0 L 24.570183 0
L 0 0 L 0 0
z z
" style="fill: #ffffff"/> " style="fill: #ffffff"/>
</g> </g>
@ -57,77 +57,77 @@ def test_update_svg_ids():
<!-- $\lambda_{\text{mix}}$ --> <!-- $\lambda_{\text{mix}}$ -->
<g transform="translate(3.042219 10.351343) scale(0.1 -0.1)"> <g transform="translate(3.042219 10.351343) scale(0.1 -0.1)">
<defs> <defs>
<path id="DejaVuSans-Oblique-3bb" d="M 2350 4316 <path id="DejaVuSans-Oblique-3bb" d="M 2350 4316
L 3125 0 L 3125 0
L 2516 0 L 2516 0
L 2038 2588 L 2038 2588
L 328 0 L 328 0
L -281 0 L -281 0
L 1903 3356 L 1903 3356
L 1794 3975 L 1794 3975
Q 1725 4369 1391 4369 Q 1725 4369 1391 4369
L 1091 4369 L 1091 4369
L 1184 4863 L 1184 4863
L 1550 4856 L 1550 4856
Q 2253 4847 2350 4316 Q 2253 4847 2350 4316
z z
" transform="scale(0.015625)"/> " transform="scale(0.015625)"/>
<path id="DejaVuSans-6d" d="M 3328 2828 <path id="DejaVuSans-6d" d="M 3328 2828
Q 3544 3216 3844 3400 Q 3544 3216 3844 3400
Q 4144 3584 4550 3584 Q 4144 3584 4550 3584
Q 5097 3584 5394 3201 Q 5097 3584 5394 3201
Q 5691 2819 5691 2113 Q 5691 2819 5691 2113
L 5691 0 L 5691 0
L 5113 0 L 5113 0
L 5113 2094 L 5113 2094
Q 5113 2597 4934 2840 Q 5113 2597 4934 2840
Q 4756 3084 4391 3084 Q 4756 3084 4391 3084
Q 3944 3084 3684 2787 Q 3944 3084 3684 2787
Q 3425 2491 3425 1978 Q 3425 2491 3425 1978
L 3425 0 L 3425 0
L 2847 0 L 2847 0
L 2847 2094 L 2847 2094
Q 2847 2600 2669 2842 Q 2847 2600 2669 2842
Q 2491 3084 2119 3084 Q 2491 3084 2119 3084
Q 1678 3084 1418 2786 Q 1678 3084 1418 2786
Q 1159 2488 1159 1978 Q 1159 2488 1159 1978
L 1159 0 L 1159 0
L 581 0 L 581 0
L 581 3500 L 581 3500
L 1159 3500 L 1159 3500
L 1159 2956 L 1159 2956
Q 1356 3278 1631 3431 Q 1356 3278 1631 3431
Q 1906 3584 2284 3584 Q 1906 3584 2284 3584
Q 2666 3584 2933 3390 Q 2666 3584 2933 3390
Q 3200 3197 3328 2828 Q 3200 3197 3328 2828
z z
" transform="scale(0.015625)"/> " transform="scale(0.015625)"/>
<path id="DejaVuSans-69" d="M 603 3500 <path id="DejaVuSans-69" d="M 603 3500
L 1178 3500 L 1178 3500
L 1178 0 L 1178 0
L 603 0 L 603 0
L 603 3500 L 603 3500
z z
M 603 4863 M 603 4863
L 1178 4863 L 1178 4863
L 1178 4134 L 1178 4134
L 603 4134 L 603 4134
L 603 4863 L 603 4863
z z
" transform="scale(0.015625)"/> " transform="scale(0.015625)"/>
<path id="DejaVuSans-78" d="M 3513 3500 <path id="DejaVuSans-78" d="M 3513 3500
L 2247 1797 L 2247 1797
L 3578 0 L 3578 0
L 2900 0 L 2900 0
L 1881 1375 L 1881 1375
L 863 0 L 863 0
L 184 0 L 184 0
L 1544 1831 L 1544 1831
L 300 3500 L 300 3500
L 978 3500 L 978 3500
L 1906 2253 L 1906 2253
L 2834 3500 L 2834 3500
L 3513 3500 L 3513 3500
z z
" transform="scale(0.015625)"/> " transform="scale(0.015625)"/>
</defs> </defs>
@ -148,4 +148,4 @@ def test_update_svg_ids():
print(result) print(result)
assert result.replace(f"svg-{unique_id}-", '') == test_str assert result.replace(f"svg-{unique_id}-", '') == test_str