vttcompilepy 0.0.1.7__zip → 0.0.1.9__zip

{vttcompilepy-0.0.1.7 → vttcompilepy-0.0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vttcompilepy
-Version: 0.0.1.7
+Version: 0.0.1.9
 Summary: Python extension for Visual TrueType font compile. 
 Home-page: https://github.com/microsoft/VisualTrueType
 Author: Paul Linnerud
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+Requires-Dist: fonttools>=4.33.0
 
 # Project
 

vttcompilepy-0.0.1.9/setup.py

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+from io import open
+import os
+import sys
+import platform
+from setuptools import Extension, setup
+from Cython.Build import cythonize
+
+# from _version import __version__ as vttpy_version
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+# Get the long description from the pypi.md file
+with open(os.path.join(here, "pypi.md"), encoding="utf-8") as f:
+    long_description = f.read()
+
+define_macros = [("UNICODE", 1), ("_UNICODE", 1)]
+linetrace = False
+if int(os.environ.get("CYTHON_LINETRACE", "0")):
+    linetrace = True
+    define_macros.append(("CYTHON_TRACE_NOGIL", "1"))
+
+extra_compile_args = []
+
+if platform.system() != "Windows":
+    extra_compile_args.append("-std=c++14")
+
+if platform.system() == "Windows":
+    extra_compile_args.append("-sdl")
+
+extension = Extension(
+    "vttcompilepy.vttcompilepy",
+    define_macros=define_macros,
+    include_dirs=[".", "src"],
+    sources=[
+        "vttcompilepy/vttcompilepy.pyx",
+        "src/application.cpp",
+        "src/CvtManager.cpp",
+        "src/File.cpp",
+        "src/List.cpp",
+        "src/MathUtils.cpp",
+        "src/Memory.cpp",
+        "src/Platform.cpp",
+        "src/TextBuffer.cpp",
+        "src/TMTParser.cpp",
+        "src/TTAssembler.cpp",
+        "src/TTEngine.cpp",
+        "src/TTFont.cpp",
+        "src/TTGenerator.cpp",
+        "src/Variation.cpp",
+        "src/VariationInstance.cpp",
+        "src/VariationModels.cpp",
+        "src/ttiua.cpp",
+    ],
+    language="c++",
+    extra_compile_args=extra_compile_args,
+)
+
+setup(
+    name="vttcompilepy",
+    # version= vttpy_version,
+    version="0.0.1.9",
+    description="Python extension for Visual TrueType font compile. ",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    author="Paul Linnerud",
+    author_email="paulli@microsoft.com",
+    url="https://github.com/microsoft/VisualTrueType",
+    license="MIT",
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+    ],
+    package_dir={"": "."},
+    packages=["vttcompilepy"],
+    zip_safe=False,
+    install_requires=[
+        "fonttools>=4.33.0",
+    ],
+    python_requires=">=3.7",
+    ext_modules=cythonize(
+        extension,
+        annotate=bool(int(os.environ.get("CYTHON_ANNOTATE", "0"))),
+        compiler_directives={"linetrace": linetrace},
+    ),
+    entry_points={
+        "console_scripts": [
+            "vttcompilepy = vttcompilepy.__main__:main",
+            "quit_to_glyphs = vttcompilepy.quit_to_glyphs:main",
+        ]
+    },
+)

{vttcompilepy-0.0.1.7 → vttcompilepy-0.0.1.9}/src/TextBuffer.cpp

@@ -122,9 +122,20 @@ void TextBuffer::SetText(int32_t textLen, const char text[])
 	}
 	else
 	{
-		std::string str(reinterpret_cast<const char*>(text), textLen);
-		std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-		std::wstring wstr = converter.from_bytes(str);
+		std::wstring wstr; 
+                std::string str(reinterpret_cast<const char*>(text), textLen);
+		try
+		{			
+			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+			wstr = converter.from_bytes(str);
+		}        
+                catch (const std::range_error)
+                {	
+                      // Some really old VTT source data has sequences that fail above conversion so we do a naive conversion as backup. 
+		      // Note that VTT desktop version of this code uses Windows MultiByteToWideChar() which seems more error resilient. 
+                      wstr.resize(str.length(), L' '); 
+		      std::copy(str.begin(), str.end(), wstr.begin());
+		}
 
 		this->SetText(wstr.length(), wstr.c_str()); 
 	}
@@ -354,4 +365,4 @@ bool TextBuffer::AssertTextSize(size_t deltaSize) {
 		this->text = tmpText;
 	}
 	return tmpText != NULL;
