Backport to 7.0.0

scripts/gen-shaping-tests.py

@@ -11,7 +11,7 @@
 # There is no sane way to test them.
 IGNORE_TESTS = [
     # Disable this if you are on a Mac and want to update the macos tests.
-    'macos.tests',
+    # 'macos.tests',
     'coretext.tests',
     'directwrite.tests',
     'uniscribe.tests',

scripts/macos.tests

@@ -155,3 +155,6 @@
 
 # 12.3
 /System/Library/Fonts/Apple Color Emoji.ttc@8fa6ac4564651899da0b37d310d980db4de967d6;--font-funcs ot;1FAF1,1F3FF,200D,1FAF2,1F3FC;[u1FAF1.5.L=0+800|u1FAF2.2.R=0@-800,0+0]
+
+# https://github.com/harfbuzz/harfbuzz/issues/4020
+/System/Library/Fonts/LucidaGrande.ttc;--features=-liga[3:5];U+0066,U+0066,U+0020,U+0066,U+0066,U+0066,U+0020,U+0066,U+0066;[ff=0+1443|space=2+648|f=3+753|f=4+753|f=5+753|space=6+648|ff=7+1443]

src/hb/aat_layout.rs

@@ -1,10 +1,11 @@
 #![allow(dead_code)]
 
 use super::buffer::{hb_buffer_t, hb_glyph_info_t};
-use super::hb_font_t;
 use super::hb_tag_t;
 use super::ot_shape_plan::hb_ot_shape_plan_t;
 use super::{aat_layout_kerx_table, aat_layout_morx_table, aat_layout_trak_table};
+use super::{aat_map, hb_font_t};
+use crate::hb::aat_layout_common::hb_aat_apply_context_t;
 
 pub type hb_aat_layout_feature_type_t = u8;
 pub const HB_AAT_LAYOUT_FEATURE_TYPE_INVALID: u8 = 0xFF;
@@ -495,7 +496,19 @@ pub fn hb_aat_layout_substitute(
     face: &hb_font_t,
     buffer: &mut hb_buffer_t,
 ) {
-    aat_layout_morx_table::apply(plan, face, buffer);
+    let mut builder = aat_map::hb_aat_map_builder_t::default();
+
+    for feature in &plan.user_features {
+        builder.add_feature(face, feature);
+    }
+
+    let mut aat_map = aat_map::hb_aat_map_t::default();
+    if plan.apply_morx {
+        builder.compile(face, &mut aat_map);
+    }
+
+    let mut c = hb_aat_apply_context_t::new(plan, face, buffer);
+    aat_layout_morx_table::apply(&mut c, &mut aat_map);
 }
 
 pub fn hb_aat_layout_zero_width_deleted_glyphs(buffer: &mut hb_buffer_t) {

src/hb/aat_layout_common.rs

@@ -0,0 +1,29 @@
+use crate::hb::aat_map::range_flags_t;
+use crate::hb::buffer::hb_buffer_t;
+use crate::hb::face::hb_font_t;
+use crate::hb::hb_mask_t;
+use crate::hb::ot_shape_plan::hb_ot_shape_plan_t;
+
+pub struct hb_aat_apply_context_t<'a> {
+    pub plan: &'a hb_ot_shape_plan_t,
+    pub face: &'a hb_font_t<'a>,
+    pub buffer: &'a mut hb_buffer_t,
+    pub range_flags: Option<&'a mut [range_flags_t]>,
+    pub subtable_flags: hb_mask_t,
+}
+
+impl<'a> hb_aat_apply_context_t<'a> {
+    pub fn new(
+        plan: &'a hb_ot_shape_plan_t,
+        face: &'a hb_font_t<'a>,
+        buffer: &'a mut hb_buffer_t,
+    ) -> Self {
+        Self {
+            plan,
+            face,
+            buffer,
+            range_flags: None,
+            subtable_flags: 0,
+        }
+    }
+}

src/hb/aat_layout_kerx_table.rs

@@ -48,6 +48,8 @@ pub(crate) fn apply(
     face: &hb_font_t,
     buffer: &mut hb_buffer_t,
 ) -> Option<()> {
+    buffer.unsafe_to_concat(None, None);
+
     let mut seen_cross_stream = false;
     for subtable in face.tables().kerx?.subtables {
         if subtable.variable {