src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh

*** 1072,1085 ****
      skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
      do {
        if (!skippy_iter.prev ()) return_trace (false);
        /* We only want to attach to the first of a MultipleSubst sequence.
         * https://github.com/harfbuzz/harfbuzz/issues/740
!        * Reject others. */
        if (!_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx]) ||
            0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) ||
            (skippy_iter.idx == 0 ||
             _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx]) !=
             _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx - 1]) ||
             _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) !=
             _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx - 1]) + 1
             ))
--- 1072,1088 ----
      skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
      do {
        if (!skippy_iter.prev ()) return_trace (false);
        /* We only want to attach to the first of a MultipleSubst sequence.
         * https://github.com/harfbuzz/harfbuzz/issues/740
!        * Reject others...
!        * ...but stop if we find a mark in the MultipleSubst sequence:
!        * https://github.com/harfbuzz/harfbuzz/issues/1020 */
        if (!_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx]) ||
            0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) ||
            (skippy_iter.idx == 0 ||
+            _hb_glyph_info_is_mark (&buffer->info[skippy_iter.idx - 1]) ||
             _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx]) !=
             _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx - 1]) ||
             _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) !=
             _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx - 1]) + 1
             ))