fontforge-variable-font 0.2.0__tar.gz → 0.3.0__tar.gz

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/PKG-INFO

@@ -1,10 +1,14 @@
 Metadata-Version: 2.4
 Name: fontforge_variable_font
-Version: 0.2.0
+Version: 0.3.0
 Summary: A FontForge_plugin to create a variable font
 Home-page: https://github.com/MihailJP/fontforge-variable-font
 Author: MihailJP
 Author-email: mihailjp@gmail.com
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Text Processing :: Fonts
@@ -330,6 +334,25 @@ Deletes VF data.
 > [!WARNING]
 > You will see **no** warning.
 
+### Hooks
+
+This plugin installs new/open font hooks which does:
+
+- sets font generation hooks to output VF if metadata exists
+  - If you export a TTF or a WOFF2 when VF metadata exists, you will be
+    asked if you intend a VF. In this case too, all the masters must be
+    opened beforehands, however unlike the dedicated menu, VF-specific
+    options or italic counterpart cannot be set.
+  - For technical reason, first the static font gets exported as usual,
+    then VF overwrites it. Failed attempt of exporting a VF leaves the
+    static font.
+- loads VF-specific metadata if available
+  - If you load a variable font from the ordinary 'load' menu, you will be
+    asked if you will open additional instances and which one(s.)
+
+> [!NOTE]
+> These hooks work in interactive mode only.
+
 ### Script usage
 
 As a Python module, in addition to `fontforge` module, scripting to export

fontforge_variable_font-0.2.0/fontforge_variable_font.egg-info/PKG-INFO → fontforge_variable_font-0.3.0/README.md

@@ -1,20 +1,3 @@
-Metadata-Version: 2.4
-Name: fontforge_variable_font
-Version: 0.2.0
-Summary: A FontForge_plugin to create a variable font
-Home-page: https://github.com/MihailJP/fontforge-variable-font
-Author: MihailJP
-Author-email: mihailjp@gmail.com
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Text Processing :: Fonts
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: fonttools
-Requires-Dist: fontmake
-Dynamic: license-file
-
 Fontforge Variable Font Plugin
 ==============================
 
@@ -330,6 +313,25 @@ Deletes VF data.
 > [!WARNING]
 > You will see **no** warning.
 
+### Hooks
+
+This plugin installs new/open font hooks which does:
+
+- sets font generation hooks to output VF if metadata exists
+  - If you export a TTF or a WOFF2 when VF metadata exists, you will be
+    asked if you intend a VF. In this case too, all the masters must be
+    opened beforehands, however unlike the dedicated menu, VF-specific
+    options or italic counterpart cannot be set.
+  - For technical reason, first the static font gets exported as usual,
+    then VF overwrites it. Failed attempt of exporting a VF leaves the
+    static font.
+- loads VF-specific metadata if available
+  - If you load a variable font from the ordinary 'load' menu, you will be
+    asked if you will open additional instances and which one(s.)
+
+> [!NOTE]
+> These hooks work in interactive mode only.
+
 ### Script usage
 
 As a Python module, in addition to `fontforge` module, scripting to export

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/fontforgeVF/__main__.py

@@ -6,12 +6,30 @@ from fontforgeVF import (
     load
 )
 import fontforge
+from typing import Literal, Callable
+
+
+def _addHook(
+    name: Literal['newFontHook', 'loadFontHook'],
+    hook: Callable[[fontforge.font], None]
+):
+    assert isinstance(fontforge.hooks, dict)
+    if name in fontforge.hooks:
+        currentHook = fontforge.hooks[name]
+
+        def chainHook(font: fontforge.font):
+            currentHook(font)
+            hook(font)
+
+        fontforge.hooks[name] = chainHook
+    else:
+        fontforge.hooks[name] = hook
 
 
 def fontforge_plugin_init(**kw):
     fontforge.registerMenuItem(
         callback=load.loadMenu,
-        enable=load.loadEnable,
+        enable=None,
         context="Font",
         submenu=["_Variable Font", '_Open a variable font'],
         name="By named _instance...",
@@ -19,7 +37,7 @@ def fontforge_plugin_init(**kw):
     )
     fontforge.registerMenuItem(
         callback=load.loadMenu,
-        enable=load.loadEnable,
+        enable=None,
         context="Font",
         submenu=["_Variable Font", '_Open a variable font'],
         name="By _parameter...",
@@ -34,14 +52,14 @@ def fontforge_plugin_init(**kw):
     )
     fontforge.registerMenuItem(
         callback=design_axes.designAxesMenu,
-        enable=design_axes.designAxesEnable,
+        enable=None,
         context="Font",
         submenu="_Variable Font",
         name="Design _axes..."
     )
     fontforge.registerMenuItem(
         callback=instance.instanceMenu,
-        enable=instance.instanceEnable,
+        enable=None,
         context="Font",
         submenu="_Variable Font",
         name="Named _instances..."
@@ -53,3 +71,7 @@ def fontforge_plugin_init(**kw):
         submenu="_Variable Font",
         name="_Delete VF info"
     )
