foundrytools-cli 1.1.9__tar.gz → 1.1.10__tar.gz

{foundrytools-cli-1.1.9/foundrytools_cli.egg-info → foundrytools-cli-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.9
+Version: 1.1.10
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10}/foundryToolsCLI/CLI/ftcli_fix.py

@@ -1,10 +1,15 @@
-from typing import Optional
+from typing import Any, Dict, Optional, Union
 
 from copy import deepcopy
 from pathlib import Path
 
 import click
 from fontTools.misc.cliTools import makeOutputFileName
+from fontTools.misc.psCharStrings import T2CharString
+from fontTools.pens.t2CharStringPen import T2CharStringPen
+from fontTools.pens.ttGlyphPen import TTGlyphPen
+from fontTools.ttLib.tables._g_l_y_f import Glyph
+from fontTools.ttLib.ttGlyphSet import _TTGlyphSetCFF, _TTGlyphSetGlyf
 
 from foundryToolsCLI.Lib.tables.OS_2 import TableOS2
 from foundryToolsCLI.Lib.tables.hhea import TableHhea
@@ -17,11 +22,172 @@ from foundryToolsCLI.Lib.utils.click_tools import (
     add_common_options,
 )
 from foundryToolsCLI.Lib.utils.logger import logger, Logs
+from foundryToolsCLI.Lib.utils.skia_tools import is_empty_glyph
 from foundryToolsCLI.Lib.utils.timer import Timer
 
 fix_fonts = click.Group("subcommands")
 
 
+@fix_fonts.command()
+@add_file_or_path_argument()
+@add_recursive_option()
+@add_common_options()
+@Timer(logger=logger.info)
+def empty_notdef(
+    input_path: Path,
+    recursive: bool = False,
+    output_dir: Optional[Path] = None,
+    recalc_timestamp: bool = False,
+    overwrite: bool = True,
+):
+    """
+    Fix empty .notdef glyph.
+
+    Draw a simple rectangle to fill the empty .notdef glyph.
+
+    Rationale:
+
+    Glyph 0 must be assigned to a .notdef glyph. The .notdef glyph is very important for providing
+    the user feedback that a glyph is not found in the font. This glyph should not be left without
+    an outline as the user will only see what looks like a space if a glyph is missing and not be
+    aware of the active font’s limitation.
+
+    Fixing procedure:
+
+    * Draw a simple rectangle to fill the empty .notdef glyph
+    """
+
+    def _draw_empty_notdef_cff(
+            glyph_set: _TTGlyphSetCFF, width: int, height: int, thickness: int
+    ) -> T2CharString:
+        """
+        Draws an empty .notdef glyph in a CFF font.
+
+        Parameters:
+            glyph_set (_TTGlyphSetCFF): The glyph set to which the .notdef glyph belongs.
+            width (int): The width of the .notdef glyph.
+            height (int): The height of the .notdef glyph.
+            thickness (int): The thickness of the .notdef glyph.
+
+        Returns:
+            None
+        """
+
+        pen = T2CharStringPen(width=width, glyphSet=glyph_set)
+        notdef_glyph = glyph_set[".notdef"]
+
+        # Draw the outer contour (clockwise)
+        pen.moveTo((0, 0))
+        pen.lineTo((width, 0))
+        pen.lineTo((width, height))
+        pen.lineTo((0, height))
+        pen.closePath()
+
+        # Draw the inner contour (counterclockwise)
+        pen.moveTo((thickness, thickness))
+        pen.lineTo((thickness, height - thickness))
+        pen.lineTo((width - thickness, height - thickness))
+        pen.lineTo((width - thickness, thickness))
+        pen.closePath()
+
+        notdef_glyph.draw(pen)
+        charstring = pen.getCharString()
+        charstring.compile()
+        return charstring
+
+    def _draw_empty_notdef_glyf(
+            glyph_set: Union[Dict[str, Any], _TTGlyphSetGlyf], width: int, height: int,
+            thickness: int
+    ) -> Glyph:
+        """
+        Draws an empty .notdef glyph in a glyf font.
+
+        Parameters:
+            glyph_set (_TTGlyphSetGlyf): The glyph set to which the .notdef glyph belongs.
+            width (int): The width of the .notdef glyph.
+            height (int): The height of the .notdef glyph.
+            thickness (int): The thickness of the .notdef glyph.
+
+        Returns:
+            None
+        """
+        pen = TTGlyphPen(glyphSet=glyph_set)
+        notdef_glyph = glyph_set['.notdef']
+
+        # Draw the outer contour (clockwise)
+        pen.moveTo((0, 0))
+        pen.lineTo((0, height))
+        pen.lineTo((width, height))
+        pen.lineTo((width, 0))
+        pen.closePath()
+
+        # Draw the inner contour (clockwise)
+        pen.moveTo((thickness, thickness))
+        pen.lineTo((width - thickness, thickness))
+        pen.lineTo((width - thickness, height - thickness))
+        pen.lineTo((thickness, height - thickness))
+        pen.closePath()
+
+        notdef_glyph.draw(pen)
+        return pen.glyph()
+
+    fonts = get_fonts_in_path(
+        input_path=input_path, recursive=recursive, recalc_timestamp=recalc_timestamp
+    )
+    if not initial_check_pass(fonts=fonts, output_dir=output_dir):
+        return
+
+    for font in fonts:
+        try:
+            file = Path(font.reader.file.name)
+            output_file = Path(makeOutputFileName(file, outputDir=output_dir, overWrite=overwrite))
+
+            logger.opt(colors=True).info(Logs.checking_file, file=file)
+
+            glyph_set = font.getGlyphSet()
+
+            if ".notdef" not in glyph_set:
+                logger.warning("Font does not contain a .notdef glyph")
+                logger.skip(Logs.file_not_changed, file=file)
+                continue
+
+            if not is_empty_glyph(glyph_set=glyph_set, glyph_name='.notdef'):
+                logger.warning("The .notdef glyph is not empty")
+                logger.skip(Logs.file_not_changed, file=file)
+                continue
+
+            width = round(font['head'].unitsPerEm / 1000 * 600)
+            # The sCapHeight attribute is defined in the OS/2 version 2 and later. If the attribute
+            # is not present, the height is calculated as a percentage of the width.
+            try:
+                height = font["OS/2"].sCapHeight
+            except AttributeError:
+                height = round(width * 1.25)
+            thickness = round(width / 10)
+
+            if font.is_otf:
+                cff_table = font["CFF "]
+                charstring = _draw_empty_notdef_cff(
+                    glyph_set=glyph_set, width=width, height=height, thickness=thickness
+                )
+                cff_table.cff.topDictIndex[0].CharStrings[".notdef"].bytecode = charstring.bytecode
+
+            else:
+                glyph = _draw_empty_notdef_glyf(
+                    glyph_set=glyph_set, width=width, height=height, thickness=thickness
+                )
+                font["glyf"][".notdef"] = glyph
+
+            font["hmtx"][".notdef"] = (width, 0)
+            font.save(output_file)
+            logger.success(Logs.file_saved, file=output_file)
+
+        except Exception as e:
+            logger.exception(e)
+        finally:
+            font.close()
+
+
 @fix_fonts.command()
 @add_file_or_path_argument()
 @add_recursive_option()

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10}/foundryToolsCLI/Lib/Font.py