-} // TextBuffer::AssertTextSize
+} // TextBuffer::AssertTextSize

vttcompilepy-0.0.1.9/vttcompilepy/quit_to_glyphs.py

@@ -0,0 +1,115 @@
+import sys
+from fontTools.ttLib import TTFont
+import vttcompilepy as vtt
+import argparse
+
+
+def add_quit_to_glyph_program(
+    font_path, output_path, compile, start_index, end_index, remove, iterate
+):
+    try:
+        # Load the font
+        font = TTFont(font_path)
+
+        # Access the TSI3 table (if it exists)
+        if "TSI3" in font:
+            tsi3_table = font["TSI3"]
+            glyph_set = font.getGlyphSet()
+            num_glyphs = len(glyph_set)
+            if end_index is None:
+                end_index = num_glyphs - 1
+            glyph_ids = list(range(start_index, end_index + 1))
+            glyph_names = font.getGlyphNameMany(glyph_ids)
+            added = 0
+            removed = 0
+
+            for glyph_name, glyph_id in zip(glyph_names, glyph_ids):
+                if glyph_name not in tsi3_table.glyphPrograms:
+                    print(f"{glyph_name} id = {glyph_id} does not have a glyph program")
+                    continue
+                if iterate:
+                    try:
+                        print(f"Iterate - trying {glyph_name} id = {glyph_id}")
+                        compiler = vtt.Compiler(font)
+                        compiler.compile_glyph_range(glyph_id, glyph_id)
+
+                    except Exception:
+                        # If compilation fails, add quit()
+                        # Check if the glyph program already starts with "quit()"
+                        if not tsi3_table.glyphPrograms[glyph_name].startswith(
+                            "quit()"
+                        ):
+                            tsi3_table.glyphPrograms[glyph_name] = (
+                                "quit() \n" + tsi3_table.glyphPrograms[glyph_name]
+                            )
+                            print(f"Added quit() to {glyph_name} id = {glyph_id}")
+                            added += 1
+
+                # Add or remove "quit()" to/from the beginning of each glyphProgram
+                elif remove:
+                    # Check if the glyph program contains "quit()"
+                    if "quit()" in tsi3_table.glyphPrograms[glyph_name]:
+                        tsi3_table.glyphPrograms[glyph_name] = tsi3_table.glyphPrograms[
+                            glyph_name
+                        ].replace("quit()", "")
+                        print(f"Removed quit() from {glyph_name} id = {glyph_id}")
+                        removed += 1
+                else:
+                    # Check if the glyph program already starts with "quit()"
+                    if not tsi3_table.glyphPrograms[glyph_name].startswith("quit()"):
+                        tsi3_table.glyphPrograms[glyph_name] = (
+                            "quit() \n" + tsi3_table.glyphPrograms[glyph_name]
+                        )
+                        print(f"Added quit() to {glyph_name} id = {glyph_id}")
+                        added += 1
+
+            if compile or iterate:
+                # Compile the font
+                compiler = vtt.Compiler(font)
+                compiler.compile_all()
+                font = compiler.get_ttfont(vtt.StripLevel.STRIP_NOTHING)
+                print("Font compiled")
+
+            # Save the modified font to the output path
+            font.save(output_path)
+
+            print(f"Modified font saved to {output_path}")
+            print(f"Added quit() to {added} glyphs")
+            print(f"Removed quit() from {removed} glyphs")
+        else:
+            print("The font does not have a TSI3 table")
+
+    except Exception as e:
+        print(f"Error: {e}")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Add or remove quit to/from glyph program."
+    )
+    parser.add_argument("input_font_path", help="The path to the input font file.")
+    parser.add_argument("output_font_path", help="The path to the output font file.")
+    parser.add_argument("--compile", action="store_true", help="Compile the font.")
+    parser.add_argument("--start", type=int, default=0, help="Start glyph index.")
+    parser.add_argument("--end", type=int, default=None, help="End glyph index.")
+    parser.add_argument(
+        "--remove", action="store_true", help="Remove quit() from glyph program."
+    )
+    parser.add_argument(
+        "--iterate", action="store_true", help="Only add quit() to glyphs that need it."
+    )
+    args = parser.parse_args()
+
+    add_quit_to_glyph_program(
+        args.input_font_path,
+        args.output_font_path,
+        args.compile,
+        args.start,
+        args.end,
+        args.remove,
+        args.iterate,
+    )
+
+
+if __name__ == "__main__":
+    main()