+
+    if fontforge.hasUserInterface:
+        _addHook('loadFontHook', load.loadHook)
+        _addHook('newFontHook', load.newFontHook)

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/fontforgeVF/design_axes.py

@@ -288,7 +288,7 @@ def _saveResult_labels(result, k, v):
             utils.setOrDeleteVFValue(font, valAddr + '.name',
                                      None if name == '' else name)
             utils.deleteVFValue(font, 'axes.' + k + '.labels.' + val + '.localNames')
-    for i in list(map(lambda x: x.replace('lang', ''), filter(lambda x: x.startswith('lang'), result))):
+    for i in (x.replace('lang', '') for x in result if x.startswith('lang')):
         if result['lang' + i] and result[k + 'labels' + i]:
             for val, name in list(zip(_x := iter(result[k + 'labels' + i].split(',')), _x)):
                 val = val.replace('.', ',')  # escape decimal point
@@ -301,7 +301,7 @@ def _saveResult_localNames(result, k, v):
     font = fontforge.activeFont()
     utils.setOrDeleteVFValue(font, 'axes.' + k + '.name', result[k + 'name'])
     utils.deleteVFValue(font, 'axes.' + k + '.localNames')
-    for i in list(map(lambda x: x.replace('lang', ''), filter(lambda x: x.startswith('lang'), result))):
+    for i in (x.replace('lang', '') for x in result if x.startswith('lang')):
         if result['lang' + i]:
             utils.setOrDeleteVFValue(
                 font, 'axes.' + k + '.localNames.' + result['lang' + i],
@@ -424,7 +424,3 @@ def designAxesMenu(u, glyph):
     result = fontforge.askMulti("Design axes", _prepareQuestions())
     if result:
         _saveResult(result)
-
-
-def designAxesEnable(u, glyph):
-    return True

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/fontforgeVF/export.py

@@ -20,33 +20,29 @@ __all__ = [
 
 
 def _getSourceFonts(defaultFont: fontforge.font, filterItalicRoman: bool | None = None) -> list[fontforge.font]:
-    tmpIter = filter(lambda f: f.familyname == defaultFont.familyname, fontforge.fonts())
+    tmpIter = (font for font in fontforge.fonts() if font.familyname == defaultFont.familyname)
     if filterItalicRoman is None:
         return list(tmpIter)
     else:
-        return list(filter(lambda f: getAxisValue(f, 'ital') == filterItalicRoman, tmpIter))
+        return [font for font in tmpIter if getAxisValue(font, 'ital') == filterItalicRoman]
 
 
 def _axisMinValue(defaultFont: fontforge.font, tag: str, filterItalicRoman: bool | None = None) -> int | float:
     return min(
-        filter(
-            lambda x: x is not None,
-            map(
-                lambda f: getAxisValue(f, tag),
-                _getSourceFonts(defaultFont, filterItalicRoman)
-            )
+        (
+            getAxisValue(f, tag) for f
+            in _getSourceFonts(defaultFont, filterItalicRoman)
+            if getAxisValue(f, tag) is not None
         )
     )
 
 
 def _axisMaxValue(defaultFont: fontforge.font, tag: str, filterItalicRoman: bool | None = None) -> int | float:
     return max(
-        filter(
-            lambda x: x is not None,
-            map(
-                lambda f: getAxisValue(f, tag),
-                _getSourceFonts(defaultFont, filterItalicRoman)
-            )
+        (
+            getAxisValue(f, tag) for f
+            in _getSourceFonts(defaultFont, filterItalicRoman)
+            if getAxisValue(f, tag) is not None
         )
     )
 
@@ -86,12 +82,7 @@ def _getFontSubFamilyName(font: fontforge.font, lang: str = 'English (US)') -> s
 def _isFixedPitch(font: fontforge.font) -> bool:
     return len(
         set(
-            map(
-                lambda x: x.width,
-                filter(
-                    lambda x: 0x20 <= x.unicode <= 0x7e, font.glyphs()
-                )
-            )
+            (glyph.width for glyph in font.glyphs() if 0x20 <= glyph.unicode <= 0x7e)
         )
     ) == 1
 
@@ -336,7 +327,7 @@ def _fixTtf_axes(font: fontforge.font, ttf: ttLib.TTFont):
         if utils.getVFValue(font, 'axes.' + k + '.active', False):
             localNames = utils.getVFValue(font, 'axes.' + k + '.localNames', {})
             for lang, name in localNames.items():
-                axis = list(filter(lambda x: x.axisTag == tag, ttf["fvar"].axes))
+                axis = [a for a in ttf["fvar"].axes if a.axisTag == tag]
                 if axis:
                     ttf['name'].setName(name, axis[0].axisNameID, 3, 1, lang)
 
@@ -426,10 +417,13 @@ def _exportVF(
             _doExportVF(font, tmpdir, italicFilename, tmpdir + '/vf2.designspace', options)
     except CalledProcessError as e:
         if fontforge.hasUserInterface():
+            cmd = e.cmd
+            if isinstance(cmd, str):
+                cmd = e.cmd.split(' ')
             fontforge.logWarning(e.stderr)
             fontforge.postError(
                 "Failed to export",
-                "'{0}' failed with return code {1}".format(e.cmd.split(' ')[0], e.returncode)
+                "'{0}' failed with return code {1}".format(cmd[0], e.returncode)
             )
         else:
             raise

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/fontforgeVF/instance.py

@@ -129,7 +129,7 @@ def _saveInstances(result: dict):
                 else:
                     instance[k] = utils.intOrFloat(result[k + '_' + str(cnt)])
             instance['localNames'] = {}
-            for lang in filter(lambda x: x.startswith('lang') and x.find('name') == -1, result.keys()):
+            for lang in (x for x in result.keys() if x.startswith('lang') and x.find('name') == -1):
                 if result[lang] and result[lang + 'name' + str(cnt)]:
                     instance['localNames'][utils.intOrFloat(result[lang])] = result[lang + 'name' + str(cnt)]
             instanceList.append(instance)
@@ -169,7 +169,3 @@ def instanceMenu(u, glyph):
     result = fontforge.askMulti("Named instances", _prepareQuestions())
     if result:
         _saveInstances(result)
-
-
-def instanceEnable(u, glyph):
-    return True

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/fontforgeVF/load.py

@@ -3,6 +3,7 @@ from fontforgeVF.utils import intOrFloat, checkExtensionTtfOrWoff2
 from os import PathLike
 from fontTools import ttLib
 import faulthandler
+from typing import Literal, Callable
 
 
 __all__ = [
@@ -42,10 +43,7 @@ def _loadInstanceNames(varfont: ttLib.TTFont, partial: ttLib.TTFont, postscriptN
 def _addNames(ttf: ttLib.TTFont, data: dict, nameID: int):
     data['name'] = ''
     data['localNames'] = {}
-    for name in filter(
-        lambda x: x.nameID == nameID and x.platformID == 3 and x.platEncID == 1,
-        ttf['name'].names
-    ):
+    for name in (n for n in ttf['name'].names if n.nameID == nameID and n.platformID == 3 and n.platEncID == 1):
         if name.langID == 0x409:
             data['name'] = str(name)
         else:
@@ -133,7 +131,7 @@ def _getVFData_STAT(ttf: ttLib.TTFont, vfData: dict):
 def _getVFData_customTags(ttf: ttLib.TTFont, vfData: dict):
     from fontforgeVF.design_axes import designAxes
 
-    customAxes = list(filter(lambda x: x not in designAxes.keys(), vfData['axes'].keys()))
+    customAxes = [axis for axis in vfData['axes'].keys() if axis not in designAxes.keys()]
     for i, a in enumerate(customAxes):
         if i < 3:
             vfData['axes']['custom' + str(i + 1)] = vfData['axes'][a]
@@ -186,7 +184,7 @@ def _doOpenVariableFont(
     from fontforgeVF.utils import initPersistentDict
     from pathlib import Path
 
-    axes = [a.axisTag for a in filter(lambda x: x.minValue < x.maxValue, varfont["fvar"].axes)]
+    axes = [a.axisTag for a in varfont["fvar"].axes if a.minValue < a.maxValue]
     if extra := set(axisValues.keys()) - set(axes):  # extra axes set
         fontforge.logWarning(', '.join(["'" + a + "'" for a in list(extra)]) + ' ignored')
         for tag in list(extra):
@@ -194,7 +192,7 @@ def _doOpenVariableFont(
     if unset := set(axes) - set(axisValues.keys()):  # unset axes
         fontforge.logWarning(', '.join(["'" + a + "'" for a in list(unset)]) + ' not set (default value used)')
         for tag in list(unset):
-            axisValues[tag] = [a.defaultValue for a in filter(lambda x: x.axisTag == tag, varfont["fvar"].axes)][0]
+            axisValues[tag] = [a.defaultValue for a in varfont["fvar"].axes if a.axisTag == tag][0]
     _checkAxisValue(varfont, axisValues)  # out of range
     vfData = _getVFData(varfont, axisValues)
 
@@ -226,7 +224,7 @@ def _openVF(
         if 'fvar' not in ttf:
             return fontforge.open(filename)
         elif isinstance(axisValuesOrInstance, dict):
-            if list(filter(lambda x: x.minValue != x.maxValue, ttf['fvar'].axes)):
+            if [axis for axis in ttf['fvar'].axes if axis.minValue != axis.maxValue]:
                 return _doOpenVariableFont(filename, axisValuesOrInstance, ttf, tmpdir)
             else:
                 return fontforge.open(filename)
@@ -240,10 +238,10 @@ def _openVF(
         elif isinstance(axisValuesOrInstance, str):
             return _doOpenVariableFont(
                 filename,
-                list(filter(
-                    lambda x: str(ttf['name'].getName(x.subfamilyNameID, 3, 1, 0x409)) == axisValuesOrInstance,
-                    ttf['fvar'].instances
-                ))[0].coordinates,
+                [
+                    i for i in ttf['fvar'].instances
+                    if str(ttf['name'].getName(i.subfamilyNameID, 3, 1, 0x409)) == axisValuesOrInstance
+                ][0].coordinates,
                 ttf,
                 tmpdir
             )
@@ -328,7 +326,7 @@ def _chooseInstanceDialog(filename: str | PathLike, ttf: ttLib.TTFont, tmpdir: s
         [str(ttf['name'].getName(i.subfamilyNameID, 3, 1, 0x409)) for i in ttf['fvar'].instances],
         multiple=True
     )
-    for i in [i[1] for i in list(filter(lambda x: x[0], zip(result, ttf['fvar'].instances)))]:
+    for i in (x[1] for x in zip(result, ttf['fvar'].instances) if x[0]):
         _doOpenVariableFont(filename, i.coordinates, ttf, tmpdir)
 
 
@@ -361,7 +359,7 @@ def loadMenu(u, glyph):
             if 'fvar' not in ttf:
                 fontforge.logWarning(filename + " does not have 'fvar' table")
                 fontforge.open(filename)
-            elif list(filter(lambda x: x.minValue != x.maxValue, ttf['fvar'].axes)):
+            elif [axis for axis in ttf['fvar'].axes if axis.minValue != axis.maxValue]:
                 _selectInstanceDialog(filename, ttf, u)
             else:
                 fontforge.logWarning(filename + " has 'fvar' table but all axes are fixed")
@@ -369,5 +367,99 @@ def loadMenu(u, glyph):
     faulthandler.disable()
 
 
-def loadEnable(u, glyph):
-    return True
+def _generatePreHook(font: fontforge.font, target: str):
+    from fontforgeVF.utils import vfInfoExists
+
+    changed = font.changed
+    if vfInfoExists(font):
+        if target.endswith('.ttf') or target.endswith('.woff2'):
+            ans = fontforge.ask(
+                "Variable font",
+                "This font has variable font metadata in its persistent dict.\n"
+                "Did you intend to output a variable font?\n"
+                "(all masters need to be opened beforehand)",
+                ["_Yes", "_No"],
+            )
+            font.temporary['generateVF'] = (ans == 0)
+            font.changed = changed
+
+
+def _generatePostHook(font: fontforge.font, target: str):
+    from fontforgeVF.utils import vfInfoExists
+    from fontforgeVF.export import exportVariableFont
+
+    changed = font.changed
+    if vfInfoExists(font):
+        if 'generateVF' in font.temporary:
+            if target.endswith('.ttf') or target.endswith('.woff2'):
+                if font.temporary['generateVF']:
+                    exportVariableFont(font, target, None)
+            try:
+                del font.temporary['generateVF']
+            except KeyError:
+                pass
+            font.changed = changed
+
+
+def _addHook(
+    font: fontforge.font,
+    name: Literal['generateFontPreHook', 'generateFontPostHook'],
+    hook: Callable[[fontforge.font, str], None]
+):
+    assert isinstance(font.temporary, dict)
+    if name in font.temporary:
+        currentHook = font.temporary[name]
+
+        def chainHook(font: fontforge.font, target: str):
+            currentHook(font, target)
+            hook(font, target)
+
+        font.temporary[name] = chainHook
+    else:
+        font.temporary[name] = hook
+
+
+def _addGenerateHook(font: fontforge.font):
+    if not isinstance(font.temporary, dict):
+        font.temporary = {}
+    _addHook(font, 'generateFontPreHook', _generatePreHook)
+    _addHook(font, 'generateFontPostHook', _generatePostHook)
+
+
+def _loadHook_ttf(font: fontforge.font):
+    from fontforgeVF.utils import initPersistentDict
+
+    with ttLib.TTFont(font.path) as ttf:
+        if 'fvar' in ttf and [axis for axis in ttf['fvar'].axes if axis.minValue != axis.maxValue]:
+            if ttf['fvar'].instances:
+                ans = fontforge.ask(
+                    "Variable font",
+                    "The font '" + font.familyname + "' in \n"
+                    "'" + font.path + "'\n"
+                    "seems to be a variable font.\n"
+                    "Would you like to open another instance of this font?",
+                    [
+                        "_Yes",
+                        "Open with _parameters",
+                        "_No",
+                    ]
+                )
+                if ans == 0 or ans == 1:
+                    _selectInstanceDialog(font.path, ttf, ans)
+            else:
+                _selectInstanceDialog(font.path, ttf, 1)
+            initPersistentDict(font)
+            vfData = _getVFData(ttf, {})
+            font.persistent['VF'] = vfData
+
+
+def loadHook(font: fontforge.font):
+    if font.path.endswith('.ttf') or font.path.endswith('.woff2'):
+        _loadHook_ttf(font)
+        _addGenerateHook(font)
+    elif font.path.endswith('.sfd'):
+        _addGenerateHook(font)
+
+
+def newFontHook(font: fontforge.font):
+    _addGenerateHook(font)

fontforge_variable_font-0.2.0/README.md → fontforge_variable_font-0.3.0/fontforge_variable_font.egg-info/PKG-INFO

@@ -1,3 +1,24 @@
+Metadata-Version: 2.4
+Name: fontforge_variable_font
+Version: 0.3.0
+Summary: A FontForge_plugin to create a variable font
+Home-page: https://github.com/MihailJP/fontforge-variable-font
+Author: MihailJP
+Author-email: mihailjp@gmail.com
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Text Processing :: Fonts
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fonttools
+Requires-Dist: fontmake
+Dynamic: license-file
+
 Fontforge Variable Font Plugin
 ==============================
 
@@ -313,6 +334,25 @@ Deletes VF data.
 > [!WARNING]
 > You will see **no** warning.
 
+### Hooks
+
+This plugin installs new/open font hooks which does:
+
+- sets font generation hooks to output VF if metadata exists
+  - If you export a TTF or a WOFF2 when VF metadata exists, you will be
+    asked if you intend a VF. In this case too, all the masters must be
+    opened beforehands, however unlike the dedicated menu, VF-specific
+    options or italic counterpart cannot be set.
+  - For technical reason, first the static font gets exported as usual,
+    then VF overwrites it. Failed attempt of exporting a VF leaves the
+    static font.
+- loads VF-specific metadata if available
+  - If you load a variable font from the ordinary 'load' menu, you will be
+    asked if you will open additional instances and which one(s.)
+
+> [!NOTE]
+> These hooks work in interactive mode only.
+
 ### Script usage
 
 As a Python module, in addition to `fontforge` module, scripting to export

{fontforge_variable_font-0.2.0 → fontforge_variable_font-0.3.0}/setup.cfg

@@ -1,13 +1,19 @@
 [metadata]
 name = fontforge_variable_font
-version = 0.2.0
+version = 0.3.0
 author = MihailJP
 author_email = mihailjp@gmail.com
 description = A FontForge_plugin to create a variable font
+license = MIT
+license_files = 
+	LICENSE
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/MihailJP/fontforge-variable-font
 classifiers = 
+	Development Status :: 4 - Beta
+	Environment :: Plugins
+	Intended Audience :: Developers
 	Programming Language :: Python :: 3
 	Operating System :: OS Independent
 	Topic :: Text Processing :: Fonts