diff --git a/src/hb-cff-specializer.hh b/src/hb-cff-specializer.hh index 005384e84..5b4dce5d0 100644 --- a/src/hb-cff-specializer.hh +++ b/src/hb-cff-specializer.hh @@ -254,6 +254,13 @@ encode_commands (const hb_vector_t &commands, if (cmd.op != OpCode_Invalid) encoder.encode_op (cmd.op); + /* hintmask/cntrmask are followed by raw mask bytes. */ + if (cmd.op == OpCode_hintmask || cmd.op == OpCode_cntrmask) + { + for (const auto &byte : cmd.mask_bytes) + encoder.encode_byte (byte); + } + if (encoder.in_error ()) return false; } diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh index 5128459d3..3140b9ca3 100644 --- a/src/hb-subset-cff-common.hh +++ b/src/hb-subset-cff-common.hh @@ -325,6 +325,7 @@ struct cff_font_dict_op_serializer_t : op_serializer_t struct cs_command_t { hb_vector_t args; + hb_vector_t mask_bytes; /* For hintmask/cntrmask payload bytes. */ op_code_t op; cs_command_t () : op (OpCode_Invalid) {} diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index a92d7528f..59748a4b2 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -218,6 +218,22 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) { SUPER::flush_hintmask (op, env, param); + /* Preserve hintmask payload in captured commands for specializer re-encoding. */ + if (param.commands && !param.drop_hints && param.commands->length > 0) + { + auto &cmd = param.commands->tail (); + if (cmd.op == op) + { + cmd.mask_bytes.resize (env.hintmask_size); + if (unlikely (cmd.mask_bytes.in_error ())) + { + env.set_error (); + return; + } + for (unsigned int i = 0; i < env.hintmask_size; i++) + cmd.mask_bytes[i] = env.str_ref[i]; + } + } if (!param.drop_hints) { str_encoder_t encoder (param.flatStr); diff --git a/test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf b/test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf new file mode 100644 index 000000000..82e2a5a5b Binary files /dev/null and b/test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf differ diff --git a/test/subset/data/fonts/SourceSerif4Variable-Roman-HelloWorld.otf b/test/subset/data/fonts/SourceSerif4Variable-Roman-HelloWorld.otf new file mode 100644 index 000000000..01906205c Binary files /dev/null and b/test/subset/data/fonts/SourceSerif4Variable-Roman-HelloWorld.otf differ diff --git a/test/subset/data/profiles/downgrade-cff2.txt b/test/subset/data/profiles/downgrade-cff2.txt new file mode 100644 index 000000000..c9bc19846 --- /dev/null +++ b/test/subset/data/profiles/downgrade-cff2.txt @@ -0,0 +1 @@ +--downgrade-cff2 diff --git a/test/subset/data/tests/downgrade_cff2.tests b/test/subset/data/tests/downgrade_cff2.tests new file mode 100644 index 000000000..4a0a7cf97 --- /dev/null +++ b/test/subset/data/tests/downgrade_cff2.tests @@ -0,0 +1,14 @@ +FONTS: +SourceSerif4Variable-Roman-HelloWorld.otf + +PROFILES: +downgrade-cff2.txt + +SUBSETS: +Hello World + +INSTANCES: +wght=400,opsz=20 + +OPTIONS: +no_fonttools diff --git a/test/subset/meson.build b/test/subset/meson.build index 736072d4d..870601830 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -62,6 +62,7 @@ tests = [ 'instantiate_colrv1', 'instantiate_glyf', 'instantiate_cff2', + 'downgrade_cff2', 'instantiate_cff2_tsb', 'full_instance', 'instance_feature_variations',