varLib: Remove py23 imports
This commit is contained in:
parent
14716c8491
commit
68a5ceac6d
@ -1,4 +1,3 @@
|
|||||||
from fontTools.misc.py23 import *
|
|
||||||
import sys
|
import sys
|
||||||
from fontTools.varLib import main
|
from fontTools.varLib import main
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ from fontTools.cffLib import (
|
|||||||
FontDict,
|
FontDict,
|
||||||
VarStoreData
|
VarStoreData
|
||||||
)
|
)
|
||||||
from fontTools.misc.py23 import BytesIO
|
from io import BytesIO
|
||||||
from fontTools.cffLib.specializer import (
|
from fontTools.cffLib.specializer import (
|
||||||
specializeCommands, commandsToProgram)
|
specializeCommands, commandsToProgram)
|
||||||
from fontTools.ttLib import newTable
|
from fontTools.ttLib import newTable
|
||||||
|
@ -3,7 +3,6 @@ https://docs.microsoft.com/en-us/typography/opentype/spec/chapter2#featurevariat
|
|||||||
|
|
||||||
NOTE: The API is experimental and subject to change.
|
NOTE: The API is experimental and subject to change.
|
||||||
"""
|
"""
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.misc.dictTools import hashdict
|
from fontTools.misc.dictTools import hashdict
|
||||||
from fontTools.misc.intTools import popCount
|
from fontTools.misc.intTools import popCount
|
||||||
from fontTools.ttLib import newTable
|
from fontTools.ttLib import newTable
|
||||||
|
@ -65,7 +65,6 @@ are supported, but support for CFF2 variable fonts will be added soon.
|
|||||||
The discussion and implementation of these features are tracked at
|
The discussion and implementation of these features are tracked at
|
||||||
https://github.com/fonttools/fonttools/issues/1537
|
https://github.com/fonttools/fonttools/issues/1537
|
||||||
"""
|
"""
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.misc.fixedTools import floatToFixedToFloat, otRound
|
from fontTools.misc.fixedTools import floatToFixedToFloat, otRound
|
||||||
from fontTools.varLib.models import supportScalar, normalizeValue, piecewiseLinearMap
|
from fontTools.varLib.models import supportScalar, normalizeValue, piecewiseLinearMap
|
||||||
from fontTools.ttLib import TTFont
|
from fontTools.ttLib import TTFont
|
||||||
|
@ -6,8 +6,6 @@ Call as:
|
|||||||
$ fonttools varLib.interpolatable font1 font2 ...
|
$ fonttools varLib.interpolatable font1 font2 ...
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
|
|
||||||
from fontTools.pens.basePen import AbstractPen, BasePen
|
from fontTools.pens.basePen import AbstractPen, BasePen
|
||||||
from fontTools.pens.recordingPen import RecordingPen
|
from fontTools.pens.recordingPen import RecordingPen
|
||||||
from fontTools.pens.statisticsPen import StatisticsPen
|
from fontTools.pens.statisticsPen import StatisticsPen
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
"""
|
"""
|
||||||
Interpolate OpenType Layout tables (GDEF / GPOS / GSUB).
|
Interpolate OpenType Layout tables (GDEF / GPOS / GSUB).
|
||||||
"""
|
"""
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.ttLib import TTFont
|
from fontTools.ttLib import TTFont
|
||||||
from fontTools.varLib import models, VarLibError, load_designspace, load_masters
|
from fontTools.varLib import models, VarLibError, load_designspace, load_masters
|
||||||
from fontTools.varLib.merger import InstancerMerger
|
from fontTools.varLib.merger import InstancerMerger
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
from fontTools.misc.py23 import *
|
|
||||||
|
|
||||||
|
|
||||||
def iup_segment(coords, rc1, rd1, rc2, rd2):
|
def iup_segment(coords, rc1, rd1, rc2, rd2):
|
||||||
# rc1 = reference coord 1
|
# rc1 = reference coord 1
|
||||||
# rd1 = reference delta 1
|
# rd1 = reference delta 1
|
||||||
|
@ -3,7 +3,6 @@ Merge OpenType Layout tables (GDEF / GPOS / GSUB).
|
|||||||
"""
|
"""
|
||||||
import copy
|
import copy
|
||||||
from operator import ior
|
from operator import ior
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.misc.fixedTools import otRound
|
from fontTools.misc.fixedTools import otRound
|
||||||
from fontTools.misc import classifyTools
|
from fontTools.misc import classifyTools
|
||||||
from fontTools.ttLib.tables import otTables as ot
|
from fontTools.ttLib.tables import otTables as ot
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
"""Variation fonts interpolation models."""
|
"""Variation fonts interpolation models."""
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
|
|
||||||
__all__ = ['nonNone', 'allNone', 'allEqual', 'allEqualTo', 'subList',
|
__all__ = ['nonNone', 'allNone', 'allEqual', 'allEqualTo', 'subList',
|
||||||
'normalizeValue', 'normalizeLocation',
|
'normalizeValue', 'normalizeLocation',
|
||||||
|
@ -3,7 +3,6 @@ Instantiate a variation font. Run, eg:
|
|||||||
|
|
||||||
$ fonttools varLib.mutator ./NotoSansArabic-VF.ttf wght=140 wdth=85
|
$ fonttools varLib.mutator ./NotoSansArabic-VF.ttf wght=140 wdth=85
|
||||||
"""
|
"""
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.misc.fixedTools import floatToFixedToFloat, otRound, floatToFixed
|
from fontTools.misc.fixedTools import floatToFixedToFloat, otRound, floatToFixed
|
||||||
from fontTools.pens.boundsPen import BoundsPen
|
from fontTools.pens.boundsPen import BoundsPen
|
||||||
from fontTools.ttLib import TTFont, newTable
|
from fontTools.ttLib import TTFont, newTable
|
||||||
@ -21,6 +20,7 @@ from fontTools.varLib.iup import iup_delta
|
|||||||
import fontTools.subset.cff
|
import fontTools.subset.cff
|
||||||
import os.path
|
import os.path
|
||||||
import logging
|
import logging
|
||||||
|
from io import BytesIO
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger("fontTools.varlib.mutator")
|
log = logging.getLogger("fontTools.varlib.mutator")
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
from fontTools.misc.py23 import *
|
|
||||||
|
|
||||||
MVAR_ENTRIES = {
|
MVAR_ENTRIES = {
|
||||||
'hasc': ('OS/2', 'sTypoAscender'), # horizontal ascender
|
'hasc': ('OS/2', 'sTypoAscender'), # horizontal ascender
|
||||||
'hdsc': ('OS/2', 'sTypoDescender'), # horizontal descender
|
'hdsc': ('OS/2', 'sTypoDescender'), # horizontal descender
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
"""Visualize DesignSpaceDocument and resulting VariationModel."""
|
"""Visualize DesignSpaceDocument and resulting VariationModel."""
|
||||||
|
|
||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.varLib.models import VariationModel, supportScalar
|
from fontTools.varLib.models import VariationModel, supportScalar
|
||||||
from fontTools.designspaceLib import DesignSpaceDocument
|
from fontTools.designspaceLib import DesignSpaceDocument
|
||||||
from mpl_toolkits.mplot3d import axes3d
|
from mpl_toolkits.mplot3d import axes3d
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
from fontTools.misc.py23 import *
|
|
||||||
from fontTools.misc.fixedTools import otRound
|
from fontTools.misc.fixedTools import otRound
|
||||||
from fontTools.ttLib.tables import otTables as ot
|
from fontTools.ttLib.tables import otTables as ot
|
||||||
from fontTools.varLib.models import supportScalar
|
from fontTools.varLib.models import supportScalar
|
||||||
|
Loading…
x
Reference in New Issue
Block a user