Merge commit '33a3f8de60dcad7535f14f07d6710144548853ac'

Author: Sibras

.ci/requirements.txt

@@ -81,7 +81,7 @@ ninja==1.11.1.4 \
     # via -r requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==80.0.0 \
-    --hash=sha256:a38f898dcd6e5380f4da4381a87ec90bd0a7eec23d204a5552e80ee3cab6bd27 \
-    --hash=sha256:c40a5b3729d58dd749c0f08f1a07d134fb8a0a3d7f87dc33e7c5e1f762138650
+setuptools==80.4.0 \
+    --hash=sha256:5a78f61820bc088c8e4add52932ae6b8cf423da2aff268c23f813cfbb13b4006 \
+    --hash=sha256:6cdc8cb9a7d590b237dbe4493614a9b75d0559b888047c1f67d49ba50fc3edb2
     # via -r requirements.in

NEWS

@@ -1,3 +1,18 @@
+Overview of changes leading to 11.2.1
+Monday, May 12, 2025
+====================================
+- Various build improvements.
+- Fix build with HB_NO_DRAW and HB_NO_PAINT
+- Add an optional “harfruzz” shaper that uses HarfRuzz; an ongoing Rust port of
+  HarfBuzz shaping. This shaper is mainly used for testing the output of the
+  Rust implementation.
+- Fox regression that caused applying unsafe_to_break() to the whole buffer to
+  be ignored.
+- Update USE data files.
+- Fix getting advances of out-of-rage glyph indices in DirectWrite font
+  functions.
+
+
 Overview of changes leading to 11.2.0
 Monday, April 28, 2025
 ====================================
@@ -21,6 +36,7 @@ Monday, April 28, 2025
   -hb_font_funcs_set_draw_glyph_func()
   -hb_font_funcs_set_paint_glyph_func()
 
+
 Overview of changes leading to 11.1.0
 Wednesday, April 16, 2025
 ====================================

meson.build

@@ -1,6 +1,6 @@
 project('harfbuzz', ['c', 'cpp'],
   meson_version: '>= 0.60.0',
-  version: '11.2.0',
+  version: '11.2.1',
   default_options: [
     'cpp_eh=none',          # Just to support msvc, we are passing -fno-exceptions also anyway
     # 'cpp_rtti=false',     # Do NOT enable, wraps inherit it and ICU needs RTTI
@@ -205,6 +205,12 @@ if get_option('fontations').enabled()
   fontations_dep_found = true
 endif
 
+harfruzz_dep_found = false
+if get_option('harfruzz').enabled()
+  add_languages(['rust'], native: false, required : true)
+  harfruzz_dep_found = true
+endif
+
 conf = configuration_data()
 incconfig = include_directories('.')
 
@@ -250,6 +256,10 @@ if fontations_dep_found
   conf.set('HAVE_FONTATIONS', 1)
 endif
 
+if harfruzz_dep_found
+  conf.set('HAVE_HARFRUZZ', 1)
+endif
+
 if wasm_dep.found()
   conf.set('HAVE_WASM', 1)
   conf.set('HB_WASM_MODULE_DIR', '"'+get_option('prefix')+'/'+get_option('libdir')+'/harfbuzz/wasm"')
@@ -479,8 +489,9 @@ build_summary = {
     },
   'Platform shapers (not normally needed)':
     {'CoreText': conf.get('HAVE_CORETEXT', 0) == 1,
-     'DirectWrite (experimental)': conf.get('HAVE_DIRECTWRITE', 0) == 1,
+     'DirectWrite': conf.get('HAVE_DIRECTWRITE', 0) == 1,
      'GDI/Uniscribe': (conf.get('HAVE_GDI', 0) == 1) and (conf.get('HAVE_UNISCRIBE', 0) == 1),
+     'HarfRuzz': conf.get('HAVE_HARFRUZZ', 0) == 1,
     },
   'Other features':
     {'Documentation': conf.get('HAVE_GTK_DOC', 0) == 1,

meson_options.txt

@@ -14,15 +14,17 @@ option('graphite', type: 'feature', value: 'disabled',
 option('graphite2', type: 'feature', value: 'disabled',
   description: 'Enable Graphite2 complementary shaper')
 option('freetype', type: 'feature', value: 'auto',
-  description: 'Enable freetype interop helpers')
+  description: 'Enable freetype font backend')
 option('fontations', type: 'feature', value: 'disabled',
-  description: 'Enabled fontations font functions')
+  description: 'Enable fontations font backend')
 option('gdi', type: 'feature', value: 'disabled',
-  description: 'Enable GDI helpers and Uniscribe shaper backend (Windows only)')
+  description: 'Enable GDI helpers and Uniscribe shaper backend on Windows')
 option('directwrite', type: 'feature', value: 'disabled',
-  description: 'Enable DirectWrite shaper backend on Windows')
+  description: 'Enable DirectWrite shaper and font backend on Windows')
 option('coretext', type: 'feature', value: 'disabled',
-  description: 'Enable CoreText shaper backend on macOS')
+  description: 'Enable CoreText shaper and font backend on Apple platforms')
+option('harfruzz', type: 'feature', value: 'disabled',
+  description: 'Enable HarfRuzz shaper backend')
 option('wasm', type: 'feature', value: 'disabled',
   description: 'Enable WebAssembly shaper backend (experimental)')
 

src/OT/Layout/GPOS/CursivePosFormat1.hh

@@ -130,7 +130,7 @@ struct CursivePosFormat1
 	unlikely (!this_record.entryAnchor.sanitize (&c->sanitizer, this))) return_trace (false);
     hb_barrier ();
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_from;
     if (unlikely (!skippy_iter.prev (&unsafe_from)))

src/OT/Layout/GPOS/MarkBasePosFormat1.hh

@@ -119,7 +119,7 @@ struct MarkBasePosFormat1_2
     /* Now we search backwards for a non-mark glyph.
      * We don't use skippy_iter.prev() to avoid O(n^2) behavior. */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
 
     if (c->last_base_until > buffer->idx)

src/OT/Layout/GPOS/MarkLigPosFormat1.hh

@@ -101,7 +101,7 @@ struct MarkLigPosFormat1_2
 
     /* Now we search backwards for a non-mark glyph */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
 
     if (c->last_base_until > buffer->idx)

src/OT/Layout/GPOS/MarkMarkPosFormat1.hh

@@ -100,7 +100,7 @@ struct MarkMarkPosFormat1_2
     if (likely (mark1_index == NOT_COVERED)) return_trace (false);
 
     /* now we search backwards for a suitable mark glyph until a non-mark glyph */
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     skippy_iter.set_lookup_props (c->lookup_props & ~(uint32_t)LookupFlag::IgnoreFlags);
     unsigned unsafe_from;

src/OT/Layout/GPOS/PairPosFormat1.hh

@@ -148,7 +148,7 @@ struct PairPosFormat1_3
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_to;
     if (unlikely (!skippy_iter.next (&unsafe_to)))

src/OT/Layout/GPOS/PairPosFormat2.hh

@@ -179,7 +179,7 @@ struct PairPosFormat2_4 : ValueBase
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_to;
     if (unlikely (!skippy_iter.next (&unsafe_to)))