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.

Sign up for GitHub

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

Update buildcff2vf #825

Merged
merged 3 commits into from
Jun 28, 2019
Merged

Update buildcff2vf #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4d900
[buildcff2vf] Use the correct default master when doing compatibiliza…
readroberts Jun 27, 2019
3ad74fd
[buildcff2vf] Keep all OT features when subsetting
readroberts Jun 27, 2019
da615db
[buildcff2vf] Fix bug in making outline points compatible
readroberts Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 28 additions & 27 deletions python/afdko/buildcff2vf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def getSubset(subset_Path):

def subset_masters(designspace, subsetDict):
from fontTools import subset
subset_options = subset.Options(notdef_outline=True)
subset_options = subset.Options(notdef_outline=True, layout_features='*')
for ds_source in designspace.sources:
key = tuple(ds_source.location.items())
included = set(subsetDict[key])
Expand Down Expand Up @@ -139,31 +139,25 @@ def add_point(self, point_type, pt_coords):
cmd[1].append(pt_coords)
self.pt_index += 1

def make_flat_curve(self, prev_coords, cur_coords):
def make_flat_curve(self, cur_coords):
# Convert line coords to curve coords.
dx = self.roundNumber((cur_coords[0] - prev_coords[0]) / 3.0)
dy = self.roundNumber((cur_coords[1] - prev_coords[1]) / 3.0)
new_coords = [prev_coords[0] + dx,
prev_coords[1] + dy,
prev_coords[0] + 2 * dx,
prev_coords[1] + 2 * dy
] + cur_coords
dx = self.roundNumber(cur_coords[0] / 3.0)
dy = self.roundNumber(cur_coords[1] / 3.0)
new_coords = [dx, dy, dx, dy,
cur_coords[0] - 2 * dx,
cur_coords[1] - 2 * dy]
return new_coords

def make_curve_coords(self, coords, is_default):
# Convert line coords to curve coords.
prev_cmd = self._commands[self.pt_index - 1]
if is_default:
new_coords = []
for i, cur_coords in enumerate(coords):
prev_coords = prev_cmd[1][i]
master_coords = self.make_flat_curve(prev_coords[:2],
cur_coords)
for cur_coords in coords:
master_coords = self.make_flat_curve(cur_coords)
new_coords.append(master_coords)
else:
cur_coords = coords
prev_coords = prev_cmd[1][-1]
new_coords = self.make_flat_curve(prev_coords[:2], cur_coords)
new_coords = self.make_flat_curve(cur_coords)
return new_coords

def check_and_fix_flat_curve(self, cmd, point_type, pt_coords):
Expand Down Expand Up @@ -261,17 +255,18 @@ def check_and_fix_closepath(self, cmd, point_type, pt_coords):
return True
return False

