HarfBuzzSharp 2.6.1

.gitmodules

@@ -9,7 +9,7 @@
 [submodule "externals/harfbuzz"]
 	path = externals/harfbuzz
 	url = https://github.com/harfbuzz/harfbuzz.git
-	branch = 2.5.3
+	branch = 2.6.1
 [submodule "docs"]
 	path = docs
 	url = https://github.com/mono/SkiaSharp-API-docs

VERSIONS.txt

@@ -2,7 +2,7 @@
 ANGLE.WindowsStore      release     2.1.13
 mdoc.targets            release     5.7.4.9
 mdoc                    release     5.7.4.9
-harfbuzz                release     2.5.3
+harfbuzz                release     2.6.1
 skia                    release     m68
 xunit                   release     2.4.1
 xunit.runner.console    release     2.4.1
@@ -18,15 +18,15 @@ AtkSharp                release     3.22.24.37
 
 # native sonames
 libSkiaSharp            soname      68.1.0
-HarfBuzz                soname      0.20503.0
+HarfBuzz                soname      0.20601.0
 
 # SkiaSharp.dll
 SkiaSharp               assembly    1.68.0.0
 SkiaSharp               file        1.68.1.0
 
 # HarfBuzzSharp.dll
 HarfBuzzSharp           assembly    1.0.0.0
-HarfBuzzSharp           file        2.5.3.0
+HarfBuzzSharp           file        2.6.1.0
 
 # nuget versions
 SkiaSharp                                       nuget       1.68.1
@@ -41,5 +41,5 @@ SkiaSharp.Views.WPF                             nuget       1.68.1
 SkiaSharp.Views.Forms                           nuget       1.68.1
 SkiaSharp.Views.Forms.WPF                       nuget       1.68.1
 SkiaSharp.HarfBuzz                              nuget       1.68.1
-HarfBuzzSharp                                   nuget       2.5.3
-HarfBuzzSharp.NativeAssets.Linux                nuget       2.5.3
+HarfBuzzSharp                                   nuget       2.6.1
+HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1

binding/HarfBuzzSharp.Shared/Buffer.cs

@@ -180,6 +180,15 @@ public unsafe void AddUtf32 (ReadOnlySpan<uint> text, int itemOffset, int itemLe
 			}
 		}
 
+		public void AddUtf32 (ReadOnlySpan<int> text) => AddUtf32 (text, 0, -1);
+
+		public unsafe void AddUtf32 (ReadOnlySpan<int> text, int itemOffset, int itemLength)
+		{
+			fixed (int* integers = text) {
+				AddUtf32 ((IntPtr)integers, text.Length, itemOffset, itemLength);
+			}
+		}
+
 		public void AddUtf32 (IntPtr text, int textLength) =>
 			AddUtf32 (text, textLength, 0, -1);
 
@@ -204,6 +213,15 @@ public unsafe void AddCodepoints (ReadOnlySpan<uint> text, int itemOffset, int i
 			}
 		}
 
+		public void AddCodepoints (ReadOnlySpan<int> text) => AddCodepoints (text, 0, -1);
+
+		public unsafe void AddCodepoints (ReadOnlySpan<int> text, int itemOffset, int itemLength)
+		{
+			fixed (int* codepoints = text) {
+				AddCodepoints ((IntPtr)codepoints, text.Length, itemOffset, itemLength);
+			}
+		}
+
 		public void AddCodepoints (IntPtr text, int textLength) => AddCodepoints (text, textLength, 0, -1);
 
 		public void AddCodepoints (IntPtr text, int textLength, int itemOffset, int itemLength)

binding/HarfBuzzSharp.Shared/Definitions.cs

@@ -376,4 +376,67 @@ public enum UnicodeGeneralCategory
 		ParagraphSeparator,   // Zp
 		SpaceSeparator        // Zs
 	}
