Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert panoseDefault to namespace object #3201

Merged
merged 5 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 2 additions & 12 deletions Lib/fontTools/fontBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def drawTestGlyph(pen):
from .ttLib import TTFont, newTable
from .ttLib.tables._c_m_a_p import cmap_classes
from .ttLib.tables._g_l_y_f import flagCubic
from .ttLib.tables.O_S_2f_2 import Panose
from .misc.timeTools import timestampNow
import struct
from collections import OrderedDict
Expand Down Expand Up @@ -263,18 +264,7 @@ def drawTestGlyph(pen):
# to insert in setupNameTable doc string:
# print("\n".join(("%s (nameID %s)" % (k, v)) for k, v in sorted(_nameIDs.items(), key=lambda x: x[1])))

_panoseDefaults = dict(
bFamilyType=0,
bSerifStyle=0,
bWeight=0,
bProportion=0,
bContrast=0,
bStrokeVariation=0,
bArmStyle=0,
bLetterForm=0,
bMidline=0,
bXHeight=0,
)
_panoseDefaults = Panose()

_OS2Defaults = dict(
version=3,
Expand Down
7 changes: 7 additions & 0 deletions Lib/fontTools/ttLib/tables/O_S_2f_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@


class Panose(object):
def __init__(self, **kwargs):
_, names, _ = sstruct.getformat(panoseFormat)
for name in names:
setattr(self, name, kwargs.pop(name, 0))
for k in kwargs:
raise TypeError(f"Panose() got an unexpected keyword argument {k!r}")

def toXML(self, writer, ttFont):
formatstring, names, fixes = sstruct.getformat(panoseFormat)
for name in names:
Expand Down
46 changes: 46 additions & 0 deletions Tests/fontBuilder/fontBuilder_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,3 +420,49 @@ def test_unicodeVariationSequences(tmpdir):
fb.setupCharacterMap(cmap, uvs)
fb.save(outPath)
_verifyOutput(outPath, tables=["cmap"])


def test_setupPanose(is_ttf, keep_glyph_names, make_cff2, post_format):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are not using these pytest fixture arguments, just define it as def test_setupPanose():

from fontTools.ttLib.tables.O_S_2f_2 import Panose

fb, advanceWidths, nameStrings = _setupFontBuilder(True)

pen = TTGlyphPen(None)
drawTestGlyph(pen)
glyph = pen.glyph()
glyphs = {".notdef": glyph, "A": glyph, "a": glyph, ".null": glyph}
fb.setupGlyf(glyphs)
metrics = {}
glyphTable = fb.font["glyf"]
for gn, advanceWidth in advanceWidths.items():
metrics[gn] = (advanceWidth, glyphTable[gn].xMin)
fb.setupHorizontalMetrics(metrics)

fb.setupHorizontalHeader(ascent=824, descent=200)
fb.setupNameTable(nameStrings)
fb.setupOS2()
fb.setupPost()

panoseValues = { # sample value of Times New Roman from https://www.w3.org/Printing/stevahn.html
"bFamilyType": 2,
"bSerifStyle": 2,
"bWeight": 6,
"bProportion": 3,
"bContrast": 5,
"bStrokeVariation": 4,
"bArmStyle": 5,
"bLetterForm": 2,
"bMidline": 3,
"bXHeight": 4,
}

for name in panoseValues:
assert getattr(fb.font["OS/2"].panose, name) == 0

fb.setupOS2(panoseValues)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, I don't think setupOS2 works like that, you want to construct a panose = Panose(**panoseValues) instance beforehand, and pass that one to fb.setupOS2(panose=panose)

fb.setupPost()

for name, value in panoseValues.items():
assert getattr(fb.font["OS/2"].panose, name) == value