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

{fontforge_variable_font-0.3.0/fontforge_variable_font.egg-info → fontforge_variable_font-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fontforge_variable_font
-Version: 0.3.0
+Version: 0.4.0
 Summary: A FontForge_plugin to create a variable font
 Home-page: https://github.com/MihailJP/fontforge-variable-font
 Author: MihailJP
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fonttools
 Requires-Dist: fontmake
+Requires-Dist: fontforge_plugin_helper
 Dynamic: license-file
 
 Fontforge Variable Font Plugin

fontforge_variable_font-0.4.0/fontforgeVF/__init__.py

@@ -0,0 +1,50 @@
+"""FontForge plugin to create a variable font"""
+
+from .delete import deleteVFInfo
+from .design_axes import getAxisValue
+from .export import exportVariableFont
+from .language import languageCodeIterator, languageCodeLookup, languageCodeReverseLookup, getLanguageList
+from .load import openVariableFont
+from .utils import (
+    intOrFloat,
+    initPersistentDict,
+    vfInfoExists,
+    getVFValue,
+    setVFValue,
+    deleteEmptyDicts,
+    deleteVFValue,
+    setOrDeleteVFValue,
+    checkExtensionTtfOrWoff2,
+)
+
+
+__all__ = [
+    # delete
+    "deleteVFInfo",
+
+    # design_axes
+    "getAxisValue",
+
+    # export
+    "exportVariableFont",
+
+    # language
+    'languageCodeIterator',
+    'languageCodeLookup',
+    'languageCodeReverseLookup',
+    'getLanguageList',
+
+    # load
+    "openVariableFont",
+
+    # utils
+    "intOrFloat",
+    "initPersistentDict",
+    "vfInfoExists",
+    "getVFValue",
+    "setVFValue",
+    "deleteEmptyDicts",
+    "deleteVFValue",
+    "setOrDeleteVFValue",
+    "checkExtensionTtfOrWoff2",
+]

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

@@ -1,3 +1,5 @@
+import fontforge
+
 from fontforgeVF import (
     delete,
     design_axes,
@@ -5,25 +7,7 @@ from fontforgeVF import (
     instance,
     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
+from fontforge_plugin_helper import addSystemHook
 
 
 def fontforge_plugin_init(**kw):
@@ -50,6 +34,13 @@ def fontforge_plugin_init(**kw):
         submenu="_Variable Font",
         name="_Generate a variable font..."
     )
+
+    fontforge.registerMenuItem(
+        divider=True,
+        context="Font",
+        submenu="_Variable Font",
+    )
+
     fontforge.registerMenuItem(
         callback=design_axes.designAxesMenu,
         enable=None,
@@ -73,5 +64,5 @@ def fontforge_plugin_init(**kw):
     )
 
     if fontforge.hasUserInterface:
-        _addHook('loadFontHook', load.loadHook)
-        _addHook('newFontHook', load.newFontHook)
+        addSystemHook('loadFontHook', load.loadHook)
+        addSystemHook('newFontHook', load.newFontHook)

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/fontforgeVF/delete.py

@@ -1,10 +1,6 @@
-from fontforgeVF import utils
 import fontforge
 
-
-__all__ = [
-    "deleteVFInfo",
-]
+from . import utils
 
 
 def deleteVFInfo(font: fontforge.font) -> bool:

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

@@ -1,10 +1,6 @@
-from fontforgeVF import utils
 import fontforge
 
-
-__all__ = [
-    "getAxisValue",
-]
+from . import utils
 
 
 def _getWidthFromOS2Width(font: fontforge.font) -> int | float:

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

@@ -1,8 +1,8 @@
-from fontforgeVF import utils, language
-from fontforgeVF.design_axes import designAxes, getAxisValue
-import fontforge
-import tempfile
 from os import PathLike
+import tempfile
+
+import fontforge
+from fontTools import ttLib
 from fontTools.designspaceLib import (
     DesignSpaceDocument,
     SourceDescriptor,
@@ -11,12 +11,9 @@ from fontTools.designspaceLib import (
     AxisLabelDescriptor,
     InstanceDescriptor,
 )
-from fontTools import ttLib
-
 
-__all__ = [
-    "exportVariableFont",
-]
+from . import utils, language
+from .design_axes import designAxes, getAxisValue
 
 
 def _getSourceFonts(defaultFont: fontforge.font, filterItalicRoman: bool | None = None) -> list[fontforge.font]:

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

@@ -1,6 +1,7 @@
 import fontforge
-from fontforgeVF import utils
-from fontforgeVF.design_axes import designAxes
+
+from . import utils
+from .design_axes import designAxes
 
 
 def _instances_getval(font: fontforge.font, cnt: int, key: str, defaultVal):

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/fontforgeVF/language.py

@@ -1,10 +1,3 @@
-__all__ = [
-    'languageCodeIterator',
-    'languageCodeLookup',
-    'languageCodeReverseLookup',
-    'getLanguageList',
-]
-
 languageData = {
     1: {
         'name': 'Arabic',

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

@@ -1,14 +1,11 @@
-import fontforge
-from fontforgeVF.utils import intOrFloat, checkExtensionTtfOrWoff2
-from os import PathLike
-from fontTools import ttLib
 import faulthandler
-from typing import Literal, Callable
+from os import PathLike
 
+import fontforge
+from fontTools import ttLib
 
-__all__ = [
-    "openVariableFont",
-]
+from .utils import intOrFloat, checkExtensionTtfOrWoff2
+from fontforge_plugin_helper import addFontGenerateHook
 
 
 def _checkAxisValue(ttf: ttLib.TTFont, axisValues: dict[str, int | float]):
@@ -401,29 +398,11 @@ def _generatePostHook(font: fontforge.font, target: str):
             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)
+    addFontGenerateHook(font, 'generateFontPreHook', _generatePreHook)
+    addFontGenerateHook(font, 'generateFontPostHook', _generatePostHook)
 
 
 def _loadHook_ttf(font: fontforge.font):

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/fontforgeVF/utils.py

@@ -1,19 +1,7 @@
-import fontforge
-import re
 from os import PathLike
+import re
 
-
-__all__ = [
-    "intOrFloat",
-    "initPersistentDict",
-    "vfInfoExists",
-    "getVFValue",
-    "setVFValue",
-    "deleteEmptyDicts",
-    "deleteVFValue",
-    "setOrDeleteVFValue",
-    "checkExtensionTtfOrWoff2",
-]
+import fontforge
 
 
 def intOrFloat(val):

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0/fontforge_variable_font.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fontforge_variable_font
-Version: 0.3.0
+Version: 0.4.0
 Summary: A FontForge_plugin to create a variable font
 Home-page: https://github.com/MihailJP/fontforge-variable-font
 Author: MihailJP
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fonttools
 Requires-Dist: fontmake
+Requires-Dist: fontforge_plugin_helper
 Dynamic: license-file
 
 Fontforge Variable Font Plugin

fontforge_variable_font-0.4.0/fontforge_variable_font.egg-info/requires.txt

@@ -0,0 +1,3 @@
+fonttools
+fontmake
+fontforge_plugin_helper

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

@@ -1,6 +1,6 @@
 [metadata]
 name = fontforge_variable_font
-version = 0.3.0
+version = 0.4.0
 author = MihailJP
 author_email = mihailjp@gmail.com
 description = A FontForge_plugin to create a variable font
@@ -24,6 +24,7 @@ python_requires = >=3.10
 install_requires = 
 	fonttools
 	fontmake
+	fontforge_plugin_helper
 
 [options.entry_points]
 fontforge_plugin = 

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/test/test_export.py

@@ -1,5 +1,6 @@
-import pytest
 import fontforge
+import pytest
+
 from fontforgeVF.utils import setVFValue
 
 

fontforge_variable_font-0.3.0/fontforgeVF/__init__.py

@@ -1,6 +0,0 @@
-from fontforgeVF.delete import *
-from fontforgeVF.design_axes import *
-from fontforgeVF.export import *
-from fontforgeVF.language import *
-from fontforgeVF.load import *
-from fontforgeVF.utils import *

fontforge_variable_font-0.3.0/fontforge_variable_font.egg-info/requires.txt

@@ -1,2 +0,0 @@
-fonttools
-fontmake

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/test/test_design_axes.py

@@ -1,5 +1,5 @@
-import pytest
 import fontforge
+import pytest
 
 
 def axisTestFont(useDefault):

{fontforge_variable_font-0.3.0 → fontforge_variable_font-0.4.0}/test/test_utils.py

@@ -1,5 +1,5 @@
-import pytest
 import fontforge
+import pytest
 
 
 @pytest.mark.parametrize(('param', 'expectedVal', 'expectedType'), [