diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index e9ba284ca..2121dd234 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -1964,10 +1964,16 @@ struct item_variations_t if (!front_mapping.set ((major<<16) + minor, &row)) return false; - if (delta_rows_map.has (&row)) - continue; + /* Duplicate rows may only be dropped when optimizing: without a + * varidx_map the caller relies on original VariationIndex values + * staying valid (e.g. HVAR/VVAR with an implicit advance mapping). */ + if (optimize) + { + if (delta_rows_map.has (&row)) + continue; - delta_rows_map.set (&row, 1); + delta_rows_map.set (&row, 1); + } major_rows.push (&row); } diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh index f7be19e93..dda30eca8 100644 --- a/src/hb-ot-var-hvar-table.hh +++ b/src/hb-ot-var-hvar-table.hh @@ -49,6 +49,12 @@ struct index_map_subset_plan_t bool bypass_empty = true) { map_count = 0; + full_map_count = plan->new_to_old_gid_list.length ? + plan->new_to_old_gid_list.tail ().first + 1 : 0; + /* Only the advance mapping may be dropped in favor of implicit + * glyph-id indexing (for the others a null offset means no deltas), + * and only when the source was map-less too, preserving its form. */ + can_drop_to_implicit = !bypass_empty && !index_map; max_inners.init (); output_map.init (); @@ -187,11 +193,24 @@ struct index_map_subset_plan_t DeltaSetIndexMap::min_size); } - bool is_identity () const { return get_output_map ().length == 0; } + bool is_identity () const + { + if (!output_map) return true; + /* An advance map whose entries are the identity over every output + * glyph is equivalent to implicit glyph-id indexing; drop it. A + * truncated map doesn't qualify: glyphs past its end share its last + * value, not their own ids. */ + if (!can_drop_to_implicit || map_count != full_map_count) return false; + for (unsigned i = 0; i < map_count; i++) + if (output_map.arrayZ[i] != i) return false; + return true; + } hb_array_t get_output_map () const { return output_map.as_array (); } protected: unsigned int map_count; + unsigned int full_map_count; + bool can_drop_to_implicit; hb_vector_t max_inners; unsigned int outer_bit_count; unsigned int inner_bit_count; diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf new file mode 100644 index 000000000..0561b7734 Binary files /dev/null and b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf differ diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=300-600.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=300-600.ttf new file mode 100644 index 000000000..5bf6d58b9 Binary files /dev/null and b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=300-600.ttf differ diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf new file mode 100644 index 000000000..97c16721d Binary files /dev/null and b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf differ diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf new file mode 100644 index 000000000..35af082a6 Binary files /dev/null and b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf differ diff --git a/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf b/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf index 8105e7907..43e8bcc60 100644 Binary files a/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf and b/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf differ diff --git a/test/subset/data/fonts/ImplicitHVAR.ttf b/test/subset/data/fonts/ImplicitHVAR.ttf new file mode 100644 index 000000000..2f4d74eeb Binary files /dev/null and b/test/subset/data/fonts/ImplicitHVAR.ttf differ diff --git a/test/subset/data/tests/hvar_partial_instance_implicit_map.tests b/test/subset/data/tests/hvar_partial_instance_implicit_map.tests new file mode 100644 index 000000000..4dc40f039 --- /dev/null +++ b/test/subset/data/tests/hvar_partial_instance_implicit_map.tests @@ -0,0 +1,13 @@ +FONTS: +ImplicitHVAR.ttf + +PROFILES: +default.txt + +SUBSETS: +* +ABC + +INSTANCES: +wght=300:600 +wght=200:400:800 diff --git a/test/subset/meson.build b/test/subset/meson.build index e174de892..1c8298cdc 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -76,6 +76,7 @@ tests = [ 'instantiate_cff2_update_metrics', 'layout.empty_ligature_offset', 'glyf_partial_instancing', + 'hvar_partial_instance_implicit_map', 'mvar_partial_instance', 'update_def_wght', 'feature_variations_partial_instance',