def getCharStrings(self, num_masters, private=None, globalSubrs=None):
""" A command look s like:
def getCharStrings(self, num_masters, private=None, globalSubrs=None,
default_idx=0):
""" A command looks like:
[op_name, [
[source 0 arglist for op],
[source 1 arglist for op],
...
[source n arglist for op],
I am not optimising this there, as that will be done when
the CFF2 Charstring is creating in fontTools.varLib.build().
I am not optimizing this there, as that will be done when
the CFF2 Charstring is created in fontTools.varLib.build().

If I did, I woudl have to rearragne the arguments to:
If I did, I would have to rearrange the arguments to:
[
[arg 0 for source 0 ... arg 0 for source n]
[arg 1 for source 0 ... arg 1 for source n]
Expand All @@ -297,24 +292,28 @@ def getCharStrings(self, num_masters, private=None, globalSubrs=None):
charString = T2CharString(
program=program, private=private, globalSubrs=globalSubrs)
t2List.append(charString)
# if default_idx is not 0, we need to move it to the right index.
if default_idx:
default_font_cs = t2List.pop(0)
t2List.insert(default_idx, default_font_cs)
return t2List


def _get_cs(glyphOrder, charstrings, glyphName):
def _get_cs(charstrings, glyphName):
if glyphName not in charstrings:
return None
return charstrings[glyphName]


def do_compatibility(vf, master_fonts):
def do_compatibility(vf, master_fonts, default_idx):
default_font = vf
default_charStrings = default_font['CFF '].cff.topDictIndex[0].CharStrings
glyphOrder = default_font.getGlyphOrder()
charStrings = [
font['CFF '].cff.topDictIndex[0].CharStrings for font in master_fonts]

for gname in glyphOrder:
all_cs = [_get_cs(glyphOrder, cs, gname) for cs in charStrings]
all_cs = [_get_cs(cs, gname) for cs in charStrings]
if len([gs for gs in all_cs if gs is not None]) < 2:
continue
# remove the None's from the list.
Expand All @@ -327,14 +326,16 @@ def do_compatibility(vf, master_fonts):

# Add the coordinates from all the other regions to the
# blend lists in the CFF2 charstring.
region_cs = cs_list[1:]
region_cs = cs_list[:]
del region_cs[default_idx]
for region_idx, region_charstring in enumerate(region_cs, start=1):
compat_pen.restart(region_idx)
region_charstring.draw(compat_pen)
if compat_pen.fixed:
fixed_cs_list = compat_pen.getCharStrings(
num_masters, private=default_charstring.private,
globalSubrs=default_charstring.globalSubrs)
globalSubrs=default_charstring.globalSubrs,
default_idx=default_idx)
cs_list = list(cs_list)
for i, cs in enumerate(cs_list):
mi = all_cs.index(cs)
Expand Down Expand Up @@ -474,7 +475,7 @@ def main(args=None):
# We copy vf from default_font, because we use VF to hold
# merged arguments from each source font charstring - this alters
# the font, which we don't want to do to the default font.
do_compatibility(vf, font_list)
do_compatibility(vf, font_list, ds_data.base_idx)

logger.progress("Building VF font...")
# Note that we now pass in the design space object, rather than a path to
Expand Down
2 changes: 1 addition & 1 deletion tests/buildcff2vf_data/expected_output/SHSansJPVFTest.ttx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
rlinecurve
-2 -1 1 blend
hlineto
-21 34 -19 27 -23 33 7 -5 -6 31 -13 54 6 blend
-21 34 -19 27 -23 33 9 -5 7 2 11 -4 6 blend
rrcurveto
-97 138 -43 54 -45 -151 3 blend
0 186 -262 -198 -274 44 -28 -17 38 -10 142 5 blend
Expand Down
130 changes: 130 additions & 0 deletions tests/buildcff2vf_data/expected_output/bug816.ttx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="3.43">

<CFF2>
<major value="2"/>
<minor value="0"/>
<CFFFont name="CFF2Font">
<FontMatrix value="0.001 0 0 0.001 0 0"/>
<FDArray>
<FontDict index="0">
<Private>
<BlueValues>
<blend value="-12 0 0"/>
<blend value="0 0 0"/>
<blend value="486 -8 14"/>
<blend value="498 0 0"/>
<blend value="574 4 -8"/>
<blend value="586 0 0"/>
<blend value="638 6 -10"/>
<blend value="650 0 0"/>
<blend value="656 2 -2"/>
<blend value="668 0 0"/>
<blend value="712 6 -10"/>
<blend value="724 0 0"/>
</BlueValues>
<OtherBlues>
<blend value="-217 -17 29"/>
<blend value="-205 0 0"/>
</OtherBlues>
<BlueScale value="0.0625"/>
<BlueShift value="7"/>
<BlueFuzz value="0"/>
<StdHW>
<blend value="67 -39.0 67.0"/>
</StdHW>
<StdVW>
<blend value="85 -51.0 87.0"/>
</StdVW>
</Private>
</FontDict>
</FDArray>
<CharStrings>
<CharString name=".notdef">
62 22 -38 1 blend
hmoveto
476 -44 76 1 blend
660 -476 44 -76 1 blend
-660 hlineto
109 59 -61 103 -27 45 2 blend
rmoveto
73 131 54 102 29 -47 45 -75 10 -18 4 -6 4 blend
4 0 52 -102 73 -131 10 -16 -4 6 27 -47 -45 75 4 blend
rlineto
-256 -76 128 1 blend
hlineto
-44 52 34 -56 -10 16 2 blend
rmoveto
461 75 -125 1 blend
vlineto
127 -232 -127 -229 27 -45 -38 64 -27 45 -37 61 4 blend
rlineto
171 277 5 -9 15 -25 2 blend
rmoveto
-50 93 -66 119 234 -6 10 -1 3 -28 48 49 -83 68 -114 5 blend
0 -65 -119 -49 -93 -29 47 -49 83 -5 9 1 -3 4 blend
rlineto
-4 hlineto
48 -48 -22 36 22 -36 2 blend
rmoveto
126 232 26 -44 38 -64 2 blend
0 -461 -126 229 -75 125 -26 44 37 -61 3 blend
rlineto
</CharString>
<CharString name="A">
31 19 -31 1 blend
hmoveto
86 -54 90 1 blend
hlineto
115 366 23 73 21 72 21 76 25 -42 30 -50 2 -9 3 -11 4 -4 4 6 5 -7 0 -10 8 blend
rlinecurve
4 hlineto
20 -76 22 -72 23 -73 4 -6 -6 10 2 -3 4 -6 5 -9 -7 11 6 blend
rrcurveto
113 -366 90 25 -40 -30 50 -56 92 3 blend
0 -221 656 -96 -15 25 4 -6 68 -112 3 blend
0 -221 -656 -15 25 -4 6 2 blend
rlineto
117 199 -15 24 37 -61 2 blend
rmoveto
301 68 -301 -68 -8 15 -40 65 8 -15 40 -65 4 blend
hlineto
</CharString>
</CharStrings>
<VarStore Format="1">
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="-1.0"/>
<PeakCoord value="-1.0"/>
<EndCoord value="0.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="1.0"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
</VarRegionList>
<!-- VarDataCount=1 -->
<VarData index="0">
<!-- ItemCount=0 -->
<NumShorts value="0"/>
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<VarRegionIndex index="1" value="1"/>
</VarData>
</VarStore>
</CFFFont>

<GlobalSubrs>
<!-- The 'index' attribute is only for humans; it is ignored when parsed. -->
</GlobalSubrs>
</CFF2>

</ttFont>
43 changes: 43 additions & 0 deletions tests/buildcff2vf_data/expected_output/bug817.ttx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="3.43">

<GSUB>
<Version value="0x00010000"/>
<ScriptList>
<!-- ScriptCount=1 -->
<ScriptRecord index="0">
<ScriptTag value="DFLT"/>
<Script>
<DefaultLangSys>
<ReqFeatureIndex value="65535"/>
<!-- FeatureCount=1 -->
<FeatureIndex index="0" value="0"/>
</DefaultLangSys>
<!-- LangSysCount=0 -->
</Script>
</ScriptRecord>
</ScriptList>
<FeatureList>
<!-- FeatureCount=1 -->
<FeatureRecord index="0">
<FeatureTag value="test"/>
<Feature>
<!-- LookupCount=1 -->
<LookupListIndex index="0" value="0"/>
</Feature>
</FeatureRecord>
</FeatureList>
<LookupList>
<!-- LookupCount=1 -->
<Lookup index="0">
<LookupType value="1"/>
<LookupFlag value="0"/>
<!-- SubTableCount=1 -->
<SingleSubst index="0" Format="1">
<Substitution in="A" out="A"/>
</SingleSubst>
</Lookup>
</LookupList>
</GSUB>

</ttFont>
41 changes: 41 additions & 0 deletions tests/buildcff2vf_data/input/bug816/bug816.designspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<designspace format="3">
<axes>
<axis default="368" maximum="1000.0" minimum="0.0" name="weight" tag="wght">
</axis>
</axes>
<sources>
<source filename="source_fonts/SourceCode_ExtraLight.ufo" name="master_0">
<location>
<dimension name="weight" xvalue="0" />
</location>
</source>
<source filename="source_fonts/SourceCode_Regular.ufo" name="master_1">
<location>
<dimension name="weight" xvalue="368" />
</location>
</source>
<source filename="source_fonts/SourceCode_Black.ufo" name="master_2">
<location>
<dimension name="weight" xvalue="1000" />
</location>
</source>
</sources>
<instances>
<instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-ExtraLight" stylename="ExtraLight">
<location>
<dimension name="weight" xvalue="0" />
</location>
</instance>
<instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-Regular" stylename="Regular">
<location>
<dimension name="weight" xvalue="368" />
</location>
</instance>
<instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-Black" stylename="Black">
<location>
<dimension name="weight" xvalue="1000" />
</location>
</instance>
</instances>
</designspace>
Binary file added tests/buildcff2vf_data/input/bug816/source_fonts/SourceCode_Black.otf
View file
Open in desktop
Binary file not shown.
Binary file added tests/buildcff2vf_data/input/bug816/source_fonts/SourceCode_ExtraLight.otf
View file
Open in desktop
Binary file not shown.
Binary file added tests/buildcff2vf_data/input/bug816/source_fonts/SourceCode_Regular.otf
View file
Open in desktop
Binary file not shown.
Loading