+
+	public enum OpenTypeMetricsTag : uint
+	{
+		HorizontalAscender = (((byte)'h' << 24) | ((byte)'a' << 16) | ((byte)'s' << 8) | (byte)'c'),
+		HorizontalDescender = (((byte)'h' << 24) | ((byte)'d' << 16) | ((byte)'s' << 8) | (byte)'c'),
+		HorizontalLineGap = (((byte)'h' << 24) | ((byte)'l' << 16) | ((byte)'g' << 8) | (byte)'p'),
+		HorizontalClippingAscent = (((byte)'h' << 24) | ((byte)'c' << 16) | ((byte)'l' << 8) | (byte)'a'),
+		HorizontalClippingDescent = (((byte)'h' << 24) | ((byte)'c' << 16) | ((byte)'l' << 8) | (byte)'d'),
+
+		VerticalAscender = (((byte)'v' << 24) | ((byte)'a' << 16) | ((byte)'s' << 8) | (byte)'c'),
+		VerticalDescender = (((byte)'v' << 24) | ((byte)'d' << 16) | ((byte)'s' << 8) | (byte)'c'),
+		VerticalLineGap = (((byte)'v' << 24) | ((byte)'l' << 16) | ((byte)'g' << 8) | (byte)'p'),
+
+		HorizontalCaretRise = (((byte)'h' << 24) | ((byte)'c' << 16) | ((byte)'r' << 8) | (byte)'s'),
+		HorizontalCaretRun = (((byte)'h' << 24) | ((byte)'c' << 16) | ((byte)'r' << 8) | (byte)'n'),
+		HorizontalCaretOffset = (((byte)'h' << 24) | ((byte)'c' << 16) | ((byte)'o' << 8) | (byte)'f'),
+
+		VerticalCaretRise = (((byte)'v' << 24) | ((byte)'c' << 16) | ((byte)'r' << 8) | (byte)'s'),
+		VerticalCaretRun = (((byte)'v' << 24) | ((byte)'c' << 16) | ((byte)'r' << 8) | (byte)'n'),
+		VerticalCaretOffset = (((byte)'v' << 24) | ((byte)'c' << 16) | ((byte)'o' << 8) | (byte)'f'),
+
+		XHeight = (((byte)'x' << 24) | ((byte)'h' << 16) | ((byte)'g' << 8) | (byte)'t'),
+
+		CapHeight = (((byte)'c' << 24) | ((byte)'p' << 16) | ((byte)'h' << 8) | (byte)'t'),
+
+		SubScriptEmXSize = (((byte)'s' << 24) | ((byte)'b' << 16) | ((byte)'x' << 8) | (byte)'s'),
+		SubScriptEmYSize = (((byte)'s' << 24) | ((byte)'b' << 16) | ((byte)'y' << 8) | (byte)'s'),
+		SubScriptEmXOffset = (((byte)'s' << 24) | ((byte)'b' << 16) | ((byte)'x' << 8) | (byte)'o'),
+		SubScriptEmYOffset = (((byte)'s' << 24) | ((byte)'b' << 16) | ((byte)'y' << 8) | (byte)'o'),
+
+		SuperScriptEmXSize = (((byte)'s' << 24) | ((byte)'p' << 16) | ((byte)'x' << 8) | (byte)'s'),
+		SuperScriptEmYSize = (((byte)'s' << 24) | ((byte)'p' << 16) | ((byte)'y' << 8) | (byte)'s'),
+		SuperScriptEmXOffset = (((byte)'s' << 24) | ((byte)'p' << 16) | ((byte)'x' << 8) | (byte)'o'),
+		SuperScriptEmYOffset = (((byte)'s' << 24) | ((byte)'p' << 16) | ((byte)'y' << 8) | (byte)'o'),
+
+		StrikeoutSize = (((byte)'s' << 24) | ((byte)'t' << 16) | ((byte)'r' << 8) | (byte)'s'),
+		StrikeoutOffset = (((byte)'s' << 24) | ((byte)'t' << 16) | ((byte)'r' << 8) | (byte)'o'),
+
+		UnderlineSize = (((byte)'u' << 24) | ((byte)'n' << 16) | ((byte)'d' << 8) | (byte)'s'),
+		UnderlineOffset = (((byte)'u' << 24) | ((byte)'n' << 16) | ((byte)'d' << 8) | (byte)'o'),
+	}
+
+	public readonly struct OpenTypeMetrics
+	{
+		private readonly IntPtr font;
+
+		public OpenTypeMetrics (IntPtr font)
+		{
+			this.font = font;
+		}
+
+		public bool TryGetPosition (OpenTypeMetricsTag metricsTag, out int position) =>
+			HarfBuzzApi.hb_ot_metrics_get_position (font, metricsTag, out position);
+
+		public float GetVariation (OpenTypeMetricsTag metricsTag) =>
+			HarfBuzzApi.hb_ot_metrics_get_variation (font, metricsTag);
+
+		public int GetXVariation (OpenTypeMetricsTag metricsTag) =>
+			HarfBuzzApi.hb_ot_metrics_get_x_variation (font, metricsTag);
+
+		public int GetYVariation (OpenTypeMetricsTag metricsTag) =>
+			HarfBuzzApi.hb_ot_metrics_get_y_variation (font, metricsTag);
+	}
 }