@@ -359,7 +359,6 @@ class Font(TTFont):
         return self.get_glyph_bounds("H")["yMax"]
 
     def recalc_avg_char_width(self) -> int:
-        avg_char_width = 0
         avg_char_width = self["OS/2"].recalcAvgCharWidth(self)
         return avg_char_width
 
@@ -1017,8 +1016,8 @@ class Font(TTFont):
                 else:
                     return 0
             except KeyError:
-                pass
-            return 0
+                continue
+        raise ValueError("The font does not contain the glyph 'H' or 'uni0048'.")
 
     def check_italic_angle(self, min_slant: float = 2.0) -> bool:
         # Allow .1 degrees tolerance

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10}/foundryToolsCLI/Lib/converters/ttf_to_otf.py

@@ -86,8 +86,7 @@ class TTF2OTFRunner(object):
                 cff_font.save(output_file)
                 cff_font = Font(output_file, recalcTimestamp=False)
                 cff_font.otf_fix_contours(min_area=25, verbose=False)
-                cff_font.recalc_avg_char_width()
-                cff_font.recalc_max_context()
+                cff_font["OS/2"].xAvgCharWidth = cff_font.recalc_avg_char_width()
 
                 if self.options.subroutinize:
                     cff_font.otf_subroutinize()

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10}/foundryToolsCLI/Lib/utils/skia_tools.py

@@ -7,6 +7,7 @@ from fontTools.pens.t2CharStringPen import T2CharStringPen, T2CharString
 from fontTools.pens.ttGlyphPen import TTGlyphPen
 from fontTools.ttLib import ttFont
 from fontTools.ttLib.tables import _g_l_y_f
+from fontTools.ttLib.ttGlyphSet import _TTGlyphSet
 
 from foundryToolsCLI.Lib.utils.logger import logger, Logs
 
@@ -166,3 +167,19 @@ def skia_path_from_glyph_component(component: _g_l_y_f.GlyphComponent, glyph_set
     base_glyph_name, transformation = component.getComponentInfo()
     path = skia_path_from_glyph(base_glyph_name, glyph_set)
     return path.transform(*transformation)
+
+
+def is_empty_glyph(glyph_set: _TTGlyphSet, glyph_name: str) -> bool:
+    """
+    Returns True if the glyph is empty.
+
+    Parameters:
+        glyph_set (_TTGlyphSet): The glyph set.
+        glyph_name (str): The name of the glyph.
+
+    Returns:
+        bool: True if the glyph is empty.
+    """
+
+    path = skia_path_from_glyph(glyph_name=glyph_name, glyph_set=glyph_set)
+    return path.area == 0

foundrytools-cli-1.1.10/foundryToolsCLI/__init__.py

@@ -0,0 +1,3 @@
+VERSION = __version__ = "1.1.10"
+
+__all__ = ["VERSION"]

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.9
+Version: 1.1.10
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI

{foundrytools-cli-1.1.9 → foundrytools-cli-1.1.10}/setup.py

@@ -18,7 +18,7 @@ def _get_requirements():
 
 setuptools.setup(
     name="foundrytools-cli",
-    version="1.1.9",
+    version="1.1.10",
     description="A set of command line tools to inspect, manipulate and convert font files",
     long_description=long_description,
     long_description_content_type="text/markdown",

foundrytools-cli-1.1.9/foundryToolsCLI/__init__.py

@@ -1,3 +0,0 @@
-VERSION = __version__ = "1.1.9"
-
-__all__ = ["VERSION"]