PyPI - var2stat - Versions diffs - 0.2.0__tar.gz → 0.2.1__tar.gz - Mend

var2stat 0.2.0tar.gz → 0.2.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

var2stat-0.2.1/.release-please-manifest.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {".":"0.2.1"}

{var2stat-0.2.0 → var2stat-0.2.1}/CHANGELOG.md RENAMED Viewed

@@ -1,5 +1,12 @@
 # Changelog
+## [0.2.1](https://github.com/decipher3114/Var2Stat/compare/var2stat-v0.2.0...var2stat-v0.2.1) (2026-05-13)
+### Bug Fixes
+* force canonical and valid name format ([4263ad3](https://github.com/decipher3114/Var2Stat/commit/4263ad306f92f163459cab390f22e3892896ee63))
 ## [0.2.0](https://github.com/decipher3114/Var2Stat/compare/var2stat-v0.1.1...var2stat-v0.2.0) (2026-04-13)

{var2stat-0.2.0 → var2stat-0.2.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: var2stat
-Version: 0.2.0
+Version: 0.2.1
 Summary: Convert variable fonts to static font instances
 License-File: LICENSE
 Requires-Python: >=3.14

{var2stat-0.2.0 → var2stat-0.2.1}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name            = "var2stat"
-version         = "0.2.0"
+version         = "0.2.1"
 description     = "Convert variable fonts to static font instances"
 readme          = "README.md"
 requires-python = ">=3.14"

{var2stat-0.2.0 → var2stat-0.2.1}/src/var2stat/config.py RENAMED Viewed

@@ -7,7 +7,8 @@ from typing import Any, Dict
 import click
 from fontTools.ttLib import TTFont
-SCHEMA = "https://raw.githubusercontent.com/decipher3114/Var2Stat/refs/heads/main/schema.json"
+SCHEMA_URL = "https://raw.githubusercontent.com/decipher3114/Var2Stat/refs/heads/main/var2stat/src/schema.json"
+_SCHEMA_PATH = Path(__file__).resolve().with_name("schema.json")
 WEIGHT_NAMES: Dict[int, str] = {
     100: "Thin",
@@ -128,7 +129,7 @@ def create_config_structure(font_info: Dict[str, Any]) -> Dict[str, Any]:
         optimized_variants[variant_name] = optimized_variant
     return {
-        "$schema": SCHEMA,
+        "$schema": SCHEMA_URL,
         "file": font_info["font_path"],
         "font_name": font_info["font_name"],
         "axes": global_axes,

{var2stat-0.2.0 → var2stat-0.2.1}/src/var2stat/generate.py RENAMED Viewed

@@ -2,16 +2,15 @@
 import json
 import os
+import re
 from pathlib import Path
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict
 import click
 import jsonschema
 from fontTools.ttLib import TTFont
 from fontTools.varLib import instancer
-SCHEMA_URL = "https://raw.githubusercontent.com/decipher3114/Var2Stat/refs/heads/main/schema.json"
 def load_config(config_path: str) -> Dict[str, Any]:
     if not os.path.exists(config_path):
@@ -24,20 +23,20 @@ def load_config(config_path: str) -> Dict[str, Any]:
     except json.JSONDecodeError as e:
         raise ValueError(f"Invalid JSON syntax at line {e.lineno}, column {e.colno}")
-    # Validate against schema if available
-    schema_ref = config_data.get("$schema")
-    if schema_ref == SCHEMA_URL and os.path.exists("schema.json"):
-        try:
-            with open("schema.json", "r", encoding="utf-8") as f:
-                schema = json.load(f)
-            jsonschema.validate(config_data, schema)
-            print("[INFO]: Config validated")
-        except jsonschema.ValidationError as e:
-            error_msg = e.message
-            if e.absolute_path:
-                path_str = " -> ".join(str(p) for p in e.absolute_path)
-                error_msg += f" at {path_str}"
-            raise ValueError(error_msg)
+    # Validate against the packaged schema.
+    schema_path = Path(__file__).resolve().with_name("schema.json")
+    with open(schema_path, "r", encoding="utf-8") as f:
+        schema = json.load(f)
+    try:
+        jsonschema.validate(config_data, schema)
+        print("[INFO]: Config validated against schema")
+    except jsonschema.ValidationError as e:
+        error_msg = e.message
+        if e.absolute_path:
+            path_str = " -> ".join(str(p) for p in e.absolute_path)
+            error_msg += f" at {path_str}"
+        raise ValueError(error_msg)
     return config_data
@@ -51,17 +50,22 @@ def remove_variation_tables(font: TTFont) -> None:
             del font[table]
+_CANONICAL_FILENAME_RE = re.compile(r"[^0-9A-Za-z]+")
+def canonicalize_name_for_filename(value: str, fallback: str) -> str:
+    # Convert all non-alphanumeric characters (including spaces) into '_',
+    # and collapse runs via the regex '+'.
+    canonical = _CANONICAL_FILENAME_RE.sub("_", (value or "").strip()).strip("_")
+    return canonical or fallback
 def canonicalize_font_name(font_name: str) -> str:
-    # Create a canonical font name suitable for filenames/directories:
-    # - replace invalid path characters with "_"
-    # - remove spaces
-    # - fallback to "Font" if empty
-    canonical_font_name = "".join(
-        ch if ch not in '<>:"/\\|?*' else "_" for ch in font_name
-    ).replace(" ", "").strip()
-    if not canonical_font_name:
-        canonical_font_name = "Font"
-    return canonical_font_name
+    return canonicalize_name_for_filename(font_name, fallback="Font")
+def canonicalize_variant(variant: str) -> str:
+    return canonicalize_name_for_filename(variant, fallback="Variant")
 def encode(record, text: str) -> bytes:
@@ -73,8 +77,9 @@ def encode(record, text: str) -> bytes:
     else:
         return text.encode("utf-16-be")
 def update_font_names(
-    font: TTFont, font_name: str, variant_name: str, axes: Dict[str, Union[int, float]]
+    font: TTFont, font_name: str, variant_name: str, axes: Dict[str, float | int]
 ) -> None:
     # Update font metadata and naming information
     name_table = font["name"]
@@ -134,8 +139,8 @@ def generate_variant(
     font: TTFont,
     font_name: str,
     variant_name: str,
-    variant_config: Dict[str, Union[int, float]],
-    global_axes: Dict[str, Optional[Union[int, float]]],
+    variant_config: Dict[str, float | int],
+    global_axes: Dict[str, float | int | None],
     font_defaults: Dict[str, float],
     output_folder: str,
 ) -> bool:
@@ -163,7 +168,8 @@ def generate_variant(
         # Save font
         canonical_font_name = canonicalize_font_name(font_name)
-        output_filename = f"{canonical_font_name}_{variant_name}.ttf"
+        canonical_variant_name = canonicalize_variant(variant_name)
+        output_filename = f"{canonical_font_name}_{canonical_variant_name}.ttf"
         static_font.save(os.path.join(output_folder, output_filename))
         return True

var2stat-0.2.1/src/var2stat/schema.json ADDED Viewed

@@ -0,0 +1,182 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/decipher3114/Var2Stat",
+    "title": "Var2Stat Configuration",
+    "description": "Configuration schema for generating static fonts from variable fonts",
+    "type": "object",
+    "required": [
+        "file",
+        "font_name",
+        "axes",
+        "variants"
+    ],
+    "definitions": {
+        "axes": {
+            "type": "object",
+            "properties": {
+                "wght": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "minimum": 1,
+                    "maximum": 1000,
+                    "description": "Weight axis (1-1000, typically 100-900)"
+                },
+                "wdth": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "minimum": 25,
+                    "maximum": 200,
+                    "description": "Width axis (25-200%, typically 50-200)"
+                },
+                "opsz": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "minimum": 6,
+                    "maximum": 144,
+                    "description": "Optical size axis (6-144pt)"
+                },
+                "slnt": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "minimum": -90,
+                    "maximum": 90,
+                    "description": "Slant axis (-90° to 90°)"
+                },
+                "ital": {
+                    "anyOf": [
+                        {
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Italic axis (0=roman, 1=italic)"
+                },
+                "GRAD": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "minimum": -200,
+                    "maximum": 300,
+                    "description": "Grade axis (-200 to 300)"
+                },
+                "ROND": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Roundness axis"
+                },
+                "CASL": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Casual axis"
+                },
+                "CRSV": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Cursive axis"
+                },
+                "MONO": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Monospace axis"
+                },
+                "SOFT": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Softness axis"
+                },
+                "WONK": {
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "description": "Wonky axis"
+                }
+            },
+            "additionalProperties": {
+                "type": [
+                    "number",
+                    "null"
+                ],
+                "description": "Custom axis value"
+            }
+        }
+    },
+    "properties": {
+        "$schema": {
+            "type": "string",
+            "description": "JSON schema reference"
+        },
+        "file": {
+            "type": "string",
+            "description": "Path to the variable font file",
+            "pattern": "\\.(ttf|otf)$"
+        },
+        "font_name": {
+            "type": "string",
+            "minLength": 1,
+            "allOf": [
+                {
+                    "pattern": "^\\S(?:.*\\S)?$"
+                },
+                {
+                    "pattern": ".*[0-9A-Za-z].*"
+                }
+            ],
+            "description": "Target font family name for generated static fonts (non-empty after trimming; must contain at least one letter/digit)"
+        },
+        "axes": {
+            "allOf": [
+                {
+                    "$ref": "#/definitions/axes"
+                }
+            ],
+            "description": "Global axis default values for all variants"
+        },
+        "variants": {
+            "type": "object",
+            "description": "Static font variants to generate (object keys are variant names)",
+            "minProperties": 1,
+            "propertyNames": {
+                "type": "string",
+                "minLength": 1,
+                "allOf": [
+                    {
+                        "pattern": "^\\S(?:.*\\S)?$"
+                    },
+                    {
+                        "pattern": ".*[0-9A-Za-z].*"
+                    }
+                ]
+            },
+            "additionalProperties": {
+                "$ref": "#/definitions/axes",
+                "description": "Variant-specific axis values"
+            }
+        }
+    },
+    "additionalProperties": false
+}