binding/HarfBuzzSharp.Shared/Font.cs

@@ -17,6 +17,7 @@ public Font (Face face)
 				throw new ArgumentNullException (nameof (face));
 
 			Handle = HarfBuzzApi.hb_font_create (face.Handle);
+			OpenTypeMetrics = new OpenTypeMetrics (Handle);
 		}
 
 		public Font (Font parent)
@@ -29,10 +30,13 @@ public Font (Font parent)
 
 			Parent = parent;
 			Handle = HarfBuzzApi.hb_font_create_sub_font (parent.Handle);
+			OpenTypeMetrics = new OpenTypeMetrics (Handle);
 		}
 
 		public Font Parent { get; }
 
+		public OpenTypeMetrics OpenTypeMetrics { get; }
+
 		public string[] SupportedShapers =>
 			PtrToStringArray (HarfBuzzApi.hb_shape_list_shapers ()).ToArray ();
 
@@ -63,12 +67,21 @@ public bool TryGetHorizontalFontExtents (out FontExtents extents) =>
 		public bool TryGetVerticalFontExtents (out FontExtents extents) =>
 			HarfBuzzApi.hb_font_get_v_extents (Handle, out extents);
 
+		public bool TryGetNominalGlyph (int unicode, out uint glyph) =>
+			TryGetNominalGlyph ((uint)unicode, out glyph);
+
 		public bool TryGetNominalGlyph (uint unicode, out uint glyph) =>
 			HarfBuzzApi.hb_font_get_nominal_glyph (Handle, unicode, out glyph);
 
+		public bool TryGetVariationGlyph (int unicode, out uint glyph) =>
+			TryGetVariationGlyph (unicode, 0, out glyph);
+
 		public bool TryGetVariationGlyph (uint unicode, out uint glyph) =>
 			HarfBuzzApi.hb_font_get_variation_glyph (Handle, unicode, 0, out glyph);
 
+		public bool TryGetVariationGlyph (int unicode, uint variationSelector, out uint glyph) =>
+			TryGetVariationGlyph ((uint)unicode, variationSelector, out glyph);
+
 		public bool TryGetVariationGlyph (uint unicode, uint variationSelector, out uint glyph) =>
 			HarfBuzzApi.hb_font_get_variation_glyph (Handle, unicode, variationSelector, out glyph);
 
@@ -149,9 +162,15 @@ public unsafe bool TryGetGlyphName (uint glyph, out string name)
 		public bool TryGetGlyphFromName (string name, out uint glyph) =>
 			HarfBuzzApi.hb_font_get_glyph_from_name (Handle, name, name.Length, out glyph);
 
+		public bool TryGetGlyph (int unicode, out uint glyph) =>
+			TryGetGlyph ((uint)unicode, 0, out glyph);
+
 		public bool TryGetGlyph (uint unicode, out uint glyph) =>
 			TryGetGlyph (unicode, 0, out glyph);
 
+		public bool TryGetGlyph (int unicode, uint variationSelector, out uint glyph) =>
+			TryGetGlyph ((uint)unicode, variationSelector, out glyph);
+
 		public bool TryGetGlyph (uint unicode, uint variationSelector, out uint glyph) =>
 			HarfBuzzApi.hb_font_get_glyph (Handle, unicode, variationSelector, out glyph);
 

binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs

@@ -218,6 +218,15 @@ internal unsafe class HarfBuzzApi
 
 		[DllImport (HARFBUZZ, CallingConvention = CallingConvention.Cdecl)]
 		public extern static void hb_ot_font_set_funcs (hb_font_t font);
+		[DllImport (HARFBUZZ, CallingConvention = CallingConvention.Cdecl)]
+		[return: MarshalAs (UnmanagedType.I1)]
+		public extern static hb_bool_t hb_ot_metrics_get_position (hb_font_t font, OpenTypeMetricsTag metrics_tag, out hb_position_t position     /* OUT.  May be NULL. */);
+		[DllImport (HARFBUZZ, CallingConvention = CallingConvention.Cdecl)]
+		public extern static float hb_ot_metrics_get_variation (hb_font_t font, OpenTypeMetricsTag metrics_tag);
+		[DllImport (HARFBUZZ, CallingConvention = CallingConvention.Cdecl)]
+		public extern static hb_position_t hb_ot_metrics_get_x_variation (hb_font_t font, OpenTypeMetricsTag metrics_tag);
+		[DllImport (HARFBUZZ, CallingConvention = CallingConvention.Cdecl)]
+		public extern static hb_position_t hb_ot_metrics_get_y_variation (hb_font_t font, OpenTypeMetricsTag metrics_tag);
 
 		// hb_buffer_t
 

native-builds/libHarfBuzzSharp_android/config.h

@@ -138,7 +138,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.5.3"
+#define PACKAGE_STRING "HarfBuzz 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -147,7 +147,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.3"
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

native-builds/libHarfBuzzSharp_android/jni/HarfBuzzSharp.mk

@@ -34,6 +34,8 @@ LOCAL_SRC_FILES        := ../../../externals/harfbuzz/src/hb-aat-layout.cc
                           ../../../externals/harfbuzz/src/hb-ot-layout.cc                           \
                           ../../../externals/harfbuzz/src/hb-ot-map.cc                              \
                           ../../../externals/harfbuzz/src/hb-ot-math.cc                             \
+                          ../../../externals/harfbuzz/src/hb-ot-meta.cc                             \
+                          ../../../externals/harfbuzz/src/hb-ot-metrics.cc                          \
                           ../../../externals/harfbuzz/src/hb-ot-name.cc                             \
                           ../../../externals/harfbuzz/src/hb-ot-shape-complex-arabic.cc             \
                           ../../../externals/harfbuzz/src/hb-ot-shape-complex-default.cc            \

native-builds/libHarfBuzzSharp_ios/config.h

@@ -162,7 +162,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.5.3"
+#define PACKAGE_STRING "HarfBuzz 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -171,7 +171,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.3"
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

native-builds/libHarfBuzzSharp_ios/libHarfBuzzSharp.xcodeproj/project.pbxproj

@@ -57,6 +57,8 @@
 		34C930C821FA5A77002D729C /* hb-warning.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9309B21FA5A77002D729C /* hb-warning.cc */; };
 		34C930C921FA5A77002D729C /* hb-fallback-shape.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9309C21FA5A77002D729C /* hb-fallback-shape.cc */; };
 		34C930CA21FA5A77002D729C /* hb-ot-var.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9309D21FA5A77002D729C /* hb-ot-var.cc */; };
+		34F68011233ED0F70091C30D /* hb-ot-meta.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F6800B233ED0F70091C30D /* hb-ot-meta.cc */; };
+		34F68012233ED0F70091C30D /* hb-ot-metrics.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F68010233ED0F70091C30D /* hb-ot-metrics.cc */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -124,6 +126,12 @@
 		34C9309C21FA5A77002D729C /* hb-fallback-shape.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-fallback-shape.cc"; path = "../../externals/harfbuzz/src/hb-fallback-shape.cc"; sourceTree = "<group>"; };
 		34C9309D21FA5A77002D729C /* hb-ot-var.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-var.cc"; path = "../../externals/harfbuzz/src/hb-ot-var.cc"; sourceTree = "<group>"; };
 		34D723421EB385E900E6210E /* libHarfBuzzSharp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libHarfBuzzSharp.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		34F6800B233ED0F70091C30D /* hb-ot-meta.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-meta.cc"; path = "../../externals/harfbuzz/src/hb-ot-meta.cc"; sourceTree = "<group>"; };
+		34F6800C233ED0F70091C30D /* hb-ot-metrics.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "hb-ot-metrics.hh"; path = "../../externals/harfbuzz/src/hb-ot-metrics.hh"; sourceTree = "<group>"; };
+		34F6800D233ED0F70091C30D /* hb-ot-meta-table.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "hb-ot-meta-table.hh"; path = "../../externals/harfbuzz/src/hb-ot-meta-table.hh"; sourceTree = "<group>"; };
+		34F6800E233ED0F70091C30D /* hb-ot-meta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "hb-ot-meta.h"; path = "../../externals/harfbuzz/src/hb-ot-meta.h"; sourceTree = "<group>"; };
+		34F6800F233ED0F70091C30D /* hb-ot-metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "hb-ot-metrics.h"; path = "../../externals/harfbuzz/src/hb-ot-metrics.h"; sourceTree = "<group>"; };
+		34F68010233ED0F70091C30D /* hb-ot-metrics.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-metrics.cc"; path = "../../externals/harfbuzz/src/hb-ot-metrics.cc"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -158,6 +166,12 @@
 				34C9308621FA5A76002D729C /* hb-ot-layout.cc */,
 				34C9307521FA5A76002D729C /* hb-ot-map.cc */,
 				34C9309321FA5A77002D729C /* hb-ot-math.cc */,
+				34F6800D233ED0F70091C30D /* hb-ot-meta-table.hh */,
+				34F6800B233ED0F70091C30D /* hb-ot-meta.cc */,
+				34F6800E233ED0F70091C30D /* hb-ot-meta.h */,
+				34F68010233ED0F70091C30D /* hb-ot-metrics.cc */,
+				34F6800F233ED0F70091C30D /* hb-ot-metrics.h */,
+				34F6800C233ED0F70091C30D /* hb-ot-metrics.hh */,
 				34C9308F21FA5A77002D729C /* hb-ot-name.cc */,
 				34C9308C21FA5A76002D729C /* hb-ot-shape-complex-arabic.cc */,
 				34C9308021FA5A76002D729C /* hb-ot-shape-complex-default.cc */,
@@ -287,6 +301,7 @@
 				34C930B521FA5A77002D729C /* hb-ot-shape-complex-indic.cc in Sources */,
 				34C930C221FA5A77002D729C /* hb-font.cc in Sources */,
 				34B817C522BD8F6F00508F73 /* hb-ucd.cc in Sources */,
+				34F68012233ED0F70091C30D /* hb-ot-metrics.cc in Sources */,
 				34C930C321FA5A77002D729C /* hb-set.cc in Sources */,
 				34C930A021FA5A77002D729C /* hb-ot-shape-complex-indic-table.cc in Sources */,
 				34C930AA21FA5A77002D729C /* hb-ot-cff2-table.cc in Sources */,
@@ -297,6 +312,7 @@
 				34B817C822BD8F6F00508F73 /* hb-subset-cff1.cc in Sources */,
 				34C930B321FA5A77002D729C /* hb-ot-layout.cc in Sources */,
 				34C930A821FA5A77002D729C /* hb-ot-shape-complex-hebrew.cc in Sources */,
+				34F68011233ED0F70091C30D /* hb-ot-meta.cc in Sources */,
 				34C930AF21FA5A77002D729C /* hb-shaper.cc in Sources */,
 				34C930A721FA5A77002D729C /* hb-ot-font.cc in Sources */,
 				34B817C622BD8F6F00508F73 /* hb-subset.cc in Sources */,

native-builds/libHarfBuzzSharp_linux/Makefile

@@ -55,6 +55,8 @@ src = \
 	${src_root}/hb-ot-layout.cc                           \
 	${src_root}/hb-ot-map.cc                              \
 	${src_root}/hb-ot-math.cc                             \
+	${src_root}/hb-ot-meta.cc                             \
+	${src_root}/hb-ot-metrics.cc                          \
 	${src_root}/hb-ot-name.cc                             \
 	${src_root}/hb-ot-shape-complex-arabic.cc             \
 	${src_root}/hb-ot-shape-complex-default.cc            \

native-builds/libHarfBuzzSharp_linux/config.h

@@ -162,7 +162,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.5.3"
+#define PACKAGE_STRING "HarfBuzz 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -171,7 +171,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.3"
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

native-builds/libHarfBuzzSharp_osx/config.h

@@ -162,7 +162,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.5.3"
+#define PACKAGE_STRING "HarfBuzz 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -171,7 +171,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.3"
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */