fontforge-variable-font 0.4.2__tar.gz → 0.5.0__tar.gz

{fontforge_variable_font-0.4.2/fontforge_variable_font.egg-info → fontforge_variable_font-0.5.0}/PKG-INFO

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

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/__main__.py

@@ -1,66 +1,69 @@
 import fontforge
 
-from fontforgeVF import (
+from fontforge_plugin_helper import addSystemHook
+
+from . import (
     delete,
     design_axes,
     export,
     instance,
-    load
+    load,
 )
-from fontforge_plugin_helper import addSystemHook
+from .translation import tr, setTranslation
 
 
 def fontforge_plugin_init(**kw):
+    setTranslation()
     fontforge.registerMenuItem(
         callback=load.loadMenu,
         enable=None,
         context="Font",
-        submenu=["_Variable Font", '_Open a variable font'],
-        name="By named _instance...",
+        submenu=[tr.get('_Variable Font'), tr.get('_Open a variable font')],
+        name=tr.get('By named _instance...'),
         data=0
     )
     fontforge.registerMenuItem(
         callback=load.loadMenu,
         enable=None,
         context="Font",
-        submenu=["_Variable Font", '_Open a variable font'],
-        name="By _parameter...",
+        submenu=[tr.get('_Variable Font'), tr.get('_Open a variable font')],
+        name=tr.get('By _parameter...'),
         data=1
     )
     fontforge.registerMenuItem(
         callback=export.saveMenu,
         enable=export.saveEnable,
         context="Font",
-        submenu="_Variable Font",
-        name="_Generate a variable font..."
+        submenu=tr.get('_Variable Font'),
+        name=tr.get('_Generate a variable font...')
     )
 
     fontforge.registerMenuItem(
         divider=True,
         context="Font",
-        submenu="_Variable Font",
+        submenu=tr.get('_Variable Font'),
     )
 
     fontforge.registerMenuItem(
         callback=design_axes.designAxesMenu,
         enable=None,
         context="Font",
-        submenu="_Variable Font",
-        name="Design _axes..."
+        submenu=tr.get('_Variable Font'),
+        name=tr.get('Design _axes...')
     )
     fontforge.registerMenuItem(
         callback=instance.instanceMenu,
         enable=None,
         context="Font",
-        submenu="_Variable Font",
-        name="Named _instances..."
+        submenu=tr.get('_Variable Font'),
+        name=tr.get('Named _instances...')
     )
     fontforge.registerMenuItem(
         callback=delete.deleteVFInfoMenu,
         enable=delete.deleteVFInfoEnable,
         context="Font",
-        submenu="_Variable Font",
-        name="_Delete VF info"
+        submenu=tr.get('_Variable Font'),
+        name=tr.get('_Delete VF info')
     )
 
     if fontforge.hasUserInterface:

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/design_axes.py

@@ -1,6 +1,7 @@
 import fontforge
 
 from . import utils
+from .translation import tr
 
 
 def _getWidthFromOS2Width(font: fontforge.font) -> int | float:
@@ -125,14 +126,14 @@ def _prepareQuestions_values(questions, k, v):
     tagVal = utils.getVFValue(font, 'axes.' + k + '.value', defaultTagVal) if tagStat == 1 else defaultTagVal
     questions[0]["questions"].append({
         'type': 'choice',
-        'question': v["name"] + ':',
+        'question': tr.get(v["name"]) + ':',
         'tag': k,
         'checks': True,
         'answers': [
-            {'name': 'Unset', 'tag': 'unset', 'default': tagStat == 0},
-            {'name': 'Set', 'tag': 'custom', 'default': tagStat == 1},
+            {'name': tr.get('Unset'), 'tag': 'unset', 'default': tagStat == 0},
+            {'name': tr.get('Set'), 'tag': 'custom', 'default': tagStat == 1},
         ] + ([
-            {'name': 'Default (' + str(v["auto"](font)) + ')', 'tag': 'auto', 'default': tagStat == 2},
+            {'name': tr.get('Default ({0})').format(str(v["auto"](font))), 'tag': 'auto', 'default': tagStat == 2},
         ] if v["auto"] else []),
     })
     if k == 'ital':
@@ -142,8 +143,8 @@ def _prepareQuestions_values(questions, k, v):
             'tag': k + 'val',
             'checks': True,
             'answers': [
-                {'name': 'No', 'tag': 'false', 'default': not tagVal},
-                {'name': 'Yes', 'tag': 'true', 'default': tagVal},
+                {'name': tr.get('No'), 'tag': 'false', 'default': not tagVal},
+                {'name': tr.get('Yes'), 'tag': 'true', 'default': tagVal},
             ],
         })
     else:
@@ -160,7 +161,7 @@ def _prepareQuestions_map(questions, k, v):
     assert font is not None
     questions[2]["questions"].append({
         'type': 'string',
-        'question': v["name"] + ':',
+        'question': tr.get(v["name"]) + ':',
         'tag': k + 'map',
         'default': ', '.join(list(map(
             lambda x: str(x[0]) + ',' + str(x[1]),
@@ -174,7 +175,7 @@ def _prepareQuestions_order(questions, k, v):
     assert font is not None
     questions[3]["questions"].append({
         'type': 'string',
-        'question': v["name"] + ':',
+        'question': tr.get(v["name"]) + ':',
         'tag': k + 'order',
         'default': str(utils.getVFValue(font, 'axes.' + k + '.order', '')),
     })
@@ -185,7 +186,7 @@ def _prepareQuestions_names(questions, k, v):
     assert font is not None
     questions[4]["questions"].append({
         'type': 'string',
-        'question': v["name"] + ':',
+        'question': tr.get(v["name"]) + ':',
         'tag': k + 'name',
         'default': utils.getVFValue(
             font,
@@ -195,7 +196,7 @@ def _prepareQuestions_names(questions, k, v):
     })
     questions[4]["questions"].append({
         'type': 'string',
-        'question': '\tLabels:',
+        'question': tr.get('\tLabels:'),
         'tag': k + 'labels',
         'default': _loadLabels(k),
     })
@@ -207,7 +208,7 @@ def _prepareQuestions_localNames(questions, k, v, languages, localNameRange, loc
     for i in localNameRange:
         questions[localNameCategory + i - 1]["questions"].append({
             'type': 'string',
-            'question': v["name"] + ':',
+            'question': tr.get(v["name"]) + ':',
             'tag': k + 'name' + str(i),
             'default': utils.getVFValue(
                 font, 'axes.' + k + '.localNames.' + hex(languages[i-1]), ''
@@ -215,7 +216,7 @@ def _prepareQuestions_localNames(questions, k, v, languages, localNameRange, loc
         })
         questions[localNameCategory + i - 1]["questions"].append({
             'type': 'string',
-            'question': '\tLabels:',
+            'question': tr.get('\tLabels:'),
             'tag': k + 'labels' + str(i),
             'default': _loadLabels(k, languages[i-1]) if i <= len(languages) else '',
         })
@@ -227,7 +228,7 @@ def _prepareQuestions_custom(questions, k, v):
     if k.startswith('custom'):
         questions[1]["questions"].append({
             'type': 'string',
-            'question': v["name"] + ' tag:',
+            'question': tr.get('{0} tag:').format(tr.get(v["name"])),
             'tag': k + 'tag',
             'default': utils.getVFValue(font, 'axes.' + k + '.tag', ''),
         })
@@ -235,11 +236,11 @@ def _prepareQuestions_custom(questions, k, v):
 
 def _prepareQuestions():
     questions = [
-        {'category': 'This master', 'questions': []},
-        {'category': 'Custom axes', 'questions': []},
-        {'category': 'Axis map',    'questions': []},
-        {'category': 'Axis order',  'questions': []},
-        {'category': 'Axis names',  'questions': []},
+        {'category': tr.get('This master'), 'questions': []},
+        {'category': tr.get('Custom axes'), 'questions': []},
+        {'category': tr.get('Axis map'),    'questions': []},
+        {'category': tr.get('Axis order'),  'questions': []},
+        {'category': tr.get('Axis names'),  'questions': []},
     ]
 
     languages, localNameCategory, localNameRange = _prepareQuestions_languages(questions)
@@ -427,6 +428,6 @@ def designAxesMenu(u, glyph):
       * Axis value
       * Name
     """
-    result = fontforge.askMulti("Design axes", _prepareQuestions())  # type: ignore
+    result = fontforge.askMulti(tr.get("Design axes"), _prepareQuestions())  # type: ignore
     if result:
         _saveResult(result)

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/export.py

@@ -14,6 +14,7 @@ from fontTools.designspaceLib import (
 
 from . import utils, language
 from .design_axes import designAxes, getAxisValue
+from .translation import tr
 
 
 def _getSourceFonts(defaultFont: fontforge.font, filterItalicRoman: bool | None = None) -> list[fontforge.font]:
@@ -431,16 +432,16 @@ def _exportVF(
                 cmd = e.cmd.split(' ')
             fontforge.logWarning(e.stderr)
             fontforge.postError(
-                "Failed to export",
-                "'{0}' failed with return code {1}".format(cmd[0], e.returncode)
+                tr.get("Failed to export"),
+                tr.get("'{0}' failed with return code {1}").format(cmd[0], e.returncode)
             )
         else:
             raise
     else:
         if fontforge.hasUserInterface():
             fontforge.postNotice(
-                "Finished",
-                "Finished to output variable fonts"
+                tr.get("Finished"),
+                tr.get("Finished to output variable fonts"),
             )
 
 
@@ -554,14 +555,14 @@ def _saveMenuDialog(font: fontforge.font) -> dict | None:
     if _hasBothRomanAndItalic(font):
         questions: list = [
             {
-                'type': 'savepath', 'question': '_Roman VF:', 'tag': 'file',
+                'type': 'savepath', 'question': tr.get('_Roman VF:'), 'tag': 'file',
                 'default':
                     font.default_base_filename + '.ttf' if font.default_base_filename
                     else '.'.join(font.path.split('.')[:-1]) + '.ttf',
                 'filter': '*.{ttf,woff2}',
             },
             {
-                'type': 'savepath', 'question': '_Italic VF:', 'tag': 'file2',
+                'type': 'savepath', 'question': tr.get('_Italic VF:'), 'tag': 'file2',
                 'default':
                     font.default_base_filename + '-Italic.ttf' if font.default_base_filename
                     else '.'.join(font.path.split('.')[:-1]) + '-Italic.ttf',
@@ -571,7 +572,7 @@ def _saveMenuDialog(font: fontforge.font) -> dict | None:
     else:
         questions: list = [
             {
-                'type': 'savepath', 'question': '_Save as:', 'tag': 'file',
+                'type': 'savepath', 'question': tr.get('_Save as:'), 'tag': 'file',
                 'default':
                     font.default_base_filename + '.ttf' if font.default_base_filename
                     else '.'.join(font.path.split('.')[:-1]) + '.ttf',
@@ -580,16 +581,16 @@ def _saveMenuDialog(font: fontforge.font) -> dict | None:
         ]
     questions += [
         {
-            'type': 'choice', 'question': 'Options:', 'tag': 'options',
+            'type': 'choice', 'question': tr.get('Options:'), 'tag': 'options',
             'checks': True, 'multiple': True,
             'answers': [
-                {'name': 'Decompose _nested refs', 'tag': 'nestedRefs'},
-                {'name': 'Decompose _transformed refs', 'tag': 'transformedRefs'},
-                {'name': "Add '_aalt' feature", 'tag': 'aalt'},
+                {'name': tr.get('Decompose _nested refs'), 'tag': 'nestedRefs'},
+                {'name': tr.get('Decompose _transformed refs'), 'tag': 'transformedRefs'},
+                {'name': tr.get("Add '_aalt' feature"), 'tag': 'aalt'},
             ],
         },
     ]
-    return fontforge.askMulti("Save variable font", questions)
+    return fontforge.askMulti(tr.get("Save variable font"), questions)
 
 
 def saveMenu(u, font: fontforge.font):

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/instance.py

@@ -2,6 +2,7 @@ import fontforge
 
 from . import utils
 from .design_axes import designAxes
+from .translation import tr
 
 
 def _instances_getval(font: fontforge.font, cnt: int, key: str, defaultVal):
@@ -19,13 +20,13 @@ def _prepareQuestions_instances(cnt: int):
     questions = [
         {
             'type': 'string',
-            'question': 'PostScript Name:',
+            'question': tr.get('PostScript Name:'),
             'tag': 'psName' + str(cnt),
             'default': _instances_getval(font, cnt, 'psName', ''),
         },
         {
             'type': 'string',
-            'question': 'Subfamily Name:',
+            'question': tr.get('Subfamily Name:'),
             'tag': 'name' + str(cnt),
             'default': _instances_getval(font, cnt, 'name', ''),
         },
@@ -36,18 +37,18 @@ def _prepareQuestions_instances(cnt: int):
                 val = _instances_getval(font, cnt, 'ital', False)
                 questions.append({
                     'type': 'choice',
-                    'question': v['name'] + ':',
+                    'question': tr.get(v['name']) + ':',
                     'tag': k + '_' + str(cnt),
                     'checks': True,
                     'answers': [
-                        {'name': 'No', 'tag': '0', 'default': not val},
-                        {'name': 'Yes', 'tag': '1', 'default': val},
+                        {'name': tr.get('No'), 'tag': '0', 'default': not val},
+                        {'name': tr.get('Yes'), 'tag': '1', 'default': val},
                     ],
                 })
             else:
                 questions.append({
                     'type': 'string',
-                    'question': v['name'] + ':',
+                    'question': tr.get(v['name']) + ':',
                     'tag': k + '_' + str(cnt),
                     'default': str(_instances_getval(font, cnt, k, '')),
                 })
@@ -86,7 +87,7 @@ def _prepareQuestions_instanceLocalNames(questions: list):
         for j in range(numberOfInstances):
             page['questions'].append({
                 'type': 'string',
-                'question': _instances_getval(font, j + 1, 'name', 'Instance ' + str(j + 1)),
+                'question': _instances_getval(font, j + 1, 'name', tr.get('Instance {0}').format(str(j + 1))),
                 'tag': 'lang' + str(i + 1) + 'name' + str(j + 1),
                 'default': utils.getVFValue(
                     font, 'instances[' + str(j) + '].localNames.' + str(lang), ''
@@ -112,7 +113,7 @@ def _prepareQuestions():
 
     for i in range(numberOfInstances):
         questions.append({
-            'category': _instances_getval(font, i + 1, 'name', 'Instance ' + str(i + 1)),
+            'category': _instances_getval(font, i + 1, 'name', tr.get('Instance {0}').format(str(i + 1))),
             'questions': _prepareQuestions_instances(i + 1)
         })
 
@@ -174,6 +175,6 @@ def instanceMenu(u, glyph):
     By default there is a room for 8 languages, but this will be
     extended if already more than 4 languages are defined.
     """
-    result = fontforge.askMulti("Named instances", _prepareQuestions())
+    result = fontforge.askMulti(tr.get("Named instances"), _prepareQuestions())
     if result:
         _saveInstances(result)

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/language.py

@@ -1,3 +1,5 @@
+from .translation import tr
+
 languageData = {
     1: {
         'name': 'Arabic',
@@ -799,7 +801,7 @@ def languageCodeIterator():
             if isinstance(msb, int):
                 winLang = msb * 1024 + lsb
                 for name in subLangData['name']:
-                    yield (winLang, subLangData['code'], name.replace('.', langData['name']))
+                    yield (winLang, subLangData['code'], name.replace('.', langData['name'], 1))
 
 
 def languageCodeLookup(langCode: int) -> str | None:
@@ -825,13 +827,13 @@ def getLanguageList(listNumber: int, defaultCode: int | None = None):
     for langId, langCode, langName in sorted(languageCodeIterator(), key=lambda x: x[2]):
         languageList.append({'name': langName, 'tag': hex(langId), 'default': langId == defaultCode})
     questions = {
-        'category': 'Localized names ' + str(
+        'category': tr.get('Localized names {0}').format(str(
             languageCodeLookup(defaultCode) if defaultCode else str(listNumber)
-        ),
+        )),
         'questions': [
             {
                 'type': 'choice',
-                'question': 'Language:',
+                'question': tr.get('Language:'),
                 'tag': 'lang' + str(listNumber),
                 'answers': languageList,
             },

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/load.py

@@ -2,10 +2,11 @@ import faulthandler
 from os import PathLike
 
 import fontforge
+from fontforge_plugin_helper import addFontGenerateHook
 from fontTools import ttLib
 
+from .translation import tr
 from .utils import intOrFloat, checkExtensionTtfOrWoff2, ensureTuple
-from fontforge_plugin_helper import addFontGenerateHook
 
 
 def _checkAxisValue(ttf: ttLib.TTFont, axisValues: dict[str, int | float]):
@@ -311,7 +312,7 @@ def _setParameterDialog(filename: str | PathLike, ttf: ttLib.TTFont, tmpdir: str
                 },
             )
 
-    if result := fontforge.askMulti('Please specify an instance to open', questions):
+    if result := fontforge.askMulti(tr.get('Please specify an instance to open'), questions):
         for key in result:
             result[key] = intOrFloat(result[key])  # type: ignore
         _doOpenVariableFont(filename, result, ttf, tmpdir)  # type: ignore
@@ -320,8 +321,8 @@ def _setParameterDialog(filename: str | PathLike, ttf: ttLib.TTFont, tmpdir: str
 def _chooseInstanceDialog(filename: str | PathLike, ttf: ttLib.TTFont, tmpdir: str | PathLike):
     assert 'fvar' in ttf
     result = fontforge.askChoices(
-        'Choose instance(s) to open',
-        'Instances in this font',
+        tr.get('Choose instance(s) to open'),
+        tr.get('Instances in this font'),
         tuple([str(ttf['name'].getName(i.subfamilyNameID, 3, 1, 0x409)) for i in ttf['fvar'].instances]),
         multiple=True
     )
@@ -353,15 +354,15 @@ def loadMenu(u, glyph):
     non-variable font is selected, simply opens that font.
     """
     faulthandler.enable()
-    if filename := fontforge.openFilename('Open a variable font', '', '*.{ttf,woff2}'):
+    if filename := fontforge.openFilename(tr.get('Open a variable font'), '', '*.{ttf,woff2}'):
         with ttLib.TTFont(filename) as ttf:
             if 'fvar' not in ttf:
-                fontforge.logWarning(filename + " does not have 'fvar' table")
+                fontforge.logWarning(tr.get("{0} does not have 'fvar' table".format(filename)))
                 fontforge.open(filename)
             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")
+                fontforge.logWarning(tr.get("{0} has 'fvar' table but all axes are fixed").format(filename))
                 fontforge.open(filename)
     faulthandler.disable()
 
@@ -374,11 +375,13 @@ def _generatePreHook(font: fontforge.font, target: str):
     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"],  # type: ignore
+                tr.get("Variable font"),
+                tr.get(
+                    "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)"
+                ),
+                [tr.get("_Yes"), tr.get("_No")],  # type: ignore
             )
             font.temporary['generateVF'] = (ans == 0)
             font.changed = changed
@@ -416,15 +419,17 @@ def _loadHook_ttf(font: fontforge.font):
         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?",
+                    tr.get("Variable font"),
+                    tr.get(
+                        "The font '{0}' in\n"
+                        "'{1}'\n"
+                        "seems to be a variable font.\n"
+                        "Would you like to open another instance of this font?"
+                    ).format(font.familyname, font.path),
                     [
-                        "_Yes",
-                        "Open with _parameters",
-                        "_No",
+                        tr.get("_Yes"),
+                        tr.get("Open with _parameters"),
+                        tr.get("_No"),
                     ]  # type: ignore
                 )
                 if ans == 0 or ans == 1:

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/fontforgeVF/utils.py

@@ -3,6 +3,8 @@ import re
 
 import fontforge
 
+from .translation import tr
+
 
 def intOrFloat(val: str | int | float):
     """Convert to ``int`` or ``float`` if possible
@@ -77,10 +79,12 @@ def initPersistentDict(font: fontforge.font):
         fontforge.logWarning("Non-dict `font.persistent` will be lost")
         if fontforge.hasUserInterface():
             if fontforge.ask(
-                "Data loss warning",
-                "In active font, `font.persistent` exists but is other than a dict.\n"
-                "This will be overwritten if you continue.",
-                ("_OK", "_Cancel"), 0, 1
+                tr.get("Data loss warning"),
+                tr.get(
+                    "In active font, `font.persistent` exists but is other than a dict.\n"
+                    "This will be overwritten if you continue."
+                ),
+                (tr.get("_OK"), tr.get("_Cancel")), 0, 1
             ) == 1:
                 raise RuntimeError("user refused to delete existing `font.persistent`")
         font.persistent = {}

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0/fontforge_variable_font.egg-info}/PKG-INFO

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

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

@@ -0,0 +1,3 @@
+fonttools
+fontmake
+fontforge_plugin_helper>=0.3.0

{fontforge_variable_font-0.4.2 → fontforge_variable_font-0.5.0}/setup.cfg

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

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

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