1278 Commits

Author SHA1 Message Date
Roozbeh Pournader
7a27214fcb Added merging tables for 'name' and 'gasp'. 2013-12-20 20:13:55 -05:00
Behdad Esfahbod
398770d51c [merge] Map GSUB/GPOS feature / lookup indices properly 2013-12-19 15:30:24 -05:00
Behdad Esfahbod
c68c0ff12f [merge] Minor 2013-12-19 14:25:17 -05:00
Behdad Esfahbod
2642934116 [merge] Add GSUB/GPOS
Doesn't renumber features / lookups yet.
2013-12-19 11:53:47 -05:00
Behdad Esfahbod
9c5e2ce1b6 Add a get() method to TTFont ala dict.get() 2013-12-19 11:38:56 -05:00
Behdad Esfahbod
12dd547c01 [merge] Port GDEF to mergeMap
There's some code duplication in mergeObjects that I'll refactor
later.
2013-12-19 05:58:57 -05:00
Behdad Esfahbod
92fd566577 [merge] Use NotImplemented as a singleton meaning "doesn't have"
And cleanup recalculate, so we don't accidentally mess something
that is NOT recalculated.
2013-12-19 05:27:53 -05:00
Behdad Esfahbod
6baf26ea74 [merge] Rename 2013-12-19 04:49:07 -05:00
Behdad Esfahbod
3b36f55adf [merge] Move tables out of merger object 2013-12-19 04:45:17 -05:00
Behdad Esfahbod
9e6adb6bd6 [merge] Move to per-class mergeMap 2013-12-19 04:37:48 -05:00
Behdad Esfahbod
db2410a2f1 [merge] Minor 2013-12-19 03:42:35 -05:00
Behdad Esfahbod
49028b3ba7 [merge] Minor cleanup 2013-12-18 17:36:18 -05:00
Roozbeh Pournader
e219c6c76f [merge] Update 'head', 'hhea', 'OS/2', and 'post' tables with new logic. 2013-12-18 17:25:37 -05:00
Roozbeh Pournader
47bee9cfbd [merge] Created new infrastructure for table merging logic 2013-12-18 17:22:19 -05:00
Behdad Esfahbod
f63e80e3fc [merge] py23 2013-12-18 17:14:26 -05:00
Behdad Esfahbod
fc1d0525b6 Merge branch 'merge' 2013-12-18 17:09:45 -05:00
Behdad Esfahbod
ee6340f475 Only track one parent per Writer
We were not using the extra parents anyway.
2013-12-17 06:31:37 -05:00
Behdad Esfahbod
ab0ca1bd6b Minor simplification 2013-12-17 06:19:15 -05:00
Behdad Esfahbod
6188b5b5f0 Remove unused variable 2013-12-17 06:11:41 -05:00
Behdad Esfahbod
dea08f2ba1 Minor optimization 2013-12-17 06:04:28 -05:00
Behdad Esfahbod
45ed572e31 [subset] Fix up from recent changes 2013-12-17 06:01:08 -05:00
Behdad Esfahbod
f6502635b9 Minor 2013-12-17 05:59:05 -05:00
Behdad Esfahbod
9e482332ba Fix subtable-split logic
Though, the split logic isn't implemented for GPOS, so I have not
been successful in actually exercising it so far.
2013-12-17 05:46:51 -05:00
Behdad Esfahbod
42d305a824 Further adjustment 2013-12-17 05:10:30 -05:00
Behdad Esfahbod
fcc56e637a Choose most compact representation when writing PUSH instructions
Can use some testing...
2013-12-17 05:06:37 -05:00
Behdad Esfahbod
965c87fb4a When disassembling, merge multiple PUSH ops
Fonts typically have multiple consecutive PUSHB / PUSHW
operators.  Merge them in the disassembled output.

This, for now, generates worse assmebly because all PUSHB's
grouped with PUSHW's now generate as PUSHW.  Followup fix
will address that.
2013-12-17 04:19:14 -05:00
Behdad Esfahbod
ce84d3215e Generate PUSH mnemonic for PUSHB/NPUSHB/PUSHW/NPUSHW
Reduces XML noise while reenabling the optimization
during assembly.

Fixes https://github.com/behdad/fonttools/issues/73
2013-12-17 04:02:10 -05:00
Behdad Esfahbod
3714c78c92 When writing PUSH instructions, obey requested opcode
Previously fonttools was choosing between the optimal opcode
from PUSHB, NPUSHB, PUSHW, and NPUSHW.  We now respect
whatever was requested and err if the format doesn't support
the data.

Morevoer, if the number of numbers to push is more than 255,
we add multiple push instructions to push all the numbers.

Finally, add a new pseudo-opcode "PUSH" that automatically
chooses the best format.

This, by itself, reduces roundtrip noise by not optimizing
the bytecode as it was before.  In a followup commit I'll
change the bytecode disassembler to always produce PUSH
in the textual instructions instead of the four variants.
That way, we get both the optimization during assembling,
and reduced noise in XML.

Part of https://github.com/behdad/fonttools/issues/73
2013-12-17 04:00:01 -05:00
Behdad Esfahbod
e93e29125f Don't write Format for Coverage, ClassDef, Single/Alternate/LigatureSubst
The format values for those are automatically handled in
postRead/preWrite to choose optimal format.  As such, don't write them
in XML.  Reduces noise.

Part of https://github.com/behdad/fonttools/issues/73
2013-12-17 03:06:10 -05:00
Behdad Esfahbod
6ed2eb4092 Write LookupType as a comment
We compute LookupType from the type of the subtables, so write it out
as an informative comment in XML as opposed to an element.
2013-12-17 02:57:29 -05:00
Behdad Esfahbod
5fec22bfcd Compute correct LookupType when compiling font
Also ensures that all subtables of a lookup have the same
lookup type.
2013-12-17 02:42:18 -05:00
Behdad Esfahbod
ea82d6dfd1 Handle NULL coverage table in ligature substitute
Just to be in line with Single and Alternate subst.
2013-12-17 01:58:26 -05:00
Behdad Esfahbod
dafdb2933a Further optimize table loading
Again, both faster and more memory efficient
2013-12-17 00:58:02 -05:00
Behdad Esfahbod
b4070bd629 Minor optimization of table loading
Is both faster and more memory efficient.
2013-12-17 00:44:33 -05:00
Behdad Esfahbod
0be386edb5 [subset] Fix subsetting of Khmer fonts
Read comment.
2013-12-16 20:52:52 -05:00
Khaled Hosny
522cd11d51 Remove unnecessary new line after <CFF> tag
No other table does that.
2013-12-16 01:29:16 -05:00
Behdad Esfahbod
283fb26820 By default, don't load fonts lazily
Lazy loading has implications on how people use objects.
So, by default, don't load lazily.  This only affects
GSUB/GDEF/GPOS/etc and is closer to what fonttools used
to do traditionally.

Turn lazy loading on in subset and inspect.
2013-12-16 00:52:29 -05:00
Behdad Esfahbod
43d7ac16b1 py23 Similar encoding fix in post table 2013-12-16 00:05:14 -05:00
Behdad Esfahbod
85a64db541 py23 Another cff encoding fix 2013-12-16 00:05:10 -05:00
Behdad Esfahbod
6c51f500fb [subset] Make sure objects are decompiled during subsetting
We need to ensureDecompiled() whenever an object is modified
before we look up any member of it.

Note that normally objects remaining decompiled until we try
to write them out is fine, except for when they depend on
font.getGlyphOrder().  This however, shouldn't normally happen
since if there's an object depending on the glyph list (eg. a
Coverage table), it should already have been process to subset
it according to the requested glyphs.  Or that's the idea at
least.  The few cases that were not handled are handled
explicitly now.

This was showing a bug when subsetting Cabin for example.
2013-12-15 23:15:15 -05:00
Behdad Esfahbod
fa95e87d42 [subset] Add more TODO items 2013-12-15 22:02:20 -05:00
Behdad Esfahbod
617ec41d4c Fix encoding conversion in CFF
Was broken with Python 3 and Salsa-Regular.otf for example.
2013-12-10 18:54:26 -05:00
Behdad Esfahbod
92af6a58b3 [subset] Work around OTS being stupid 2013-12-10 17:51:32 -05:00
Behdad Esfahbod
5fd8779fd3 [subset] Oops. Remove debug prints 2013-12-10 14:48:34 -05:00
Behdad Esfahbod
9041c2ddcd Actually add M_A_T_H_.py 2013-12-09 02:04:57 -05:00
Behdad Esfahbod
f952a22af7 Implement MATH table
Fixes https://github.com/behdad/fonttools/issues/67
2013-12-09 00:40:48 -05:00
Behdad Esfahbod
d76fa68785 Allow specifying table type as converter
Needed for upcoming MATH table.
2013-12-09 00:40:24 -05:00
Behdad Esfahbod
6bfee2cde5 Simplify Count writing
Needed for MATH table.
2013-12-09 00:35:15 -05:00
Denis Jacquerye
871495aff5 Add support for FontForge time stamp table
Fixes https://github.com/behdad/fonttools/issues/56
2013-12-08 19:32:21 -05:00
Behdad Esfahbod
10a3fff5cb [subset] Fixup --recommended-glyphs 2013-12-08 15:22:32 -05:00