From b11c14227fd2ae0091efbcd99d130668b304a90f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 4 Nov 2025 15:49:52 -0500 Subject: [PATCH] Match backtrack/lookahead per syllable (#5635) * [match-backtrack] Fix syllable-setting logic If accidentally backtrack_len() was equal idx, we were setting syllable, even though we want to match backtrack, which shouldn't match syllable. I'm surprised how this was not exposed before. Fixes https://github.com/harfbuzz/harfbuzz/issues/5597 * Always match backtrack per syllable * Always match lookahead per syllable as well * Add Indic test for per-syllable backtrack/lookahead matching --- src/hb-ot-layout-gsubgpos.hh | 11 +++++++++-- .../49bd922bd447fb15bb05abab5c7ceac8d547a3a2.ttf | Bin 0 -> 8600 bytes .../c2d320136762887c43d245ecd2ffc2c0d57cfcb3.ttf | Bin 0 -> 1828 bytes test/shape/data/in-house/tests/cluster.tests | 1 + .../data/in-house/tests/context-matching.tests | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/shape/data/in-house/fonts/49bd922bd447fb15bb05abab5c7ceac8d547a3a2.ttf create mode 100644 test/shape/data/in-house/fonts/c2d320136762887c43d245ecd2ffc2c0d57cfcb3.ttf diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index 4ad4faae6..3f4737b32 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -523,9 +523,16 @@ struct skipping_iterator_t #endif void reset (unsigned int start_index_) { + // For GSUB forward iterator idx = start_index_; end = c->buffer->len; - matcher.syllable = start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0; + matcher.syllable = c->buffer->cur().syllable(); + } + void reset_back (unsigned int start_index_, bool from_out_buffer = false) + { + // For GSUB backward iterator + idx = start_index_; + matcher.syllable = c->buffer->cur().syllable(); } #ifndef HB_OPTIMIZE_SIZE @@ -1554,7 +1561,7 @@ static bool match_backtrack (hb_ot_apply_context_t *c, TRACE_APPLY (nullptr); auto &skippy_iter = c->iter_context; - skippy_iter.reset (c->buffer->backtrack_len ()); + skippy_iter.reset_back (c->buffer->backtrack_len ()); skippy_iter.set_match_func (match_func, match_data); skippy_iter.set_glyph_data (backtrack); diff --git a/test/shape/data/in-house/fonts/49bd922bd447fb15bb05abab5c7ceac8d547a3a2.ttf b/test/shape/data/in-house/fonts/49bd922bd447fb15bb05abab5c7ceac8d547a3a2.ttf new file mode 100644 index 0000000000000000000000000000000000000000..7534faa4b56b049a582bcd05eee567cb43b8fee4 GIT binary patch literal 8600 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 literal 0 HcmV?d00001 diff --git a/test/shape/data/in-house/fonts/c2d320136762887c43d245ecd2ffc2c0d57cfcb3.ttf b/test/shape/data/in-house/fonts/c2d320136762887c43d245ecd2ffc2c0d57cfcb3.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a50b3eb947ab6d516f51e4bb3e054ec2c631de20 GIT binary patch literal 1828 zcma)6Yitx%6h3!$W+}A~9$kZN?M{^N2+~~_l}Kv>6n0ZuyR}=iHe~H|yWQQ|?kqb~ z+QvwbkkFzr5CZX0gC?cW*aUtUto2be{6X8)w2BfEjfNUY@DBlJn+eqK&TdQ9#5j{X z=X~dNzjNl!`0MNaltTx|Mq4YqUio_Q;KM{>ibz=R+p*J2`6Ln1b*utktv^uZ@IDG( zFYqB>VE6X#)gP*WmjUnd2V9<>ciNH5&I31vI+R2n%e@J#1D8j`O3Q|^(m#O9fuD-P zV0V!Lyb5@Av_tP+V$vY=@35A2DBTGXYoXFOmOZX?gx7wxy^hG1gPfZQRnzBAkq18P zNiq>)MX+h0pin@o*(=Z?iNT8u>tg7Xk$|Ul&GlRPX|VW-9NWyj39A~-O$a`#%Hjyo zvIy*(Cr5uf{ZfAU9kSVe=K(XWJDAD5y!Vsf6TSvqf?ek?u5kth78@=_S_f>01iRdG zxs!8qL}_`e?$)M--9>hf9p&#tID$Tjs?w4L$;0ws6(qqfNrHem%wOqkeSW`>UE~$h zec5K%CPeVrkg!TIB?22B$&{C)aoEy%0x~#bjG$w(1( z1l;xo5BKI_rEi|W{b`i0#j9td-j;vu%jsh#q0Xd61uZd6M&DWluSOZzjr zNKeqNj4n|jxih*Q8c_|Yq+1T8(*Nc3cZTyF{TGi4uuo8r)o}#9>Q*Oi zbmM_m4@(&Gex+JOs?-K+$co*DdFY5zVb>73&Z?oKriOFk!W}{1Jff4DF`*D5J7A4N z@@cnX#i41i@mb!V_j*PmzBI-js!??{5KhKg132wUyRxw^9O-OVlHBPjW{0Vm^|E5t zCls?oqPaZB_PTi?b!|2%;WtTl^6_MW<;5g&IJ<)EjAb<>yAL0CyFI0D_vQ*U(UXit zqPpyHdpvS|G%WKS<=Uj$77pq1woW~&CN+7_x~Q%vv@I@IB&J6@n@dA#hbxZARyD3` zF8(Qk+@AGTvc*@<5SBB9TNEou*{61e+qGCE&S8r(kMSv^r6U5UuH?Pdy*G5x*)=A$ z?QB2jEiwytUb$hcygF)loW_c`?S|x^GP5go$98GQ_8&b^a`lANcdYNN6NLjO&x}l+ zQC>V=Qe`){o6iKzXU$c&A2%wU50J=M;d5_Jrf%Mt4La@yQ?A+Il7_n*9OmUz%D8OL zOPw{Yyyp1!S2_E(Ip~=9a^UPa=iU)1-Wq>3SX3Vz8o%`6$G?2x+gH28wHO|bQ(?84EMz5LUFxU&DW!15^rbNjFT{`{lsiBXGKIvC>lyya$TDk^? XyPb+Ig+4eR8ZWvwHfl&t{;T;5+_098 literal 0 HcmV?d00001 diff --git a/test/shape/data/in-house/tests/cluster.tests b/test/shape/data/in-house/tests/cluster.tests index 544a561be..2c8669bee 100644 --- a/test/shape/data/in-house/tests/cluster.tests +++ b/test/shape/data/in-house/tests/cluster.tests @@ -4,3 +4,4 @@ ../fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf;--cluster-level=1;U+05D4,U+05B7,U+05E9,U+05BC,U+05C1,U+05B8,U+05DE,U+05B4,U+05DD;[uni05DD=8+1359|uni05B4=7@111,0+0|uni05DE=6+1391|uni05B8=5+0|uni05BC=3+0|uni05C1=3+0|uni05E9=2+1451|uni05B7=1@28,0+0|uni05D4=0+1338] ../fonts/6f36d056bad6d478fc0bf7397bd52dc3bd197d5f.ttf;--cluster-level=1;U+099B,U+09CB,U+09C8,U+09C2,U+09CB,U+098C;[evowelsigninibeng=0+346|aivowelsignbeng=0+346|evowelsignbeng=0+346|chabeng=0+687|uuvowelsignlongbeng=0@-96,0+0|aavowelsignbeng=0+266|aavowelsignbeng=4+266|lvocalicbeng=5+639] ../fonts/fd07ea46e4d8368ada1776208c07fd596f727852.ttf;--cluster-level=1;U+0D4E,U+0D4D,U+200D;[uni0D4E=0+0|uni25CC=0+418|uni0D4D=0+0|space=0+0] +../fonts/c2d320136762887c43d245ecd2ffc2c0d57cfcb3.ttf;;U+0DAF,U+0DCF,U+0DAF;[dasinh=0+547|aavowelsignsinh=0+379|dasinh=2+532] diff --git a/test/shape/data/in-house/tests/context-matching.tests b/test/shape/data/in-house/tests/context-matching.tests index 9f85a0693..4511c7409 100644 --- a/test/shape/data/in-house/tests/context-matching.tests +++ b/test/shape/data/in-house/tests/context-matching.tests @@ -4,3 +4,4 @@ ../fonts/5bbf3712e6f79775c66a4407837a90e591efbef2.ttf;;U+1F1FA,U+1F1FC;[gid3=0+2550] ../fonts/a59fd13f1525a91cbe529c882e93d9d1fbb80463.ttf;--font-funcs=ot;U+0041,U+0042;[gid4=0+1366|gid4=0+1366|gid4=0+1366|gid4=0+1366|gid5=1+1366] ../fonts/bef923f4ccb474f961c43b63a9c74b7d9b7a023f.ttf;;U+0061,U+002E,U+002E,U+002E;[a=0+600|SPC=1+600|SPC=2+600|period_period_period.liga=3+600] +../fonts/49bd922bd447fb15bb05abab5c7ceac8d547a3a2.ttf;;U+0995,U+09BE,U+09B9,U+09BF,U+09A8,U+09C0;[uni0995=0+807|uni09BE=0+266|uni09BF.short01=2+266|uni09B9=2+534|uni09A8=4+602|uni09C0=4+266]