{var2stat-0.2.0 → var2stat-0.2.1}/uv.lock RENAMED Viewed

@@ -136,7 +136,7 @@ wheels = [
 [[package]]
 name = "var2stat"
-version = "0.1.0"
+version = "0.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

var2stat-0.2.0/.release-please-manifest.json DELETED Viewed

	@@ -1 +0,0 @@
1	- {".":"0.2.0"}

var2stat-0.2.0/schema.json DELETED Viewed

@@ -1,109 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://github.com/decipher3114/Var2Stat",
-    "title": "Var2Stat Configuration",
-    "description": "Configuration schema for generating static fonts from variable fonts",
-    "type": "object",
-    "required": ["file", "font_name", "axes", "variants"],
-    "definitions": {
-        "axes": {
-            "type": "object",
-            "properties": {
-                "wght": {
-                    "type": ["number", "null"],
-                    "minimum": 1,
-                    "maximum": 1000,
-                    "description": "Weight axis (1-1000, typically 100-900)"
-                },
-                "wdth": {
-                    "type": ["number", "null"],
-                    "minimum": 25,
-                    "maximum": 200,
-                    "description": "Width axis (25-200%, typically 50-200)"
-                },
-                "opsz": {
-                    "type": ["number", "null"],
-                    "minimum": 6,
-                    "maximum": 144,
-                    "description": "Optical size axis (6-144pt)"
-                },
-                "slnt": {
-                    "type": ["number", "null"],
-                    "minimum": -90,
-                    "maximum": 90,
-                    "description": "Slant axis (-90° to 90°)"
-                },
-                "ital": {
-                    "anyOf": [{ "enum": [0, 1] }, { "type": "null" }],
-                    "description": "Italic axis (0=roman, 1=italic)"
-                },
-                "GRAD": {
-                    "type": ["number", "null"],
-                    "minimum": -200,
-                    "maximum": 300,
-                    "description": "Grade axis (-200 to 300)"
-                },
-                "ROND": {
-                    "type": ["number", "null"],
-                    "description": "Roundness axis"
-                },
-                "CASL": {
-                    "type": ["number", "null"],
-                    "description": "Casual axis"
-                },
-                "CRSV": {
-                    "type": ["number", "null"],
-                    "description": "Cursive axis"
-                },
-                "MONO": {
-                    "type": ["number", "null"],
-                    "description": "Monospace axis"
-                },
-                "SOFT": {
-                    "type": ["number", "null"],
-                    "description": "Softness axis"
-                },
-                "WONK": {
-                    "type": ["number", "null"],
-                    "description": "Wonky axis"
-                }
-            },
-            "additionalProperties": {
-                "type": ["number", "null"],
-                "description": "Custom axis value"
-            }
-        }
-    },
-    "properties": {
-        "$schema": {
-            "type": "string",
-            "description": "JSON schema reference"
-        },
-        "file": {
-            "type": "string",
-            "description": "Path to the variable font file",
-            "pattern": "\\.(ttf|otf)$"
-        },
-        "font_name": {
-            "type": ["string", "null"],
-            "description": "Target font family name for generated static fonts"
-        },
-        "axes": {
-            "allOf": [{ "$ref": "#/definitions/axes" }],
-            "description": "Global axis default values for all variants"
-        },
-        "variants": {
-            "type": "object",
-            "description": "Static font variants to generate keys",
-            "minProperties": 1,
-            "patternProperties": {
-                "^[a-zA-Z ]+$": {
-                    "$ref": "#/definitions/axes",
-                    "description": "Variant-specific axis values"
-                }
-            },
-            "additionalProperties": false
-        }
-    },
-    "additionalProperties": false
-}