shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[otlLib] Move buildAnchor from feaLib to otlLib

Browse Source
This commit is contained in:
Sascha Brawer 2016-01-14 13:08:26 +01:00
parent 0c001da24a
commit 18297eb591
3 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Lib/fontTools/feaLib/builder.py
View File

@ -617,8 +617,8 @@ class Builder(object):
lookup = self.get_lookup_(location, CursivePosBuilder)
lookup.add_attachment(
location, glyphclass,
makeOpenTypeAnchor(entryAnchor, otTables.EntryAnchor),
makeOpenTypeAnchor(exitAnchor, otTables.ExitAnchor))
makeOpenTypeAnchor(entryAnchor),
makeOpenTypeAnchor(exitAnchor))
def add_marks_(self, location, lookupBuilder, marks):
"""Helper for add_mark_{base,liga,mark}_pos."""
@ -626,8 +626,7 @@ class Builder(object):
for markClassDef in markClass.definitions:
for mark in markClassDef.glyphs.glyphSet():
if mark not in lookupBuilder.marks:
otMarkAnchor = makeOpenTypeAnchor(markClassDef.anchor,
otTables.MarkAnchor)
otMarkAnchor = makeOpenTypeAnchor(markClassDef.anchor)
lookupBuilder.marks[mark] = (
markClass.name, otMarkAnchor)
@ -635,7 +634,7 @@ class Builder(object):
builder = self.get_lookup_(location, MarkBasePosBuilder)
self.add_marks_(location, builder, marks)
for baseAnchor, markClass in marks:
otBaseAnchor = makeOpenTypeAnchor(baseAnchor, otTables.BaseAnchor)
otBaseAnchor = makeOpenTypeAnchor(baseAnchor)
for base in bases:
builder.bases.setdefault(base, {})[markClass.name] = (
otBaseAnchor)
@ -647,8 +646,7 @@ class Builder(object):
anchors = {}
self.add_marks_(location, builder, marks)
for ligAnchor, markClass in marks:
anchors[markClass.name] = (
makeOpenTypeAnchor(ligAnchor, otTables.LigatureAnchor))
anchors[markClass.name] = makeOpenTypeAnchor(ligAnchor)
componentAnchors.append(anchors)
for glyph in ligatures:
builder.ligatures[glyph] = componentAnchors
@ -657,7 +655,7 @@ class Builder(object):
builder = self.get_lookup_(location, MarkMarkPosBuilder)
self.add_marks_(location, builder, marks)
for baseAnchor, markClass in marks:
otBaseAnchor = makeOpenTypeAnchor(baseAnchor, otTables.Mark2Anchor)
otBaseAnchor = makeOpenTypeAnchor(baseAnchor)
for baseMark in baseMarks:
builder.baseMarks.setdefault(baseMark, {})[markClass.name] = (
otBaseAnchor)
@ -711,23 +709,17 @@ class Builder(object):
self.ligatureCaretByPos_.setdefault(glyph, set()).update(carets)
def makeOpenTypeAnchor(anchor, anchorClass):
def makeOpenTypeAnchor(anchor):
"""ast.Anchor --> otTables.Anchor"""
if anchor is None:
return None
anch = anchorClass()
anch.Format = 1
anch.XCoordinate, anch.YCoordinate = anchor.x, anchor.y
if anchor.contourpoint is not None:
anch.AnchorPoint = anchor.contourpoint
anch.Format = 2
deviceX, deviceY = None, None
if anchor.xDeviceTable is not None:
anch.XDeviceTable = otlBuilder.buildDevice(anchor.xDeviceTable)
anch.Format = 3
deviceX = otlBuilder.buildDevice(anchor.xDeviceTable)
if anchor.yDeviceTable is not None:
anch.YDeviceTable = otlBuilder.buildDevice(anchor.yDeviceTable)
anch.Format = 3
return anch
deviceY = otlBuilder.buildDevice(anchor.yDeviceTable)
return otlBuilder.buildAnchor(anchor.x, anchor.y, anchor.contourpoint,
deviceX, deviceY)
def makeOpenTypeValueRecord(v):

16
Lib/fontTools/otlLib/builder.py
View File

@ -54,6 +54,22 @@ def buildLigatureSubst(mapping):
return self
def buildAnchor(x, y, point=None, deviceX=None, deviceY=None):
self = ot.Anchor()
self.XCoordinate, self.YCoordinate = x, y
self.Format = 1
if point is not None:
self.AnchorPoint = point
self.Format = 2
if deviceX is not None:
self.XDeviceTable = deviceX
self.Format = 3
if deviceY is not None:
self.YDeviceTable = deviceY
self.Format = 3
return self
def buildDevice(device):
"""[(11, 22), (7, -7), ...] --> otTables.Device"""
self = ot.Device()

40
Lib/fontTools/otlLib/builder_test.py
View File

@ -6,6 +6,46 @@ import unittest
class BuilderTest(unittest.TestCase):
def test_buildAnchor_format1(self):
anchor = builder.buildAnchor(23, 42)
self.assertEqual(getXML(anchor, ttFont=None),
'<Anchor Format="1">'
' <XCoordinate value="23"/>'
' <YCoordinate value="42"/>'
'</Anchor>')
def test_buildAnchor_format2(self):
anchor = builder.buildAnchor(23, 42, point=17)
self.assertEqual(getXML(anchor, ttFont=None),
'<Anchor Format="2">'
' <XCoordinate value="23"/>'
' <YCoordinate value="42"/>'
' <AnchorPoint value="17"/>'
'</Anchor>')
def test_buildAnchor_format3(self):
anchor = builder.buildAnchor(
23, 42,
deviceX=builder.buildDevice([(1, 1), (0, 0)]),
deviceY=builder.buildDevice([(7, 7)]))
self.assertEqual(getXML(anchor, ttFont=None),
'<Anchor Format="3">'
' <XCoordinate value="23"/>'
' <YCoordinate value="42"/>'
' <XDeviceTable>'
' <StartSize value="0"/>'
' <EndSize value="1"/>'
' <DeltaFormat value="1"/>'
' <DeltaValue value="[0, 1]"/>'
' </XDeviceTable>'
' <YDeviceTable>'
' <StartSize value="7"/>'
' <EndSize value="7"/>'
' <DeltaFormat value="2"/>'
' <DeltaValue value="[7]"/>'
' </YDeviceTable>'
'</Anchor>')
def test_buildDevice_format1(self):
device = builder.buildDevice([(1, 1), (0, 0)])
self.assertEqual(getXML(device, ttFont=None),