kaxe 1.4.4.dev5__tar.gz → 1.4.4.dev7__tar.gz

{kaxe-1.4.4.dev5/src/kaxe.egg-info → kaxe-1.4.4.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.4.4.dev5
+Version: 1.4.4.dev7
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe

{kaxe-1.4.4.dev5 → kaxe-1.4.4.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaxe"
-version = "1.4.4.dev5"
+version = "1.4.4.dev7"
 authors = [
   { name="Valter Yde Daugberg", email="valteryde@hotmail.com" },
 ]

{kaxe-1.4.4.dev5 → kaxe-1.4.4.dev7}/src/kaxe/core/svg_pdf.py

@@ -21,6 +21,7 @@ if TYPE_CHECKING:
 
 _PDF_INSTALL_HINT = "PDF export requires reportlab. Install with: pip install kaxe[pdf]"
 _FONDI_FONTS_REGISTERED = False
+_REGISTERED_PDF_FONTS: set[str] = set()
 _OTF_TTF_CACHE: dict[str, bytes] = {}
 
 _TRANSFORM_RE = re.compile(
@@ -137,6 +138,7 @@ def _convert_otf_to_ttf_bytes(otf_path: os.PathLike[str]) -> bytes:
         for g in glyf.glyphs.values()
     )
     maxp.compile(font)
+    font["maxp"] = maxp
 
     post = font["post"]
     post.formatType = 2.0
@@ -182,6 +184,7 @@ def _register_fondi_fonts() -> None:
                 else:
                     data = candidate.read_bytes()
                 pdfmetrics.registerFont(TTFont(name, io.BytesIO(data)))
+                _REGISTERED_PDF_FONTS.add(name)
                 return True
             except Exception as exc:
                 logging.warning("Could not register PDF font %s from %s: %s", name, candidate, exc)
@@ -209,10 +212,13 @@ def _register_fondi_fonts() -> None:
 
 
 def _resolve_font_name(family: Optional[str], style: Optional[str]) -> str:
-    if family == "FondiNewCM" and style == "italic":
-        return "FondiNewCM-Italic"
     if family == "FondiNewCM":
-        return "FondiNewCM"
+        if style == "italic" and "FondiNewCM-Italic" in _REGISTERED_PDF_FONTS:
+            return "FondiNewCM-Italic"
+        if "FondiNewCM" in _REGISTERED_PDF_FONTS:
+            return "FondiNewCM"
+        logging.warning("FondiNewCM unavailable; using Helvetica for PDF text")
+        return "Helvetica"
     if family:
         logging.warning("Unknown PDF font family %r; using Helvetica", family)
     return "Helvetica"
@@ -256,16 +262,20 @@ def _is_identity(matrix: _Matrix, tol: float = 1e-9) -> bool:
 
 
 def _matrix_to_reportlab_transform(matrix: _Matrix, height: int, *, nested: bool) -> list[float]:
-    """Map SVG-local y-down coords to ReportLab parent coords via Group.transform."""
-    # Conjugate y-down SVG affine with flip-to-y-up: T(height) * M * F, F:(x,y)->(x,-y)
-    f = height if not nested else 0.0
+    """Map SVG-local y-down coords to ReportLab via Group.transform.
+
+    Child shapes use local coords (x, -y_svg). For a parent SVG transform
+    [a b c d e f], the equivalent ReportLab affine is
+    [a, -b, -c, d, e, height - f] at the document root, or
+    [a, -b, -c, d, e, -f] inside an already-flipped parent group.
+    """
     return [
         matrix.a,
         -matrix.b,
         -matrix.c,
         matrix.d,
         matrix.e,
-        f + matrix.f,
+        height - matrix.f if not nested else -matrix.f,
     ]
 
 

{kaxe-1.4.4.dev5 → kaxe-1.4.4.dev7/src/kaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.4.4.dev5
+Version: 1.4.4.dev7
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe