Commit Graph
244 Commits
Author SHA1 Message Date
Behdad Esfahbod f26e0cd4ed [instancer] Fix HVAR partial instancing for map-less advance mappings (#6070)
* [instancer] Don't dedup VarStore rows when not optimizing

as_item_varstore dropped duplicate delta rows even with optimize=false,
where varidx_map is left empty and callers rely on original
VariationIndex values staying valid.  HVAR/VVAR subsetting uses that
mode when the source table has an implicit (map-less) advance mapping:
any two glyphs sharing identical deltas shifted every following row, so
the synthesized identity map pointed at wrong rows and past the end of
the VarData — advances silently froze or took neighbors' deltas when
partially instancing such fonts (e.g. Source Han fonts).

Fixes https://github.com/harfbuzz/harfbuzz/issues/6068

* [subset] Drop identity advance maps for map-less HVAR/VVAR sources

When the source table uses implicit glyph-id indexing, the subsetter
synthesized an advance DeltaSetIndexMap whose content was the identity
over every output glyph — equivalent to the implicit indexing it
replaced, just bigger.  Recognize that case in is_identity () and keep
the output map-less, like fontTools does.  Sources that carry a real
map keep one, preserving their form; truncated maps don't qualify since
glyphs past their end share the last value.

retain-num-glyphs expected files regenerated: NotoSansJP-VF.subset.otf
is map-less, and its redundant identity map is now dropped (verified
against fontTools output).

* [test/subset] Test partial instancing of map-less HVAR

ImplicitHVAR.ttf carries an HVAR with implicit (map-less) advance
indexing and deliberately duplicated delta rows, the combination that
broke before the row-dedup fix: rows shifted or fell off the end of the
rebuilt VarData and advances silently froze.  Expected outputs are
cross-checked against fontTools varLib.instancer + subset.
2026-07-29 11:29:23 -06:00
Behdad Esfahbod 33738aeda9 [subset/cff2] Harden partial instancing per review
- Dissolve private-dict blends of VarDatas unused by any retained
  charstring: under retain-gids, fdmap keeps FDs of hole glyphs the
  usage pass never scanned, and their dicts were rewritten against a
  dead transform.
- Take the partial path even when the store has regions but no
  VarData subtables; the verbatim-copy fallback emitted a region list
  whose axisCount contradicted the subsetted fvar (OTS-rejected).
- Make the usage pass honor drop-hints, so VarDatas referenced only by
  hint blends don't survive as bloat.
- Require an actual instancing request for the pinned path: a face
  without fvar plus a reused subset input made all_axes_pinned
  spuriously true.
- Error-compensate the fold rounding across private-dict operators:
  most blended dict values are delta-encoded, so independently rounded
  folds accumulated in the decoded absolutes (blue zones drifted by
  ~0.5 per element); now every absolute is within 0.5 of exact.
- Clarify HB_SUBSET_FLAGS_DOWNGRADE_CFF2 doc: it applies to fully
  pinned instancing.

Expected test outputs regenerated for the private-dict rounding
change.
2026-07-03 22:53:03 -06:00
Behdad Esfahbod f24bb86c95 [test/subset] Add CFF2 partial-instancing tests
Range limiting, pin-one-keep-one, a moved default, and axis dropping,
on AdobeVFPrototype.  Expected outputs are hb-subset's own (fontTools
TTX comparison does not apply to CFF2 charstring encodings); they were
verified geometrically against both the original font and fontTools
varLib.instancer output at a grid of locations in the kept ranges.
2026-07-03 21:39:55 -06:00
Qunxin Liu ac0979b6f4 [subset] fix bug in math table
Don't keep constructions for glyphs that are only added during math closure,
since we don't do recursive closure over math table.
2026-06-18 16:13:24 -06:00
Behdad Esfahbod 19f54f2cfd Merge pull request #5784 from harfbuzz/downgrade-cff-hintmask
[subset] Fix CFF2->CFF1 specializer hintmask encoding
2026-03-04 12:55:54 -07:00
Qunxin Liu 1c0a3a14d3 [subset] fix padding in gvar table
Add necessary padding if original font is using long format and
subsetted font is using short format
2026-01-20 14:47:54 -08:00
Qunxin Liu cf31e7ac4e [instancer] support full instancing for avar2 (#5676) 2025-12-11 10:54:49 -07:00
Qunxin Liu 0952bc0ac2 [subset] de-duplicate features (#5494) 2025-09-26 12:10:28 -04:00
Garret Rieger 54ab8f0df4 [repacker] make repacker object ids stable.
Prior to this change the object id for a vertex in the repacker graph is it's position in the topological ordering. As a result after each sorting the object ids change. This decouples the topological sorting from the object id assignments. A separate ordering list is retained. This simplifies handling around object ids which no longer needs to account for them shifting, and improves performance by eliminating the step of reassigned link object ids after each sort.
2025-09-15 16:34:44 -06:00
Behdad Esfahbod d6343fa3bf [instancer/varstore] Update test expectations 2025-09-13 13:38:47 -06:00
Garret Rieger aa58b43de4 [subset] Introduce HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS. (#5547)
Used in conjunction with retain gids, when set the num glyphs from the input font will be preserved. Empty glyphs will be inserted as necessary to maintain the num glyphs value. Put under experimental for now.
2025-09-12 14:24:41 -06:00
Behdad Esfahbod c9480db91b [instancer/varstore] Add a heuristic to speed up optimization 2025-09-12 12:51:26 -06:00
Qunxin Liu 77d073044e [subset] fix HVAR encoding width (#5523) 2025-09-02 15:40:51 -06:00
Khaled Hosny b7c55efe0d [subset] Fix shaping behaviour when pruning empty mark sets
See https://github.com/harfbuzz/harfbuzz/issues/5499
2025-08-26 00:45:26 +03:00
Qunxin Liu cd49b14b4f [subset] add more aggressive pruning for MarkLigPos and MarkMarkPos (#5434)
Remove lig/mark glyphs without defined anchor points after subsetting
2025-07-29 15:32:26 -06:00
Qunxin Liu 879c4ac784 [subset] MarkBasePos: remove base glyphs with empty base record
BaseRecord could become empty if all anchor offsets for retained mark
classes are null
2025-07-24 14:25:54 -07:00
Behdad Esfahbod 8eb2f07cc8 Merge branch 'main' into HVF 2025-05-26 13:23:08 -06:00
Garret Rieger fac64e5838 [instancer] add a test which checks calculation of vmtx tsb during CFF2 instancing. 2025-05-23 12:47:23 -06:00
Behdad Esfahbod a13fd9ae68 Merge branch 'main' into HVF 2025-05-21 12:23:19 -06:00
Garret Rieger 4e76727183 Add a test checks we can recover from cmap4 overflow. 2025-05-15 10:05:18 -06:00
Behdad Esfahbod aef3df5097 Merge branch 'main' into HVF 2025-04-20 00:37:24 -06:00
Garret Rieger efcb7d3de1 [subset] close unicodes over bidi mirror variants during subsetting.
Fixes #5281. Does the closure by default, but I've introduced a new flag and option to disable this behaviour since some users may want to get the minimal set if they know they don't need the mirrored variants.
2025-04-11 18:13:28 -06:00
Behdad Esfahbod 6b2563fff1 Merge branch 'main' into HVF 2025-04-06 15:05:25 -06:00
Behdad Esfahbod e5541a0b63 [subset/test/cmap14] Reduce tested combinations
Fixes https://github.com/harfbuzz/harfbuzz/issues/5254
2025-04-05 17:02:31 -06:00
Behdad Esfahbod d65fa93440 [subset/test/basics.tests] Reduce tested combinations 2025-04-05 16:58:06 -06:00
Behdad Esfahbod 19b4c6e559 [subset] "Fix" subset tests after recent fvar/avar precision changes 2025-03-02 17:00:17 -07:00
Garret Rieger ea1434b897 Split iup glyf partial instance tests into a separate set which ignores due to IUP rounding differences fonttools. 2025-02-25 19:02:11 +00:00
Behdad Esfahbod 9a0cf8d641 [test/subset/cff-japanese] Shrink test
Was taking too long.
2025-02-25 00:19:25 -07:00
Behdad Esfahbod 084fb3ab4f [test/subset/cmap] Shrink test
Was taking more than the rest of the test suite combined.
2025-02-25 00:16:27 -07:00
Garret Rieger b0d52abe97 [subset] consider variation selectors subsetting cmap14
cmap14 subsetting code was not considering variation selectors in the input unicode set when deciding which variant glyphs to keep. This updates subsetting to only keeps variant glyphs if their variation selector code point is in the input unicodes set.

For https://github.com/harfbuzz/harfbuzz/issues/4911
2024-11-11 13:45:08 -07:00
Qunxin Liu 622e9c33c3 [instancer] fix for incorrect offset calculation when we have gvar padding 2024-11-06 12:38:00 -07:00
Qunxin Liu 6fd76e1f67 [subset] offset format fix in gvar table 2024-09-17 15:23:43 -06:00
Qunxin Liu 634778efc0 [subset] bug fix in post table
insert retain-gid holes when retain-gids is enabled
2024-08-21 12:06:02 -06:00
Qunxin Liu 72502ef02b [instancer] dont return false when variation data is empty after partial instancing 2024-08-12 15:51:13 -06:00
David Corbett 0db136b1b0 [subset-cff] Shorten output of encode_num_tp 2024-05-12 09:04:02 -07:00
Qunxin Liu 7975c9cabd [instancer] bug fix for COLRv1, add missing mapping to VarIdx::NO_VARIATION 2024-05-09 08:34:14 -07:00
Qunxin Liu a5c9c82692 rename expected files from *.retain-all-codepoint.* to *.all.*
This is to fix file name too long error
tar: harfbuzz-8.4.0/test/subset/data/expected/sync_vmetrics/playwrite_mm.subset.default.retain-all-codepoint.SPED=25,YEXT=520,wght=100-400,slnt=18.iup_optimize.ttf: file name is too long (cannot be split); not dumped
tar: Exiting with failure status due to previous errors
2024-05-06 13:22:49 -07:00
Qunxin Liu f614a7d309 [instancer] add/update tests for COLRv1 instancing 2024-05-06 10:41:07 -07:00
Qunxin Liu ebcdadbf54 [instancer] add tests for instantiating BASE table 2024-05-03 17:22:16 -05:00
Garret Rieger 2cfa55056c [instancer] Switch to doubles for delta calculations.
FontTools uses double's internally so match FontTool's precision so we get the same results more often for floating point calculations.
2024-04-15 16:06:19 -06:00
Garret Rieger 6e87481731 [subset] add virtual links to keep the gdef varstore last. 2024-03-28 23:00:54 +00:00
Garret Rieger 7145607149 [subset] place the gdef var store at the end of the GDEF table.
It appears that some font processors assume it is the last sub table.
2024-03-28 23:00:54 +00:00
Garret Rieger 990fb14d78 [subset] Disable fonttools comparison in a few tests where rounding diffs show up.
Context: https://github.com/harfbuzz/harfbuzz/issues/4642
2024-03-28 17:00:12 -06:00
Garret Rieger 11f5dec75f [subset] Move post apply mvar test intance position to avoid rounding diff. 2024-03-28 17:00:12 -06:00
Garret Rieger 975bd39b15 [subset] Match hb rounding to fonttools for avg char width.
Update Muli and Roboto input test fonts to recalc class values. FontTools recalcs class values during instancing while harfbuzz does not (like the ft subsetter).
2024-03-28 17:00:12 -06:00
Garret Rieger ec46c4c2e6 [subset] Update subset test suite to match some changes made to fonttools.
FontTools has added pruning functionality for code pages which we don't yet have in harfbuzz. Update our test runner to disable that for now. Also match fonttools and always recalc usFirst/LastCharIndex even if no prune unicode ranges is set.
2024-03-28 17:00:12 -06:00
Qunxin Liu cfbb6a6872 [subset] support BASE table subsetting (#4618)
* [subset] support BASE table

* [subset] add tests for BASE table subsetting
2024-03-14 18:33:34 -06:00
Qunxin Liu 84771374e8 [instancer] add tests for iup delta optimization 2024-01-26 15:51:49 -08:00
Qunxin Liu df735213a8 [instancer-solver] port solver fix (#4519)
* [instancer-solver] port solver fix

from https://github.com/fonttools/fonttools/pull/3374
2023-12-06 10:50:29 -07:00
Qunxin Liu f1ac36ba7f [instancer] update hhea vertical metrics with OS/2 ones 2023-11-15 13:25:43 -07:00