fondi 0.2.0__tar.gz → 0.2.1.dev22__tar.gz

{fondi-0.2.0/src/fondi.egg-info → fondi-0.2.1.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fondi
-Version: 0.2.0
+Version: 0.2.1.dev22
 Summary: LaTeX-like math renderer with PNG and SVG output
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 License: GPL-3.0-or-later

{fondi-0.2.0 → fondi-0.2.1.dev22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fondi"
-version = "0.2.0"
+version = "0.2.1.dev22"
 authors = [
   { name="Valter Yde Daugberg", email="valteryde@hotmail.com" },
 ]

{fondi-0.2.0 → fondi-0.2.1.dev22}/src/fondi/backends/svg.py

@@ -85,6 +85,14 @@ def _fondi_y_to_svg(y: float, scene_height: float) -> float:
     return scene_height - y
 
 
+def _ascii_safe_svg_markup(svg: str) -> str:
+    """Replace non-ASCII with numeric entities for pdflatex / includesvg."""
+    return "".join(
+        ch if ord(ch) < 128 else f"&#{ord(ch)};"
+        for ch in svg
+    )
+
+
 def _flip_x_transform(x: float, width: float) -> str:
     cx = round(x + width / 2, 3)
     return f"translate({cx},0) scale(-1,1) translate({-cx},0)"
@@ -203,7 +211,9 @@ def render_svg(
     group = SubElement(root, "g")
     for node in scene.children:
         _append_node(group, node, height)
-    return '<?xml version="1.0" encoding="UTF-8"?>\n' + tostring(root, encoding="unicode")
+    return '<?xml version="1.0" encoding="UTF-8"?>\n' + _ascii_safe_svg_markup(
+        tostring(root, encoding="unicode")
+    )
 
 
 def save_svg_bundle(

{fondi-0.2.0 → fondi-0.2.1.dev22}/src/fondi/layout/scene_builder.py

@@ -101,8 +101,20 @@ def collect_children(
                     )
                 )
             elif isinstance(layout, MathText):
+                if scene_corner is not None:
+                    child_corner = (
+                        corner_x + layout.getLeft() - lx,
+                        corner_y + layout.getBottom() - ly,
+                    )
+                else:
+                    child_corner = (
+                        layout.getLeft() - rox,
+                        layout.getBottom() - roy,
+                    )
                 nodes.extend(
-                    layout.collect_scene(relayout=False, root=(rox, roy))
+                    layout.collect_scene(
+                        child_corner, relayout=False, root=(rox, roy)
+                    )
                 )
             else:
                 if scene_corner is not None:

{fondi-0.2.0 → fondi-0.2.1.dev22}/src/fondi/layout/sqrt.py

@@ -2,7 +2,7 @@
 from .helper import boundingBox, unwrap_macro_arg
 from .layout import Layout, MACROS
 from ..mathtext import MathText
-from .scene_builder import collect_children, composite_origin
+from .scene_builder import collect_children
 from ..scene import Polyline
 import math
 
@@ -47,8 +47,10 @@ class SqrtLayout(Layout):
         nodes = collect_children(
             self, (bx, by), self.inner, root=root, scene_corner=corner
         )
+        # Radical points were authored for top-down image coords; flip y for fondi.
         points = [
-            (origin_x + px, origin_y + py) for px, py in self._sqrt_points
+            (origin_x + px, origin_y + self.height - py)
+            for px, py in self._sqrt_points
         ]
         nodes.append(
             Polyline(points, self.color, self.linewidth)

{fondi-0.2.0 → fondi-0.2.1.dev22/src/fondi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fondi
-Version: 0.2.0
+Version: 0.2.1.dev22
 Summary: LaTeX-like math renderer with PNG and SVG output
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 License: GPL-3.0-or-later

{fondi-0.2.0 → fondi-0.2.1.dev22}/tests/test.py

@@ -16,7 +16,7 @@ class TestMethods:
     def __createMathText__(self, mathtext, filename, fontsize=50, color=(255,255,255,255)):
         txt = fondi.MathText(mathtext, fontsize, color)
         txt.image.save(BASEDIR / filename)
-        
+        txt.save_svg(BASEDIR / filename.replace('.png', '.svg'))
 
     def testPolynomen(self):
         self.__createMathText__('2*x_{5}^{2}+7^{2}_{1}', 'images/polynomen.png')
@@ -87,6 +87,11 @@ class TestMethods:
         self.__createMathText__('a_{ijk} + b^{xyz} + c_{a+b}^{m+n} + a_{bc_{ak}}', 'images/subscript_multiple_characters.png')
 
 
+    def testGreekLetters(self):
+        self.__createMathText__('\\alpha + \\beta + \\gamma + \\Gamma + \\delta + \\Delta + \\eta + \\epsilon + \\theta + \\kappa + \\mu + \\lambda + \\tau + \\sigma + \\Sigma + \\phi + \\chi + \\psi + \\omega + \\Omega + \\pi + \\prime', 'images/greek_letters.png')
+        
+
+
 if __name__ == '__main__':
     TestMethods().run()
     #TestMethods().testPara()

{fondi-0.2.0 → fondi-0.2.1.dev22}/tests/test_svg.py

@@ -110,6 +110,22 @@ def test_svg_raster_symbols_are_tinted():
     assert pixel is not None
 
 
+def test_nested_mathtext_argument_after_text_is_visible():
+    from fondi.scene import TextRun
+
+    mt = fondi.MathText(
+        r"\text{ [s] }{ v_q=12.5 }",
+        50,
+        COLOR,
+    )
+    scene = mt.scene()
+    runs = [n for n in scene.children if isinstance(n, TextRun)]
+    assert {n.text for n in runs} == {" [s] ", "v", "q", "=", "12.5"}
+    assert all(n.x >= 0 for n in runs)
+    xs = sorted(n.x for n in runs)
+    assert xs == sorted(xs), "text runs should appear left-to-right"
+
+
 def test_cases_scene_fits_rightmost_text():
     from fondi.metrics import measure_text
     from fondi.scene import TextRun
@@ -200,6 +216,19 @@ def test_square_brackets_in_cases_do_not_overlap_brace():
     assert bracket_left > brace_right
 
 
+def test_svg_greek_letters_are_ascii_safe():
+    mt = fondi.MathText(r"\alpha + \omega", 50, COLOR)
+    svg = mt.to_svg(embed_fonts=False)
+    assert "ω" not in svg
+    assert "α" not in svg
+    assert "ω" in svg
+    assert "α" in svg
+    root = ET.fromstring(svg)
+    texts = [el.text for el in root.iter() if el.tag.endswith("text")]
+    assert "ω" in texts
+    assert "α" in texts
+
+
 def test_save_svg_skip_copy_fonts():
     import tempfile
 
@@ -260,10 +289,12 @@ if __name__ == "__main__":
     test_save_svg_bundle_writes_fonts()
     test_svg_raster_symbols_are_tinted()
     test_cases_scene_fits_rightmost_text()
+    test_nested_mathtext_argument_after_text_is_visible()
     test_svg_raster_symbols_use_y_up_placement()
     test_square_brackets_wrap_content()
     test_round_parens_use_vector_delimiters()
     test_square_brackets_in_cases_do_not_overlap_brace()
     test_save_svg_skip_copy_fonts()
+    test_svg_greek_letters_are_ascii_safe()
     write_gallery()
     print(f"test_svg: ok — SVG files written to {SVG_DIR}")

{fondi-0.2.0 → fondi-0.2.1.dev22}/src/fondi/parser/parser.py

@@ -328,12 +328,12 @@ def parse_(expr):
     cprint(tokens)
     tokens = catchDoubleBiCommands(tokens)
     cprint(tokens)
+    tokens = combineCharsToWords(tokens)
+    cprint(tokens)
     tokens = rearrangeBidirection(tokens)
     cprint(tokens)
     tokens = combine(tokens)
     cprint(tokens)
-    tokens = combineCharsToWords(tokens)
-    cprint(tokens)
 
     print('---------E----------')
 
@@ -345,9 +345,9 @@ def parse(expr):
     tokens = combine(tokens)
     tokens = translate(tokens)
     tokens = catchDoubleBiCommands(tokens)
+    tokens = combineCharsToWords(tokens)
     tokens = rearrangeBidirection(tokens)
     tokens = combine(tokens)
-    tokens = combineCharsToWords(tokens)
 
     return tokens