From 7eeedcbce09da6550fcc56dd179938245155be25 Mon Sep 17 00:00:00 2001
From: Daniel Kuschny <danielku15@coderline.net>
Date: Sun, 24 Dec 2023 14:13:25 +0100
Subject: [PATCH] Adjust JNI loading for Android and bump Skia to m120 (#47)

---
 .github/workflows/build.yml                   |   2 +-
 .github/workflows/publish.yml                 |   2 +-
 .github/workflows/~dotnet.yml                 |  12 +-
 .github/workflows/~java.yml                   |   5 +-
 .gitmodules                                   |   2 +-
 README.md                                     |   2 +-
 build/Build.Java.cs                           |  12 +-
 build/Build.LibAlphaSkia.cs                   |  20 +-
 build/Build.LibSkia.cs                        |   1 -
 build/Build.Native.cs                         |   1 +
 build/Build.Node.cs                           |   2 +-
 build/Build.Windows.cs                        |  41 +-
 externals/skia                                |   2 +-
 lib/dotnet/AlphaSkia/AlphaSkiaCanvas.cs       |   4 +-
 lib/dotnet/AlphaSkia/NativeMethods.cs         |   2 +
 lib/dotnet/Directory.Build.props              |   2 +-
 lib/java/.idea/gradle.xml                     |   2 +-
 lib/java/.idea/misc.xml                       |   1 -
 lib/java/android/build.gradle.kts             |  63 ++-
 .../alphaTab/alphaSkia/AlphaSkiaAndroid.java  |  27 +-
 lib/java/build.gradle.kts                     | 137 +++--
 lib/java/jni/src/AlphaSkiaCanvas.cpp          |   5 +-
 lib/java/linux/build.gradle.kts               |   5 +
 .../alphaTab/alphaSkia/AlphaSkiaLinux.java    |  25 +-
 lib/java/macos/build.gradle.kts               |   4 +
 .../alphaTab/alphaSkia/AlphaSkiaMacOs.java    |  29 +-
 .../java/alphaTab/alphaSkia/AlphaSkiaJre.java |  46 ++
 .../alphaTab/alphaSkia/AlphaSkiaPlatform.java |  72 +--
 lib/java/settings.gradle.kts                  |   7 +
 lib/java/windows/build.gradle.kts             |   5 +-
 .../alphaTab/alphaSkia/AlphaSkiaWindows.java  |  29 +-
 lib/node/addon/addon.cpp                      |   4 +-
 lib/node/alphaskia-linux/package-lock.json    |   4 +-
 lib/node/alphaskia-linux/package.json         |   2 +-
 lib/node/alphaskia-macos/package-lock.json    |   4 +-
 lib/node/alphaskia-macos/package.json         |   2 +-
 lib/node/alphaskia-windows/package-lock.json  |   4 +-
 lib/node/alphaskia-windows/package.json       |   2 +-
 lib/node/alphaskia/package-lock.json          |  10 +-
 lib/node/alphaskia/package.json               |   8 +-
 .../AlphaSkia.Test/AlphaSkia.Test.csproj      |   2 +-
 test/dotnet/global.json                       |   7 -
 test/java/build.gradle.kts                    |   3 +-
 .../java/alphaTab/alphaSkia/test/Main.java    |  14 +-
 test/native/src/AlphaTabGeneratedTest.cpp     | 254 ++++-----
 test/node/package-lock.json                   | 496 ------------------
 test/node/package.json                        |   2 +-
 test/test-generator/AlphaSkiaTestCanvas.cs    |   9 +-
 .../AlphaSkiaUnitTestGenerator.cs             |   2 +-
 wrapper/include/AlphaSkiaCanvas.h             |   7 +-
 wrapper/include/alphaskia.h                   |   4 +-
 wrapper/src/AlphaSkiaCanvas.cpp               | 104 +++-
 wrapper/src/alphaskia_canvas.cpp              |   8 +-
 53 files changed, 562 insertions(+), 959 deletions(-)
 create mode 100644 lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaJre.java
 delete mode 100644 test/dotnet/global.json
 delete mode 100644 test/node/package-lock.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1a30e2..c0dcd1a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,6 +11,6 @@ jobs:
     uses: ./.github/workflows/~reusable-full-build.yml
     with: 
       use-skia-cache: ${{ inputs.use-skia-cache }}
-      alphaskia-version: "1.0"
+      alphaskia-version: "2.0"
       is-release-build: false
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3d87ff8..2e2ab89 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
     uses: ./.github/workflows/~reusable-full-build.yml
     with: 
       use-skia-cache: ${{ inputs.use-skia-cache }} 
-      alphaskia-version: "1.0"
+      alphaskia-version: "2.0"
       is-release-build: ${{ inputs.is-release-build }}
     secrets: inherit
 
diff --git a/.github/workflows/~dotnet.yml b/.github/workflows/~dotnet.yml
index 4bd08b2..5db4179 100644
--- a/.github/workflows/~dotnet.yml
+++ b/.github/workflows/~dotnet.yml
@@ -19,6 +19,9 @@ jobs:
   dotnet:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8'
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
@@ -40,19 +43,22 @@ jobs:
         include: 
           - runs-on: ubuntu-latest
             architecture: x64
-            framework: net6.0
+            framework: net8.0
           - runs-on: macos-latest
             architecture: x64
-            framework: net6.0
+            framework: net8.0
           - runs-on: windows-latest
             architecture: x64
-            framework: net6.0
+            framework: net8.0
           - runs-on: windows-latest
             architecture: x64
             framework: net48
     runs-on: ${{ matrix.runs-on }}
     needs: [dotnet]
     steps:
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8'      
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/~java.yml b/.github/workflows/~java.yml
index 663f9ed..141d2df 100644
--- a/.github/workflows/~java.yml
+++ b/.github/workflows/~java.yml
@@ -24,6 +24,10 @@ jobs:
       SONATYPE_SIGNING_PASSWORD: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
       SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}    
     steps:
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'      
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
@@ -49,7 +53,6 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     needs: [java]
     steps:
-      # even though it is installed, not all Operating systems are configured the same
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
diff --git a/.gitmodules b/.gitmodules
index b4cc47d..faf3653 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "externals/skia"]
 	path = externals/skia
 	url = https://skia.googlesource.com/skia.git
-	branch = chrome/m117
+	branch = chrome/m120
 [submodule "externals/node-api-headers"]
 	path = externals/node-api-headers
 	url = https://github.com/nodejs/node-api-headers.git
diff --git a/README.md b/README.md
index 03d0f06..36be4b3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ alphaSkia is a special cross platform [Skia](https://skia.org/) wrapper used in
 alphaSkia a slightly adapted [Semantic Versioning](https://semver.org/) scheme where the `PATCH` part indicates
 the Skia milestone version we have integrated. 
 
-Currently we are on [Skia m117](https://github.com/CoderLine/alphaSkia/blob/main/.gitmodules#L8)
+Currently we are on [Skia m120](https://github.com/CoderLine/alphaSkia/blob/main/.gitmodules#L8)
 
 Given a version number `MAJOR.MINOR.SKIA`:
 
diff --git a/build/Build.Java.cs b/build/Build.Java.cs
index fd4a001..9cfb18f 100644
--- a/build/Build.Java.cs
+++ b/build/Build.Java.cs
@@ -110,26 +110,24 @@ string JavaVersion
         get
         {
             string semVer;
-            if (IsLocalBuild)
+            if (IsReleaseBuild)
             {
-                semVer = $"{VersionInfo.FileVersion.ToString(3)}-LOCAL";
+                semVer = $"{VersionInfo.FileVersion.ToString(3)}";
             }
-            else if (!IsReleaseBuild)
+            else if (IsLocalBuild)
             {
-                semVer = $"{VersionInfo.FileVersion.ToString(3)}-SNAPSHOT";
+                semVer = $"{VersionInfo.FileVersion.ToString(3)}-LOCAL";
             }
             else
             {
-                semVer = $"{VersionInfo.FileVersion.ToString(3)}";
+                semVer = $"{VersionInfo.FileVersion.ToString(3)}-SNAPSHOT";
             }
-
             return semVer;
         }
     }
     
     public Target JavaPublish => _ => _
         .DependsOn(PrepareGitHubArtifacts)
-        .Requires(() => IsGitHubActions)
         .Executes(() =>
         {
             // workaround until we know how to upload existing maven packages
diff --git a/build/Build.LibAlphaSkia.cs b/build/Build.LibAlphaSkia.cs
index dd3fcc5..663f5d3 100644
--- a/build/Build.LibAlphaSkia.cs
+++ b/build/Build.LibAlphaSkia.cs
@@ -252,25 +252,35 @@ void BuildAlphaSkia()
             var alphaSkiaInclude = DistBasePath / "include";
             var jniInclude = JavaHome / "include";
             AbsolutePath jniPlatformInclude;
-            if (OperatingSystem.IsWindows())
+            if (OperatingSystem.IsWindows() && TargetOs == TargetOperatingSystem.Windows)
             {
                 jniPlatformInclude = jniInclude / "win32";
             }
-            else if (OperatingSystem.IsLinux())
+            else if (OperatingSystem.IsLinux() && TargetOs == TargetOperatingSystem.Linux)
             {
                 jniPlatformInclude = jniInclude / "linux";
             }
-            else if (OperatingSystem.IsMacOS())
+            else if (OperatingSystem.IsMacOS() && TargetOs == TargetOperatingSystem.MacOs)
             {
                 jniPlatformInclude = jniInclude / "darwin";
             }
+            else if(TargetOs == TargetOperatingSystem.Android)
+            {
+                jniPlatformInclude = null;
+            }
             else
             {
                 throw new PlatformNotSupportedException();
             }
 
-            AppendToFlagList(gnArgs, "extra_cflags",
-                $"'-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniPlatformInclude}'");
+            if(jniPlatformInclude != null)
+            {
+                AppendToFlagList(gnArgs, "extra_cflags", $"'-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniPlatformInclude}'");
+            }
+            else
+            {
+                AppendToFlagList(gnArgs, "extra_cflags", $"'-I{alphaSkiaInclude}'");
+            }
         }
         else if (Variant == Variant.Node)
         {
diff --git a/build/Build.LibSkia.cs b/build/Build.LibSkia.cs
index 9223176..becadfc 100644
--- a/build/Build.LibSkia.cs
+++ b/build/Build.LibSkia.cs
@@ -163,7 +163,6 @@ void BuildSkia()
         gnArgs["skia_use_sfntly"] = "false";
         gnArgs["skia_enable_skshaper"] = "true";
         gnArgs["skia_pdf_subset_harfbuzz"] = "false";
-        gnArgs["skia_use_expat"] = "false";
         gnArgs["skia_enable_pdf"] = "false";
         gnArgs["skia_use_dng_sdk"] = "false";
         gnArgs["skia_use_libjpeg_turbo_decode"] = "false";
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index fb0f0d9..35b553d 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -316,6 +316,7 @@ Dictionary<string, string> PrepareNativeBuild(Variant variant)
         if (TargetOs == TargetOperatingSystem.Android)
         {
             gnArgs["ndk"] = NdkPath;
+            AppendToFlagList(gnArgs, "extra_ldflags", $"'-llog'");
         }
 
         gnArgs["target_os"] = TargetOs.SkiaTargetOs;
diff --git a/build/Build.Node.cs b/build/Build.Node.cs
index 5bf95d5..20916b0 100644
--- a/build/Build.Node.cs
+++ b/build/Build.Node.cs
@@ -64,7 +64,7 @@ void PrepareTgzForTest()
         var files = new System.Collections.Generic.List<string>();
         foreach (var tgz in (RootDirectory / "dist" / "nodetars").GetFiles("*.tgz"))
         {
-            // coderline-alphaskia-1.0.0-local.0.tgz
+            // coderline-alphaskia-2.0.0-local.0.tgz
             var nameWithoutVersion = string.Join("-",
                                          tgz.NameWithoutExtension.Split('-').TakeWhile(p => !char.IsDigit(p[0])))
                                      + tgz.Extension;
diff --git a/build/Build.Windows.cs b/build/Build.Windows.cs
index ed0e7e0..c1fc939 100644
--- a/build/Build.Windows.cs
+++ b/build/Build.Windows.cs
@@ -34,30 +34,33 @@ string VsInstall
 
     void SetClangWindows(Dictionary<string, string> gnArgs)
     {
-        if (!string.IsNullOrEmpty(LlvmHome))
+        if(TargetOs == TargetOperatingSystem.Windows)
         {
-            gnArgs["clang_win"] = LlvmHome;
+            if (!string.IsNullOrEmpty(LlvmHome))
+            {
+                gnArgs["clang_win"] = LlvmHome;
+
+                // there is a problem in the BUILDCONFIG.gn of Skia looking for a version number like 16.0.0
+                // but with the installation on windows it is simply 16. 
+                var version = ((AbsolutePath)LlvmHome) / "lib" / "clang";
+                var newestVersion = version.GetDirectories().MaxBy(d => d.Name);
+                if (!string.IsNullOrEmpty(newestVersion))
+                {
+                    gnArgs["clang_win_version"] = newestVersion.Name;
+                }
+            }
 
-            // there is a problem in the BUILDCONFIG.gn of Skia looking for a version number like 16.0.0
-            // but with the installation on windows it is simply 16. 
-            var version = ((AbsolutePath)LlvmHome) / "lib" / "clang";
-            var newestVersion = version.GetDirectories().MaxBy(d => d.Name);
-            if (!string.IsNullOrEmpty(newestVersion))
+            // override win_vc with the command line args
+            var vsInstall = VsInstall;
+            if (!string.IsNullOrEmpty(vsInstall))
             {
-                gnArgs["clang_win_version"] = newestVersion.Name;
+                AbsolutePath winVc = vsInstall;
+                winVc /= "VC";
+                gnArgs["win_vc"] = winVc;
             }
-        }
 
-        // override win_vc with the command line args
-        var vsInstall = VsInstall;
-        if (!string.IsNullOrEmpty(vsInstall))
-        {
-            AbsolutePath winVc = vsInstall;
-            winVc /= "VC";
-            gnArgs["win_vc"] = winVc;
+            AppendToFlagList(gnArgs, "extra_cflags", "'/MT', '/EHsc', '/Z7', '-D_HAS_AUTO_PTR_ETC=1'");
+            AppendToFlagList(gnArgs, "extra_ldflags", "'/DEBUG:FULL'");
         }
-
-        AppendToFlagList(gnArgs, "extra_cflags", "'/MT', '/EHsc', '/Z7', '-D_HAS_AUTO_PTR_ETC=1'");
-        AppendToFlagList(gnArgs, "extra_ldflags", "'/DEBUG:FULL'");
     }
 }
\ No newline at end of file
diff --git a/externals/skia b/externals/skia
index beb4d7d..349c117 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit beb4d7d77fba1e7c44b82653090e176bac161d63
+Subproject commit 349c1179c43ef46f2804404952b9460dc007d76a
diff --git a/lib/dotnet/AlphaSkia/AlphaSkiaCanvas.cs b/lib/dotnet/AlphaSkia/AlphaSkiaCanvas.cs
index 7b5ecbf..db58587 100644
--- a/lib/dotnet/AlphaSkia/AlphaSkiaCanvas.cs
+++ b/lib/dotnet/AlphaSkia/AlphaSkiaCanvas.cs
@@ -272,7 +272,7 @@ public void FillText(string text, AlphaSkiaTypeface typeface, float fontSize, fl
         AlphaSkiaTextBaseline baseline)
     {
         CheckDisposed();
-        NativeMethods.alphaskia_canvas_fill_text(Handle, text, typeface.Handle, fontSize, x, y, textAlign, baseline);
+        NativeMethods.alphaskia_canvas_fill_text(Handle, text, text.Length, typeface.Handle, fontSize, x, y, textAlign, baseline);
     }
 
     /// <summary>
@@ -285,7 +285,7 @@ public void FillText(string text, AlphaSkiaTypeface typeface, float fontSize, fl
     public float MeasureText(string text, AlphaSkiaTypeface typeface, float fontSize)
     {
         CheckDisposed();
-        return NativeMethods.alphaskia_canvas_measure_text(Handle, text, typeface.Handle, fontSize);
+        return NativeMethods.alphaskia_canvas_measure_text(Handle, text, text.Length, typeface.Handle, fontSize);
     }
 
     /// <summary>
diff --git a/lib/dotnet/AlphaSkia/NativeMethods.cs b/lib/dotnet/AlphaSkia/NativeMethods.cs
index 155b311..bf93ead 100644
--- a/lib/dotnet/AlphaSkia/NativeMethods.cs
+++ b/lib/dotnet/AlphaSkia/NativeMethods.cs
@@ -150,6 +150,7 @@ public static extern void alphaskia_canvas_bezier_curve_to(alphaskia_canvas_t ca
     public static extern void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas, 
         [MarshalAs(UnmanagedType.LPWStr)]
         string text,
+        int text_length,
         alphaskia_typeface_t type_face, float font_size, float x, float y, AlphaSkiaTextAlign text_align,
         AlphaSkiaTextBaseline baseline);
 
@@ -157,6 +158,7 @@ public static extern void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas,
     public static extern float alphaskia_canvas_measure_text(alphaskia_canvas_t canvas, 
         [MarshalAs(UnmanagedType.LPWStr)]
         string text,
+        int text_length,
         alphaskia_typeface_t type_face, float font_size);
 
     [DllImport(AlphaSkiaNativeLibName, CallingConvention = CallingConvention.Cdecl)]
diff --git a/lib/dotnet/Directory.Build.props b/lib/dotnet/Directory.Build.props
index cd62c37..fcf12e9 100644
--- a/lib/dotnet/Directory.Build.props
+++ b/lib/dotnet/Directory.Build.props
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version Condition=" '$(Version)' == '' ">1.0.0</Version>
+		<Version Condition=" '$(Version)' == '' ">2.0.0</Version>
 		<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(Version).0</AssemblyVersion>
 		<FileVersion Condition=" '$(FileVersion)' == '' ">$(AssemblyVersion)</FileVersion>
 		<NeutralLanguage>en</NeutralLanguage>
diff --git a/lib/java/.idea/gradle.xml b/lib/java/.idea/gradle.xml
index 5bd1ce6..d509473 100644
--- a/lib/java/.idea/gradle.xml
+++ b/lib/java/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/lib/java/.idea/misc.xml b/lib/java/.idea/misc.xml
index cbc4de8..14e5a32 100644
--- a/lib/java/.idea/misc.xml
+++ b/lib/java/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
diff --git a/lib/java/android/build.gradle.kts b/lib/java/android/build.gradle.kts
index 676c5e0..bde248f 100644
--- a/lib/java/android/build.gradle.kts
+++ b/lib/java/android/build.gradle.kts
@@ -1,38 +1,73 @@
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import com.android.build.gradle.internal.tasks.factory.dependsOn
+
 plugins {
-    id("java-library")
+    id("com.android.library")
     `maven-publish`
     signing
 }
 
-java {
-    toolchain{
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-    withSourcesJar()
-    withJavadocJar()
+dependencies {
+    implementation(project(":main"))
 }
 
-tasks.jar {
-    archiveBaseName = "alphaSkia-android"
+tasks.register<Copy>("copyJniForAndroid") {
+    // https://developer.android.com/studio/projects/gradle-external-native-builds#jniLibs
+    // https://developer.android.com/ndk/guides/abis#sa
 
-    into("native/android-x64/") {
+    into("src/main/jniLibs/x86_64") {
         from(rootProject.projectDir.resolve("../../dist/libalphaskiajni-android-x64-jni/")) {
             include("*.so")
         }
     }
-    into("native/android-x86/") {
+    into("src/main/jniLibs/x86") {
         from(rootProject.projectDir.resolve("../../dist/libalphaskiajni-android-x86-jni/")) {
             include("*.so")
         }
     }
-    into("native/android-arm64/") {
+    into("src/main/jniLibs/arm64-v8a") {
         from(rootProject.projectDir.resolve("../../dist/libalphaskiajni-android-arm64-jni/")) {
             include("*.so")
         }
     }
-    into("native/android-arm/") {
+    into("src/main/jniLibs/armeabi-v7a") {
         from(rootProject.projectDir.resolve("../../dist/libalphaskiajni-android-arm-jni/")) {
             include("*.so")
         }
     }
-}
\ No newline at end of file
+
+    destinationDir = projectDir
+}
+tasks.preBuild.dependsOn("copyJniForAndroid")
+
+
+android {
+    namespace = "net.alphatab.alphaskia.android"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+        ndk {
+            abiFilters += listOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
+        }
+        setProperty("archivesBaseName", "alphaSkia-android")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+
diff --git a/lib/java/android/src/main/java/alphaTab/alphaSkia/AlphaSkiaAndroid.java b/lib/java/android/src/main/java/alphaTab/alphaSkia/AlphaSkiaAndroid.java
index c6b0698..140e8d6 100644
--- a/lib/java/android/src/main/java/alphaTab/alphaSkia/AlphaSkiaAndroid.java
+++ b/lib/java/android/src/main/java/alphaTab/alphaSkia/AlphaSkiaAndroid.java
@@ -1,26 +1,15 @@
 package alphaTab.alphaSkia;
 
 /**
- * This class contains the information about the Android runtime dependencies to use with AlphaSkiaPlatform.
+ * The alphaSkia initializer for Android.
  */
-public final class AlphaSkiaAndroid {
-    /**
-     * The native libraries needed to run alphaSkia.
-     */
-    public static final String[] libraries = {
-            "/native/android-" + getCurrentArchitecture() + "/libalphaskiajni.so"
-    };
+public class AlphaSkiaAndroid extends AlphaSkiaPlatform {
+    public static final AlphaSkiaAndroid INSTANCE = new AlphaSkiaAndroid();
 
-    private static String getCurrentArchitecture() {
-        var jarch = System.getProperty("os.arch");
-        return switch (jarch) {
-            case "x86", "i368", "i486", "i586", "i686" -> "x86";
-            case "x86_64", "amd64" -> "x64";
-            case "arm" -> "arm";
-            case "aarch64" -> "arm64";
-            default -> jarch;
-        };
+    @Override
+    public void inititalize() {
+        System.loadLibrary("alphaskiajni");
+        setNativeLibLoaded();
     }
-
-    private AlphaSkiaAndroid() {}
 }
+
diff --git a/lib/java/build.gradle.kts b/lib/java/build.gradle.kts
index 0e7efd7..81b22bd 100644
--- a/lib/java/build.gradle.kts
+++ b/lib/java/build.gradle.kts
@@ -1,16 +1,9 @@
 import java.io.FileInputStream
 import java.util.*
 
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("com.android.library") version "8.1.0" apply false
 }
 
 var sonatypeSigningKeyId = ""
@@ -76,42 +69,17 @@ group = "net.alphatab"
 version = libVersion
 
 subprojects {
-    apply<JavaLibraryPlugin>()
     apply<MavenPublishPlugin>()
     apply(plugin = "maven-publish")
     apply(plugin = "signing")
 
-    group = "net.alphatab"
-    version = libVersion
-
     repositories {
         google()
         mavenCentral()
     }
 
-    configure<JavaPluginExtension> {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
-        }
-        withSourcesJar()
-        withJavadocJar()
-    }
-
-    tasks.withType<JavaCompile> {
-        options.encoding = "UTF-8"
-    }
-
-    tasks.withType<Test> {
-        defaultCharacterEncoding = "UTF-8"
-    }
-
-    tasks.withType<JavaExec> {
-        defaultCharacterEncoding = "UTF-8"
-    }
-
-    tasks.withType<Javadoc> {
-        options.encoding = "UTF-8"
-    }
+    group = "net.alphatab"
+    version = libVersion
 
     configure<SigningExtension> {
         if (sonatypeSigningKeyId.isNotBlank() && sonatypeSigningKey.isNotBlank() && sonatypeSigningPassword.isNotBlank()) {
@@ -122,46 +90,75 @@ subprojects {
         }
     }
 
-    configure<PublishingExtension> {
-        repositories {
-            maven {
-                name = "DistPath"
-                url = rootProject.projectDir.resolve("dist").toURI()
+    if (!this.project.name.contains("android")) {
+        apply<JavaLibraryPlugin>()
+
+        configure<JavaPluginExtension> {
+            toolchain {
+                languageVersion.set(JavaLanguageVersion.of(17))
             }
+            withSourcesJar()
+            withJavadocJar()
+        }
+
+        tasks.withType<JavaCompile> {
+            options.encoding = "UTF-8"
+        }
+
+        tasks.withType<Test> {
+            defaultCharacterEncoding = "UTF-8"
+        }
+
+        tasks.withType<JavaExec> {
+            defaultCharacterEncoding = "UTF-8"
         }
 
-        publications {
-            // this publication builds the library and is meant to publish to the local dist folder
-            create<MavenPublication>("mavenJava") {
-                from(components["java"])
-                afterEvaluate {
-                    artifactId = tasks.withType<Jar>().first().archiveBaseName.get()
-                    pom {
-                        name = tasks.withType<Jar>().first().archiveBaseName.get()
-                        description = libDescription
-                        url = libProjectUrl
-                        licenses {
-                            license {
-                                name = libLicenseSpdx
-                                url = libLicenseUrl
+        tasks.withType<Javadoc> {
+            options.encoding = "UTF-8"
+        }
+    }
+
+    afterEvaluate {
+        configure<PublishingExtension> {
+            repositories {
+                maven {
+                    name = "DistPath"
+                    url = rootProject.projectDir.resolve("dist").toURI()
+                }
+            }
+
+            publications {
+                create<MavenPublication>("mavenJava") {
+                    afterEvaluate {
+                        from(components.findByName("java") ?: components["release"])
+                        artifactId = tasks.withType<Jar>().firstOrNull()?.archiveBaseName?.get()
+                        pom {
+                            name = artifactId
+                            description = libDescription
+                            url = libProjectUrl
+                            licenses {
+                                license {
+                                    name = libLicenseSpdx
+                                    url = libLicenseUrl
+                                }
                             }
-                        }
-                        developers {
-                            developer {
-                                id = libAuthorId
-                                name = libAuthorName
-                                organization = libCompany
-                                organizationUrl = libOrgUrl
+                            developers {
+                                developer {
+                                    id = libAuthorId
+                                    name = libAuthorName
+                                    organization = libCompany
+                                    organizationUrl = libOrgUrl
+                                }
+                            }
+                            scm {
+                                url = libGitUrlHttp
+                                connection = "scm:git:$libGitUrlGit"
+                                developerConnection = "scm:git:$libGitUrlGit"
+                            }
+                            issueManagement {
+                                system = "GitHub"
+                                url = libIssuesUrl
                             }
-                        }
-                        scm {
-                            url = libGitUrlHttp
-                            connection = "scm:git:$libGitUrlGit"
-                            developerConnection = "scm:git:$libGitUrlGit"
-                        }
-                        issueManagement {
-                            system = "GitHub"
-                            url = libIssuesUrl
                         }
                     }
                 }
diff --git a/lib/java/jni/src/AlphaSkiaCanvas.cpp b/lib/java/jni/src/AlphaSkiaCanvas.cpp
index 33bc85c..4a2252a 100644
--- a/lib/java/jni/src/AlphaSkiaCanvas.cpp
+++ b/lib/java/jni/src/AlphaSkiaCanvas.cpp
@@ -198,7 +198,8 @@ extern "C"
         alphaskia_text_align_t nativeTextAlign = static_cast<alphaskia_text_align_t>(env->CallIntMethod(text_align, textAlignGetValue));
         alphaskia_text_baseline_t nativeBaseline = static_cast<alphaskia_text_baseline_t>(env->CallIntMethod(baseline, baselineGetValue));
 
-        alphaskia_canvas_fill_text(canvas, reinterpret_cast<const char16_t *>(nativeStr), nativeTypeface, static_cast<float>(font_size), static_cast<float>(x), static_cast<float>(y),
+        alphaskia_canvas_fill_text(canvas, reinterpret_cast<const char16_t *>(nativeStr), static_cast<int>(env->GetStringLength(str)),
+                                   nativeTypeface, static_cast<float>(font_size), static_cast<float>(x), static_cast<float>(y),
                                    nativeTextAlign, nativeBaseline);
 
         env->ReleaseStringChars(str, nativeStr);
@@ -212,7 +213,7 @@ extern "C"
         alphaskia_typeface_t nativeTypeface = reinterpret_cast<alphaskia_typeface_t>(get_handle(env, typeface));
         CHECK_HANDLE_RETURN(nativeTypeface, 0.0f)
 
-        float width = alphaskia_canvas_measure_text(canvas, reinterpret_cast<const char16_t *>(nativeStr), nativeTypeface, static_cast<float>(font_size));
+        float width = alphaskia_canvas_measure_text(canvas, reinterpret_cast<const char16_t *>(nativeStr), static_cast<int>(env->GetStringLength(str)), nativeTypeface, static_cast<float>(font_size));
 
         env->ReleaseStringChars(str, nativeStr);
 
diff --git a/lib/java/linux/build.gradle.kts b/lib/java/linux/build.gradle.kts
index 62abf96..6652921 100644
--- a/lib/java/linux/build.gradle.kts
+++ b/lib/java/linux/build.gradle.kts
@@ -4,6 +4,11 @@ plugins {
     signing
 }
 
+dependencies {
+    implementation(project(":main"))
+}
+
+
 java {
     toolchain{
         languageVersion.set(JavaLanguageVersion.of(17))
diff --git a/lib/java/linux/src/main/java/alphaTab/alphaSkia/AlphaSkiaLinux.java b/lib/java/linux/src/main/java/alphaTab/alphaSkia/AlphaSkiaLinux.java
index 440dd7d..0f95eec 100644
--- a/lib/java/linux/src/main/java/alphaTab/alphaSkia/AlphaSkiaLinux.java
+++ b/lib/java/linux/src/main/java/alphaTab/alphaSkia/AlphaSkiaLinux.java
@@ -1,24 +1,21 @@
 package alphaTab.alphaSkia;
 
 /**
- * This class contains the information about the Linux runtime dependencies to use with AlphaSkiaPlatform.
+ * The alphaSkia initializer for Linux.
  */
-public class AlphaSkiaLinux {
+public class AlphaSkiaLinux extends AlphaSkiaJre {
     /**
-     * The native libraries needed to run alphaSkia.
+     * The alphaSkia initializer for Linux.
      */
-    public static final String[] libraries = {
-            "/native/linux-" + getCurrentArchitecture() + "/libalphaskiajni.so"
-    };
+    public static final AlphaSkiaLinux INSTANCE = new AlphaSkiaLinux();
+
+    private AlphaSkiaLinux() {
+    }
 
-    private static String getCurrentArchitecture() {
-        var jarch = System.getProperty("os.arch");
-        return switch (jarch) {
-            case "x86", "i368", "i486", "i586", "i686" -> "x86";
-            case "x86_64", "amd64" -> "x64";
-            case "arm" -> "arm";
-            case "aarch64" -> "arm64";
-            default -> jarch;
+    @Override
+    protected String[] getJavaResources() {
+        return new String[] {
+            "/native/linux-" + getCurrentArchitecture() + "/libalphaskiajni.so"
         };
     }
 }
diff --git a/lib/java/macos/build.gradle.kts b/lib/java/macos/build.gradle.kts
index 93178c9..e2c60bb 100644
--- a/lib/java/macos/build.gradle.kts
+++ b/lib/java/macos/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
     signing
 }
 
+dependencies {
+    implementation(project(":main"))
+}
+
 java {
     toolchain{
         languageVersion.set(JavaLanguageVersion.of(17))
diff --git a/lib/java/macos/src/main/java/alphaTab/alphaSkia/AlphaSkiaMacOs.java b/lib/java/macos/src/main/java/alphaTab/alphaSkia/AlphaSkiaMacOs.java
index 5e289ea..9a01445 100644
--- a/lib/java/macos/src/main/java/alphaTab/alphaSkia/AlphaSkiaMacOs.java
+++ b/lib/java/macos/src/main/java/alphaTab/alphaSkia/AlphaSkiaMacOs.java
@@ -1,26 +1,21 @@
 package alphaTab.alphaSkia;
 
 /**
- * This class contains the information about the macOS runtime dependencies to use with AlphaSkiaPlatform.
+ * The alphaSkia initializer for macOS.
  */
-public final class AlphaSkiaMacOs {
+public class AlphaSkiaMacOs extends AlphaSkiaJre {
     /**
-     * The native libraries needed to run alphaSkia.
+     * The alphaSkia initializer for macOS.
      */
-    public static final String[] libraries = {
-            "/native/macos-" + getCurrentArchitecture() + "/libalphaskiajni.dylib"
-    };
+    public static final AlphaSkiaMacOs INSTANCE = new AlphaSkiaMacOs();
 
-    private static String getCurrentArchitecture() {
-        var jarch = System.getProperty("os.arch");
-        return switch (jarch) {
-            case "x86", "i368", "i486", "i586", "i686" -> "x86";
-            case "x86_64", "amd64" -> "x64";
-            case "arm" -> "arm";
-            case "aarch64" -> "arm64";
-            default -> jarch;
-        };
+    private AlphaSkiaMacOs() {
     }
 
-    private AlphaSkiaMacOs() {}
-}
+    @Override
+    protected String[] getJavaResources() {
+        return new String[] {
+            "/native/macos-" + getCurrentArchitecture() + "/libalphaskiajni.dylib"
+        };
+    }
+}
\ No newline at end of file
diff --git a/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaJre.java b/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaJre.java
new file mode 100644
index 0000000..574423f
--- /dev/null
+++ b/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaJre.java
@@ -0,0 +1,46 @@
+package alphaTab.alphaSkia;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * A base class for initializing JRE based platforms.
+ */
+public abstract class AlphaSkiaJre extends AlphaSkiaPlatform {
+
+    /**
+     * Gets the native libraries needed to run alphaSkia.
+     * @return The list of Java Resources to load as libraries.
+     */
+    protected abstract String[] getJavaResources();
+
+    @SuppressWarnings("UnsafeDynamicallyLoadedCode")
+    @Override
+    public void inititalize() throws IOException {
+        String[] libraries = getJavaResources();
+
+        Path tmpDir = Files.createTempDirectory("alphaskia");
+        Class<?> thisClass = getClass();
+
+        for (String library : libraries) {
+            File tmpLib = tmpDir.resolve(Paths.get(library).getFileName().toString()).toFile();
+            tmpLib.deleteOnExit();
+
+            URL resource = thisClass.getResource(library);
+            if (resource == null) {
+                throw new IOException("Resource " + library + " not found");
+            }
+
+            try (InputStream in = resource.openStream()) {
+                Files.copy(in, tmpLib.toPath());
+            }
+            System.load(tmpLib.getAbsolutePath());
+        }
+        setNativeLibLoaded();
+    }
+}
diff --git a/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaPlatform.java b/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaPlatform.java
index e533011..c32dac8 100644
--- a/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaPlatform.java
+++ b/lib/java/main/src/main/java/alphaTab/alphaSkia/AlphaSkiaPlatform.java
@@ -1,19 +1,12 @@
 package alphaTab.alphaSkia;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 /**
  * This class provides a way of resolving and loading the native libraries required
  * by alphaSkia.
  */
-public final class AlphaSkiaPlatform {
+public abstract class AlphaSkiaPlatform {
     private static boolean nativeLibLoaded = false;
 
     /**
@@ -26,54 +19,31 @@ public static boolean isNativeLibLoaded() {
     }
 
     /**
-     * Initiates the loading of native libraries from the given file paths assuming they are the correct ones for alphaSkia.
-     *
-     * @param nativeLibraryPaths The paths to the files to load.
-     * @throws IOException Thrown if any of the paths provided point to a non-existent file.
+     * Sets a value indicating whether the native libraries required by alphaSkia were loaded.
      */
-    public static void loadLibrary(String[] nativeLibraryPaths) throws IOException {
-        for (String library : nativeLibraryPaths) {
-            var file = new File(library);
-            if (!file.exists()) {
-                throw new FileNotFoundException("Could not find file: " + library);
-            }
-            System.load(library);
-        }
-        nativeLibLoaded = true;
+    protected static void setNativeLibLoaded() {
+        AlphaSkiaPlatform.nativeLibLoaded = true;
     }
 
     /**
-     * Initiates loading of native libraries from the given platform information class shipped as part of
-     * individual alphaSkia platform packages.
-     *
-     * @param platformInfo The platform info class like {@code net.alphatab.alphaskia.ALphaSkiaWindows} provided
-     *                     through individual platform packages.
-     * @throws IOException              Thrown if the resources expected to be provided by the platform package could not be found or extracted.
-     * @throws IllegalArgumentException Thrown if the provided platform info class is not compliant with the needs of alphaSkia. Indicates typically an incompatibility or a wrong class being provided.
+     * Initializes the alphaSkia platform specifics using the given context.
+     * @throws IOException Thrown if some IO related errors occur while loading the libraries.
      */
-    public static void loadLibrary(Class<?> platformInfo) throws IOException {
-        try {
-            String[] libraries = (String[]) platformInfo.getDeclaredField("libraries").get(null);
-
-            Path tmpDir = Files.createTempDirectory("alphaskia");
-            for (String library : libraries) {
-                URL resource = platformInfo.getResource(library);
-                if (resource == null) {
-                    throw new IOException("Resource " + library + " not found");
-                }
-                File tmpLib = tmpDir.resolve(Paths.get(library).getFileName().toString()).toFile();
-                tmpLib.deleteOnExit();
-                try (InputStream in = resource.openStream()) {
-                    Files.copy(in, tmpLib.toPath());
-                }
-                System.load(tmpLib.getAbsolutePath());
-            }
-            nativeLibLoaded = true;
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new IllegalArgumentException("Type " + platformInfo.getName() + " seems not to be a valid AlphaSkia Target", e);
-        }
-    }
+    public abstract void inititalize() throws IOException;
 
-    private AlphaSkiaPlatform() {
+    /**
+     * Maps the current CPU architecture to the alphaSkia internal architecture.
+     * @return The alphaSkia architecture key.
+     */
+    protected static String getCurrentArchitecture() {
+        var jarch = System.getProperty("os.arch");
+        return switch (jarch) {
+            case "x86", "i368", "i486", "i586", "i686" -> "x86";
+            case "x86_64", "amd64" -> "x64";
+            case "arm" -> "arm";
+            case "aarch64" -> "arm64";
+            default -> throw new IllegalStateException("Unsupported architecture " + jarch);
+        };
     }
 }
+
diff --git a/lib/java/settings.gradle.kts b/lib/java/settings.gradle.kts
index 86cb29e..f3cecbc 100644
--- a/lib/java/settings.gradle.kts
+++ b/lib/java/settings.gradle.kts
@@ -1,3 +1,10 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 rootProject.name = "AlphaSkia"
 
 include("main")
diff --git a/lib/java/windows/build.gradle.kts b/lib/java/windows/build.gradle.kts
index dd1bd38..9d670c5 100644
--- a/lib/java/windows/build.gradle.kts
+++ b/lib/java/windows/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
     signing
 }
 
+dependencies {
+    implementation(project(":main"))
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -12,7 +16,6 @@ java {
     withJavadocJar()
 }
 
-
 tasks.jar {
     archiveBaseName = "alphaSkia-windows"
 
diff --git a/lib/java/windows/src/main/java/alphaTab/alphaSkia/AlphaSkiaWindows.java b/lib/java/windows/src/main/java/alphaTab/alphaSkia/AlphaSkiaWindows.java
index 370827e..4f65c1a 100644
--- a/lib/java/windows/src/main/java/alphaTab/alphaSkia/AlphaSkiaWindows.java
+++ b/lib/java/windows/src/main/java/alphaTab/alphaSkia/AlphaSkiaWindows.java
@@ -1,26 +1,21 @@
 package alphaTab.alphaSkia;
 
 /**
- * This class contains the information about the Windows runtime dependencies to use with AlphaSkiaPlatform.
+ * The alphaSkia initializer for Windows.
  */
-public final class AlphaSkiaWindows {
+public class AlphaSkiaWindows extends AlphaSkiaJre {
     /**
-     * The native libraries needed to run alphaSkia.
+     * The alphaSkia initializer for Windows.
      */
-    public static final String[] libraries = {
-            "/native/win-" + getCurrentArchitecture() + "/libalphaskiajni.dll"
-    };
+    public static final AlphaSkiaWindows INSTANCE = new AlphaSkiaWindows();
 
-    private static String getCurrentArchitecture() {
-        var jarch = System.getProperty("os.arch");
-        return switch (jarch) {
-            case "x86", "i368", "i486", "i586", "i686" -> "x86";
-            case "x86_64", "amd64" -> "x64";
-            case "arm" -> "arm";
-            case "aarch64" -> "arm64";
-            default -> jarch;
-        };
+    private AlphaSkiaWindows() {
     }
 
-    private AlphaSkiaWindows() {}
-}
+    @Override
+    protected String[] getJavaResources() {
+        return new String[]{
+                "/native/win-" + getCurrentArchitecture() + "/libalphaskiajni.dll"
+        };
+    }
+}
\ No newline at end of file
diff --git a/lib/node/addon/addon.cpp b/lib/node/addon/addon.cpp
index a1c0506..38c1d5c 100644
--- a/lib/node/addon/addon.cpp
+++ b/lib/node/addon/addon.cpp
@@ -761,7 +761,7 @@ static napi_value node_alphaskia_canvas_fill_text(napi_env env, napi_callback_in
   GET_ARGUMENT_INT32(6, text_align);
   GET_ARGUMENT_INT32(7, baseline);
 
-  alphaskia_canvas_fill_text(canvas, text.c_str(), typeface, font_size, x, y, static_cast<alphaskia_text_align_t>(text_align), static_cast<alphaskia_text_baseline_t>(baseline));
+  alphaskia_canvas_fill_text(canvas, text.c_str(), text.length(), typeface, font_size, x, y, static_cast<alphaskia_text_align_t>(text_align), static_cast<alphaskia_text_baseline_t>(baseline));
 
   RETURN_UNDEFINED();
 }
@@ -776,7 +776,7 @@ static napi_value node_alphaskia_canvas_measure_text(napi_env env, napi_callback
   GET_ARGUMENT_HANDLE(2, alphaskia_typeface_t, typeface);
   GET_ARGUMENT_FLOAT(3, font_size);
 
-  float width = alphaskia_canvas_measure_text(canvas, text.c_str(), typeface, font_size);
+  float width = alphaskia_canvas_measure_text(canvas, text.c_str(), text.length(), typeface, font_size);
   napi_value width_node;
   status = napi_create_double(env, width, &width_node);
   ASSERT_STATUS();
diff --git a/lib/node/alphaskia-linux/package-lock.json b/lib/node/alphaskia-linux/package-lock.json
index 5e8f4a2..f31f26f 100644
--- a/lib/node/alphaskia-linux/package-lock.json
+++ b/lib/node/alphaskia-linux/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coderline/alphaskia-linux",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coderline/alphaskia-linux",
-      "version": "1.0.0",
+      "version": "2.0.0",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=18.0.0"
diff --git a/lib/node/alphaskia-linux/package.json b/lib/node/alphaskia-linux/package.json
index eede366..2a07290 100644
--- a/lib/node/alphaskia-linux/package.json
+++ b/lib/node/alphaskia-linux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphaskia-linux",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "The node addon for alphaSkia enabling it to run on Linux",
   "engines": {
     "node": ">=18.0.0"
diff --git a/lib/node/alphaskia-macos/package-lock.json b/lib/node/alphaskia-macos/package-lock.json
index 6c87c2f..6aec12d 100644
--- a/lib/node/alphaskia-macos/package-lock.json
+++ b/lib/node/alphaskia-macos/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coderline/alphaskia-macos",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coderline/alphaskia-macos",
-      "version": "1.0.0",
+      "version": "2.0.0",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=18.0.0"
diff --git a/lib/node/alphaskia-macos/package.json b/lib/node/alphaskia-macos/package.json
index 40ab9ec..663e4d2 100644
--- a/lib/node/alphaskia-macos/package.json
+++ b/lib/node/alphaskia-macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphaskia-macos",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "The node addon for alphaSkia enabling it to run on MacOS",
   "engines": {
     "node": ">=18.0.0"
diff --git a/lib/node/alphaskia-windows/package-lock.json b/lib/node/alphaskia-windows/package-lock.json
index 2e41196..c5ce5b8 100644
--- a/lib/node/alphaskia-windows/package-lock.json
+++ b/lib/node/alphaskia-windows/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coderline/alphaskia-windows",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coderline/alphaskia-windows",
-      "version": "1.0.0",
+      "version": "2.0.0",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=18.0.0"
diff --git a/lib/node/alphaskia-windows/package.json b/lib/node/alphaskia-windows/package.json
index 00ef692..bf10764 100644
--- a/lib/node/alphaskia-windows/package.json
+++ b/lib/node/alphaskia-windows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphaskia-windows",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "The node addon for alphaSkia enabling it to run on Windows",
   "engines": {
     "node": ">=18.0.0"
diff --git a/lib/node/alphaskia/package-lock.json b/lib/node/alphaskia/package-lock.json
index 608dd04..a6130a9 100644
--- a/lib/node/alphaskia/package-lock.json
+++ b/lib/node/alphaskia/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coderline/alphaskia",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coderline/alphaskia",
-      "version": "1.0.0",
+      "version": "2.0.0",
       "license": "BSD-3-Clause",
       "devDependencies": {
         "@rollup/plugin-terser": "^0.4.4",
@@ -27,9 +27,9 @@
         "node": ">=18.0.0"
       },
       "optionalDependencies": {
-        "@coderline/alphaskia-linux": "^1.0.0",
-        "@coderline/alphaskia-macos": "^1.0.0",
-        "@coderline/alphaskia-windows": "^1.0.0"
+        "@coderline/alphaskia-linux": "^2.0.0",
+        "@coderline/alphaskia-macos": "^2.0.0",
+        "@coderline/alphaskia-windows": "^2.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
diff --git a/lib/node/alphaskia/package.json b/lib/node/alphaskia/package.json
index 0ffb176..4c11323 100644
--- a/lib/node/alphaskia/package.json
+++ b/lib/node/alphaskia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphaskia",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "A Skia based rendering backend for alphaTab.",
   "module": "dist/alphaskia.mjs",
   "typings": "dist/alphaskia.d.ts",
@@ -28,9 +28,9 @@
   },
   "homepage": "https://github.com/CoderLine/alphaSkia",
   "optionalDependencies": {
-    "@coderline/alphaskia-linux": "^1.0.0",
-    "@coderline/alphaskia-macos": "^1.0.0",
-    "@coderline/alphaskia-windows": "^1.0.0"
+    "@coderline/alphaskia-linux": "^2.0.0",
+    "@coderline/alphaskia-macos": "^2.0.0",
+    "@coderline/alphaskia-windows": "^2.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.4",
diff --git a/test/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj b/test/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
index 2d06468..0763b58 100644
--- a/test/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
+++ b/test/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net48</TargetFrameworks>
+        <TargetFrameworks>net8.0;net48</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
diff --git a/test/dotnet/global.json b/test/dotnet/global.json
deleted file mode 100644
index aaac9e0..0000000
--- a/test/dotnet/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.0",
-    "rollForward": "latestMinor",
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/test/java/build.gradle.kts b/test/java/build.gradle.kts
index 5d3a74b..7b2d481 100644
--- a/test/java/build.gradle.kts
+++ b/test/java/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "alphaTab.alphaSkia"
-version = "1.0.0-LOCAL"
+version = "2.0.0-LOCAL"
 // Use any latest version
 var alphaSkiaVersion = version
 
@@ -32,7 +32,6 @@ dependencies {
     implementation("net.alphatab:alphaSkia-macos:$alphaSkiaVersion")
     implementation("net.alphatab:alphaSkia-windows:$alphaSkiaVersion")
     implementation("net.alphatab:alphaSkia-linux:$alphaSkiaVersion")
-    implementation("net.alphatab:alphaSkia-android:$alphaSkiaVersion")
 }
 
 java {
diff --git a/test/java/src/main/java/alphaTab/alphaSkia/test/Main.java b/test/java/src/main/java/alphaTab/alphaSkia/test/Main.java
index f9c170d..879510d 100644
--- a/test/java/src/main/java/alphaTab/alphaSkia/test/Main.java
+++ b/test/java/src/main/java/alphaTab/alphaSkia/test/Main.java
@@ -175,16 +175,13 @@ private static int mainWithExitCode() {
     private static void initializeAlphaSkia() throws IOException {
         switch(getOperatingSystemRid()) {
             case "macos":
-                AlphaSkiaPlatform.loadLibrary(AlphaSkiaMacOs.class);
+                AlphaSkiaMacOs.INSTANCE.inititalize();
                 break;
             case "win":
-                AlphaSkiaPlatform.loadLibrary(AlphaSkiaWindows.class);
-                break;
-            case "android":
-                AlphaSkiaPlatform.loadLibrary(AlphaSkiaAndroid.class);
+                AlphaSkiaWindows.INSTANCE.inititalize();
                 break;
             case "linux":
-                AlphaSkiaPlatform.loadLibrary(AlphaSkiaLinux.class);
+                AlphaSkiaLinux.INSTANCE.inititalize();
                 break;
         }
     }
@@ -198,11 +195,6 @@ private static String getOperatingSystemRid() {
             return "win";
         }
         if (os.startsWith("Linux")) {
-            // https://developer.android.com/reference/java/lang/System#getProperties()
-            if ("The Android Project".equalsIgnoreCase(System.getProperty("java.specification.vendor"))) {
-                return "android";
-            }
-
             return "linux";
         }
 
diff --git a/test/native/src/AlphaTabGeneratedTest.cpp b/test/native/src/AlphaTabGeneratedTest.cpp
index 90d3fa5..3a94dad 100644
--- a/test/native/src/AlphaTabGeneratedTest.cpp
+++ b/test/native/src/AlphaTabGeneratedTest.cpp
@@ -7,32 +7,32 @@ alphaskia_image_t draw_music_sheet_part_1(alphaskia_canvas_t canvas) {
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(32);
     text_align = alphaskia_text_align_center;
-    alphaskia_canvas_fill_text(canvas, u"Title", typeface, font_size, static_cast<float>(650), static_cast<float>(40), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Title", 5, typeface, font_size, static_cast<float>(650), static_cast<float>(40), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(20);
     text_align = alphaskia_text_align_center;
-    alphaskia_canvas_fill_text(canvas, u"Subtitle", typeface, font_size, static_cast<float>(650), static_cast<float>(72), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Subtitle", 8, typeface, font_size, static_cast<float>(650), static_cast<float>(72), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(20);
     text_align = alphaskia_text_align_center;
-    alphaskia_canvas_fill_text(canvas, u"Artist", typeface, font_size, static_cast<float>(650), static_cast<float>(92), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Artist", 6, typeface, font_size, static_cast<float>(650), static_cast<float>(92), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(20);
     text_align = alphaskia_text_align_center;
-    alphaskia_canvas_fill_text(canvas, u"Album", typeface, font_size, static_cast<float>(650), static_cast<float>(112), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Album", 5, typeface, font_size, static_cast<float>(650), static_cast<float>(112), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(15);
     text_align = alphaskia_text_align_right;
-    alphaskia_canvas_fill_text(canvas, u"Music by Music", typeface, font_size, static_cast<float>(1260), static_cast<float>(132), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Music by Music", 14, typeface, font_size, static_cast<float>(1260), static_cast<float>(132), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     typeface = alphaskia_get_typeface("PT Serif", false, false);
     font_size = static_cast<float>(15);
     text_align = alphaskia_text_align_left;
-    alphaskia_canvas_fill_text(canvas, u"Words by Words", typeface, font_size, static_cast<float>(40), static_cast<float>(132), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Words by Words", 14, typeface, font_size, static_cast<float>(40), static_cast<float>(132), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     return alphaskia_canvas_end_render(canvas);
 }
@@ -42,7 +42,7 @@ alphaskia_image_t draw_music_sheet_part_2(alphaskia_canvas_t canvas) {
     typeface = alphaskia_get_typeface("PT Serif", false, true);
     font_size = static_cast<float>(12);
     text_align = alphaskia_text_align_left;
-    alphaskia_canvas_fill_text(canvas, u"Guitar Standard Tuning", typeface, font_size, static_cast<float>(40), static_cast<float>(3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"Guitar Standard Tuning", 22, typeface, font_size, static_cast<float>(40), static_cast<float>(3), text_align, text_baseline);
     text_align = alphaskia_text_align_center;
     return alphaskia_canvas_end_render(canvas);
 }
@@ -57,8 +57,8 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     text_align = alphaskia_text_align_left;
     typeface = alphaskia_get_typeface("PT Serif", true, false);
     font_size = static_cast<float>(14);
-    alphaskia_canvas_fill_text(canvas, u"\uE1D5", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(156.6767578125), static_cast<float>(40), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"= 120", typeface, font_size, static_cast<float>(169.1767578125), static_cast<float>(27), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"\uE1D5", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(156.6767578125), static_cast<float>(40), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"= 120", 5, typeface, font_size, static_cast<float>(169.1767578125), static_cast<float>(27), text_align, text_baseline);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(130), static_cast<float>(254), static_cast<float>(1.04));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(139), static_cast<float>(254), static_cast<float>(1.04));
@@ -66,47 +66,47 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(157), static_cast<float>(254), static_cast<float>(1.04));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(166), static_cast<float>(254), static_cast<float>(1.04));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE050", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(94), static_cast<float>(157.52), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE084", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(127), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE084", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(127), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE050", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(94), static_cast<float>(157.52), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE084", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(127), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE084", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(127), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(200), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"1", typeface, font_size, static_cast<float>(141), static_cast<float>(118.75), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"1", 1, typeface, font_size, static_cast<float>(141), static_cast<float>(118.75), text_align, text_baseline);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(152.1767578125), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE272", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(172.86069962449085), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(180.86069962449085), static_cast<float>(149), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(152.1767578125), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE272", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(172.86069962449085), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(180.86069962449085), static_cast<float>(149), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(156.6767578125), static_cast<float>(144));
     alphaskia_canvas_line_to(canvas, static_cast<float>(170.855110706305), static_cast<float>(133.50723450810483));
     alphaskia_canvas_line_to(canvas, static_cast<float>(184.23569962449085), static_cast<float>(145));
     alphaskia_canvas_stroke(canvas);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(192.23569962449085), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(220.91964143648167), static_cast<float>(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(192.23569962449085), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(220.91964143648167), static_cast<float>(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(196.73569962449085), static_cast<float>(144));
     alphaskia_canvas_line_to(canvas, static_cast<float>(209.12929655256082), static_cast<float>(131.33765133817155));
     alphaskia_canvas_line_to(canvas, static_cast<float>(224.29464143648167), static_cast<float>(140.5));
     alphaskia_canvas_stroke(canvas);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(232.29464143648167), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE262", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(252.9785832484725), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(260.9785832484725), static_cast<float>(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(232.29464143648167), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(252.9785832484725), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(260.9785832484725), static_cast<float>(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(236.79464143648167), static_cast<float>(144));
     alphaskia_canvas_line_to(canvas, static_cast<float>(249.1882383645516), static_cast<float>(131.33765133817155));
     alphaskia_canvas_line_to(canvas, static_cast<float>(264.3535832484725), static_cast<float>(140.5));
     alphaskia_canvas_stroke(canvas);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(272.3535832484725), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(294.5517916242362), static_cast<float>(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(272.3535832484725), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(294.5517916242362), static_cast<float>(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(276.8535832484725), static_cast<float>(152));
     alphaskia_canvas_line_to(canvas, static_cast<float>(292.1060513036615), static_cast<float>(156.93783819474976));
     alphaskia_canvas_line_to(canvas, static_cast<float>(297.9267916242362), static_cast<float>(142));
     alphaskia_canvas_stroke(canvas);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(305.9267916242362), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE262", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(324.625), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(332.625), static_cast<float>(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(305.9267916242362), static_cast<float>(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(324.625), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 0.75), static_cast<float>(332.625), static_cast<float>(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(310.4267916242362), static_cast<float>(152));
     alphaskia_canvas_line_to(canvas, static_cast<float>(327.2193887931866), static_cast<float>(157.24460932567123));
@@ -161,12 +161,12 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(200), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(346), static_cast<float>(118.75), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(346), static_cast<float>(118.75), text_align, text_baseline);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(357.1767578125), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(378.359547484596), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(399.542337156692), static_cast<float>(161.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A3", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(426.623147703567), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(357.1767578125), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(378.359547484596), static_cast<float>(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(399.542337156692), static_cast<float>(161.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A3", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(426.623147703567), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(471), static_cast<float>(130.1), static_cast<float>(1), static_cast<float>(36));
     alphaskia_canvas_set_line_width(canvas, static_cast<float>(0.96));
     alphaskia_canvas_begin_path(canvas);
@@ -229,7 +229,7 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_line_to(canvas, static_cast<float>(435.623147703567), static_cast<float>(115));
     alphaskia_canvas_line_to(canvas, static_cast<float>(435.623147703567), static_cast<float>(120));
     alphaskia_canvas_stroke(canvas);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(400.8999527580335), static_cast<float>(106), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(400.8999527580335), static_cast<float>(106), text_align, text_baseline);
     text_align = alphaskia_text_align_left;
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
@@ -242,16 +242,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(200), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(472), static_cast<float>(118.75), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(472), static_cast<float>(118.75), text_align, text_baseline);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(496.32666015625), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_rotate(canvas, static_cast<float>(527.8699951171875), static_cast<float>(172), static_cast<float>(-90));
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_end_rotate(canvas);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(527.8699951171875), static_cast<float>(180));
@@ -262,24 +262,24 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(533.8699951171875), static_cast<float>(175), static_cast<float>(15), static_cast<float>(1));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(175), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(175), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(536.8699951171875), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(574.413330078125), static_cast<float>(175), static_cast<float>(15), static_cast<float>(1));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(574.413330078125), static_cast<float>(184), static_cast<float>(15), static_cast<float>(1));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(577.413330078125), static_cast<float>(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_begin_rotate(canvas, static_cast<float>(596.9566650390625), static_cast<float>(137.5), static_cast<float>(90));
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_end_rotate(canvas);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(596.9566650390625), static_cast<float>(129.5));
@@ -287,16 +287,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_line_to(canvas, static_cast<float>(592.9566650390625), static_cast<float>(137.5));
     alphaskia_canvas_close_path(canvas);
     alphaskia_canvas_fill(canvas);
-    alphaskia_canvas_fill_text(canvas, u"\uE262", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(607.9566650390625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(607.9566650390625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(614.9566650390625), static_cast<float>(175), static_cast<float>(15), static_cast<float>(1));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(614.9566650390625), static_cast<float>(184), static_cast<float>(15), static_cast<float>(1));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uE0A4", music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast<float>(music_font_size * 1), static_cast<float>(617.9566650390625), static_cast<float>(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(670), static_cast<float>(130.1), static_cast<float>(1), static_cast<float>(36));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(674), static_cast<float>(130.1), static_cast<float>(4), static_cast<float>(36));
     alphaskia_canvas_set_line_width(canvas, static_cast<float>(0.96));
@@ -337,16 +337,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(328), static_cast<float>(254), static_cast<float>(1.04));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(92), static_cast<float>(339), static_cast<float>(254), static_cast<float>(1.04));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(0), static_cast<uint8_t>(255)));
-    alphaskia_canvas_fill_text(canvas, u"\uE06D", music_typeface, static_cast<float>(music_font_size * 0.9230769230769231), static_cast<float>(97), static_cast<float>(311.8), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uE06D", 1, music_typeface, static_cast<float>(music_font_size * 0.9230769230769231), static_cast<float>(97), static_cast<float>(311.8), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(163.32666015625), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(163.32666015625), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"9", typeface, font_size, static_cast<float>(153.02685546875), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"9", 1, typeface, font_size, static_cast<float>(153.02685546875), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_begin_path(canvas);
@@ -361,16 +361,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"\u00BC", typeface, font_size, static_cast<float>(183.47495743699085), static_cast<float>(260.7), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"\u00BC", 1, typeface, font_size, static_cast<float>(183.47495743699085), static_cast<float>(260.7), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(203.38560196824085), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(203.38560196824085), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"9", typeface, font_size, static_cast<float>(193.08579728074085), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"9", 1, typeface, font_size, static_cast<float>(193.08579728074085), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_begin_path(canvas);
@@ -385,16 +385,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"\u00BD", typeface, font_size, static_cast<float>(223.25142854585667), static_cast<float>(254.7), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"\u00BD", 1, typeface, font_size, static_cast<float>(223.25142854585667), static_cast<float>(254.7), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(243.44454378023167), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(243.44454378023167), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"9", typeface, font_size, static_cast<float>(233.14473909273167), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"9", 1, typeface, font_size, static_cast<float>(233.14473909273167), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_begin_path(canvas);
@@ -409,16 +409,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"full", typeface, font_size, static_cast<float>(259.3589543422225), static_cast<float>(242.7), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"full", 4, typeface, font_size, static_cast<float>(259.3589543422225), static_cast<float>(242.7), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(283.5034855922225), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(283.5034855922225), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"9", typeface, font_size, static_cast<float>(273.2036809047225), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"9", 1, typeface, font_size, static_cast<float>(273.2036809047225), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_begin_path(canvas);
@@ -433,16 +433,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"1\u00BD", typeface, font_size, static_cast<float>(293.2336763898612), static_cast<float>(230.7), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"1\u00BD", 2, typeface, font_size, static_cast<float>(293.2336763898612), static_cast<float>(230.7), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(317.0766939679862), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(317.0766939679862), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"9", typeface, font_size, static_cast<float>(306.7768892804862), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"9", 1, typeface, font_size, static_cast<float>(306.7768892804862), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_begin_path(canvas);
@@ -457,7 +457,7 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(336.35009765625), static_cast<float>(218.7), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(336.35009765625), static_cast<float>(218.7), text_align, text_baseline);
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(345), static_cast<float>(284.3), static_cast<float>(1), static_cast<float>(54.99999999999994));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(346), static_cast<float>(284), static_cast<float>(126), static_cast<float>(1.04));
@@ -476,40 +476,40 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(368.32666015625), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(368.32666015625), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(358.02685546875), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(358.02685546875), static_cast<float>(295.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(389.509449828346), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(389.509449828346), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(379.209645140846), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(379.209645140846), static_cast<float>(295.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(410.692239500442), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(410.692239500442), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(400.392434812942), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(400.392434812942), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     text_baseline = alphaskia_text_baseline_middle;
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(437.773050047317), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(437.773050047317), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"5", typeface, font_size, static_cast<float>(427.473245359817), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"5", 1, typeface, font_size, static_cast<float>(427.473245359817), static_cast<float>(317.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(471), static_cast<float>(284.3), static_cast<float>(1), static_cast<float>(54.99999999999994));
     alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(165), static_cast<uint8_t>(255)));
@@ -551,29 +551,29 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"1", typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"1", 1, typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(507.4765625), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(497.1767578125), static_cast<float>(306.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_rotate(canvas, static_cast<float>(527.7200927734375), static_cast<float>(326.8), static_cast<float>(-90));
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_end_rotate(canvas);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(528), static_cast<float>(334.8));
@@ -586,34 +586,34 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"1", typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"1", 1, typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(548.0198974609375), static_cast<float>(328.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"3", typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast<float>(537.7200927734375), static_cast<float>(328.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(569), static_cast<float>(297.8));
@@ -630,29 +630,29 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(588.563232421875), static_cast<float>(328.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(578.263427734375), static_cast<float>(328.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_begin_rotate(canvas, static_cast<float>(596.8067626953125), static_cast<float>(283.8), static_cast<float>(90));
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
-    alphaskia_canvas_fill_text(canvas, u"\uEAA4", music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(0), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(10.799999999999999), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(21.599999999999998), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(32.4), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
+    alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast<float>(music_font_size * 1.2), static_cast<float>(43.199999999999996), static_cast<float>(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic);
     alphaskia_canvas_end_rotate(canvas);
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(597), static_cast<float>(275.8));
@@ -665,34 +665,34 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     font_size = static_cast<float>(13);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(284.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(284.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(295.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(295.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(306.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(306.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"2", typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(317.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(317.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(11);
-    alphaskia_canvas_fill_text(canvas, u"", typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"", 0, typeface, font_size, static_cast<float>(629.1065673828125), static_cast<float>(328.3), text_align, text_baseline);
     typeface = alphaskia_get_typeface("Roboto", false, false);
     font_size = static_cast<float>(13);
-    alphaskia_canvas_fill_text(canvas, u"0", typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(328.3), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast<float>(618.8067626953125), static_cast<float>(328.3), text_align, text_baseline);
     text_baseline = alphaskia_text_baseline_top;
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(670), static_cast<float>(284.3), static_cast<float>(1), static_cast<float>(54.99999999999994));
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(674), static_cast<float>(284.3), static_cast<float>(4), static_cast<float>(54.99999999999994));
@@ -703,7 +703,7 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) {
     alphaskia_canvas_stroke(canvas);
     typeface = alphaskia_get_typeface("PT Serif", false, true);
     font_size = static_cast<float>(12);
-    alphaskia_canvas_fill_text(canvas, u"s.guit.", typeface, font_size, static_cast<float>(50), static_cast<float>(130.1), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"s.guit.", 7, typeface, font_size, static_cast<float>(50), static_cast<float>(130.1), text_align, text_baseline);
     alphaskia_canvas_fill_rect(canvas, static_cast<float>(86), static_cast<float>(118.1), static_cast<float>(3), static_cast<float>(233.20000000000002));
     alphaskia_canvas_begin_path(canvas);
     alphaskia_canvas_move_to(canvas, static_cast<float>(86), static_cast<float>(118.1));
@@ -725,7 +725,7 @@ alphaskia_image_t draw_music_sheet_part_5(alphaskia_canvas_t canvas) {
     typeface = alphaskia_get_typeface("Roboto", true, false);
     font_size = static_cast<float>(12);
     text_align = alphaskia_text_align_left;
-    alphaskia_canvas_fill_text(canvas, u"rendered by alphaTab", typeface, font_size, static_cast<float>(0), static_cast<float>(12), text_align, text_baseline);
+    alphaskia_canvas_fill_text(canvas, u"rendered by alphaTab", 20, typeface, font_size, static_cast<float>(0), static_cast<float>(12), text_align, text_baseline);
     return alphaskia_canvas_end_render(canvas);
 }
 std::array<std::array<float, 4>, 5> part_positions = 
diff --git a/test/node/package-lock.json b/test/node/package-lock.json
deleted file mode 100644
index ad3cdb6..0000000
--- a/test/node/package-lock.json
+++ /dev/null
@@ -1,496 +0,0 @@
-{
-  "name": "alphaskiatest",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "alphaskiatest",
-      "version": "1.0.0",
-      "dependencies": {
-        "@coderline/alphaskia": "file:../../dist/nodetars/coderline-alphaskia.tgz",
-        "@coderline/alphaskia-linux": "file:../../dist/nodetars/coderline-alphaskia-linux.tgz",
-        "@coderline/alphaskia-macos": "file:../../dist/nodetars/coderline-alphaskia-macos.tgz",
-        "@coderline/alphaskia-windows": "file:../../dist/nodetars/coderline-alphaskia-windows.tgz",
-        "tsx": "^3.13.0"
-      }
-    },
-    "node_modules/@coderline/alphaskia": {
-      "version": "1.0.0-local.0",
-      "resolved": "file:../../dist/nodetars/coderline-alphaskia.tgz",
-      "integrity": "sha512-uWa+Nf1klIV0Hrwpy0herWbxVkkN8xli9V4SlTx2IMMw/w854zron/otogMHmwPEw1kvGHQw9zaZucd96lFLyg==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "optionalDependencies": {
-        "@coderline/alphaskia-linux": "^1.0.0",
-        "@coderline/alphaskia-macos": "^1.0.0",
-        "@coderline/alphaskia-windows": "^1.0.0"
-      }
-    },
-    "node_modules/@coderline/alphaskia-linux": {
-      "version": "1.0.0-local.0",
-      "resolved": "file:../../dist/nodetars/coderline-alphaskia-linux.tgz",
-      "integrity": "sha512-fsJLwL0q+TK99H1kZPj4OHE+q9v0MNXAqD+4tSLbB01M2VHDKd9oDjenK+yaJOXSzflBC1lVMONTjulzz1FoLQ==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@coderline/alphaskia-macos": {
-      "version": "1.0.0-local.0",
-      "resolved": "file:../../dist/nodetars/coderline-alphaskia-macos.tgz",
-      "integrity": "sha512-HtlkmftKtG2YHPkkeaVPjjFK6ElgTNMC8TscIIhbNDzdLgA6d09/byCzyh1K8+/yFY8omv8zq/WGfeeclYRTjQ==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@coderline/alphaskia-windows": {
-      "version": "1.0.0-local.0",
-      "resolved": "file:../../dist/nodetars/coderline-alphaskia-windows.tgz",
-      "integrity": "sha512-4w5ZbWxacjEOoSjT8NJL5RuOepcTbIHljH0DAYY03b97hzbc8PT/XL6eXBnGhNL6U7tIEMBlUg+PfthANHChgg==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
-      "cpu": [
-        "loong64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
-      "cpu": [
-        "riscv64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/get-tsconfig": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
-      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
-      "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
-    },
-    "node_modules/resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "funding": {
-        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/tsx": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.13.0.tgz",
-      "integrity": "sha512-rjmRpTu3as/5fjNq/kOkOtihgLxuIz6pbKdj9xwP4J5jOLkBxw/rjN5ANw+KyrrOXV5uB7HC8+SrrSJxT65y+A==",
-      "dependencies": {
-        "esbuild": "~0.18.20",
-        "get-tsconfig": "^4.7.2",
-        "source-map-support": "^0.5.21"
-      },
-      "bin": {
-        "tsx": "dist/cli.mjs"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      }
-    }
-  }
-}
diff --git a/test/node/package.json b/test/node/package.json
index 6b852cb..daa9d12 100644
--- a/test/node/package.json
+++ b/test/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alphaskiatest",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "start": "tsx index.ts"
diff --git a/test/test-generator/AlphaSkiaTestCanvas.cs b/test/test-generator/AlphaSkiaTestCanvas.cs
index d0d4bf2..c1374ac 100644
--- a/test/test-generator/AlphaSkiaTestCanvas.cs
+++ b/test/test-generator/AlphaSkiaTestCanvas.cs
@@ -15,6 +15,8 @@ class AlphaSkiaTestCanvas : ICanvas
 
     private int _partialCounter = 1;
 
+    public bool WithTextLength { get; set; }
+
     public AlphaSkiaTestCanvas(TestSourceBuilder testSource)
     {
         _testSource = testSource;
@@ -115,8 +117,9 @@ public void EndGroup()
 
     public void FillText(string text, double x, double y)
     {
+        var textPart = WithTextLength ? $"{_testSource.EncodeString(text)}, {text.Length}" :  $"{_testSource.EncodeString(text)}";
         _testSource.WriteCallCanvasMethod("FillText",
-            $"{_testSource.EncodeString(text)}, {_testSource.MakeTestGetProperty("Typeface")}, {_testSource.MakeTestGetProperty("FontSize")}, {_testSource.MakeCastToFloat(x)}, {_testSource.MakeCastToFloat(y)}, {_testSource.MakeTestGetProperty("TextAlign")}, {_testSource.MakeTestGetProperty("TextBaseline")}");
+            $"{textPart}, {_testSource.MakeTestGetProperty("Typeface")}, {_testSource.MakeTestGetProperty("FontSize")}, {_testSource.MakeCastToFloat(x)}, {_testSource.MakeCastToFloat(y)}, {_testSource.MakeTestGetProperty("TextAlign")}, {_testSource.MakeTestGetProperty("TextBaseline")}");
     }
 
     public double MeasureText(string text)
@@ -143,8 +146,10 @@ public void FillMusicFontSymbols(double x, double y, double scale, IList<MusicFo
             ? _testSource.MakeEnumAccess("AlphaSkiaTextAlign", "Center")
             : _testSource.MakeEnumAccess("AlphaSkiaTextAlign", "Left");
         
+
+        var textPart = WithTextLength ? $"{text}, {symbols.Count}" :  $"{text}";
         _testSource.WriteCallCanvasMethod("FillText",
-            $"{text}, {_testSource.MakeTestGetProperty("MusicTypeface")}, {MakeGetMusicFontSize(scale)}, {_testSource.MakeCastToFloat(x)}, {_testSource.MakeCastToFloat(y)}, {textAlign}, {_testSource.MakeEnumAccess("AlphaSkiaTextBaseline", "Alphabetic")}");
+            $"{textPart}, {_testSource.MakeTestGetProperty("MusicTypeface")}, {MakeGetMusicFontSize(scale)}, {_testSource.MakeCastToFloat(x)}, {_testSource.MakeCastToFloat(y)}, {textAlign}, {_testSource.MakeEnumAccess("AlphaSkiaTextBaseline", "Alphabetic")}");
     }
 
     private string MakeGetMusicFontSize(double? scale = null) 
diff --git a/test/test-generator/AlphaSkiaUnitTestGenerator.cs b/test/test-generator/AlphaSkiaUnitTestGenerator.cs
index 7273a82..2af2132 100644
--- a/test/test-generator/AlphaSkiaUnitTestGenerator.cs
+++ b/test/test-generator/AlphaSkiaUnitTestGenerator.cs
@@ -238,7 +238,7 @@ public static string GenerateCppSource(out string headerSourceCode)
         var sourceCode = new CppTestSourceBuilder();
         AlphaTab.Environment.RenderEngines.Set(
             settings.Core.Engine,
-            new RenderEngineFactory(false, () => new AlphaSkiaTestCanvas(sourceCode))
+            new RenderEngineFactory(false, () => new AlphaSkiaTestCanvas(sourceCode) { WithTextLength = true })
         );
 
         sourceCode.Resume();
diff --git a/wrapper/include/AlphaSkiaCanvas.h b/wrapper/include/AlphaSkiaCanvas.h
index b2e3af4..0f3b2cd 100644
--- a/wrapper/include/AlphaSkiaCanvas.h
+++ b/wrapper/include/AlphaSkiaCanvas.h
@@ -36,16 +36,14 @@ class AlphaSkiaCanvas
     void stroke();
     void draw_image(sk_sp<SkImage> image, float x, float y, float w, float h);
    
-    void fill_text(const char16_t *text, sk_sp<SkTypeface> typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline);
-    float measure_text(const char16_t *text, sk_sp<SkTypeface> typeface, float font_size);
+    void fill_text(const char16_t *text, int text_length, sk_sp<SkTypeface> typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline);
+    float measure_text(const char16_t *text, int text_length, sk_sp<SkTypeface> typeface, float font_size);
     void begin_rotate(float center_x, float center_y, float angle);
     void end_rotate();
 
 private:
     SkPaint create_paint();
 
-    std::string convert_utf16_to_utf8(const char16_t *text);
-
     SkColor color_;
     float line_width_;
     sk_sp<SkSurface> surface_;
@@ -55,6 +53,7 @@ class AlphaSkiaCanvas
     static const uint32_t layoutUnitFractionalBits_;
     static const int32_t fixedPointDenominator_;
     void text_run(const char16_t* text,
+                  int text_length,
                   SkFont &font,
                   sk_sp<SkTextBlob> &realBlob,
                   float &width);
diff --git a/wrapper/include/alphaskia.h b/wrapper/include/alphaskia.h
index 81adcaf..6a6bbd8 100644
--- a/wrapper/include/alphaskia.h
+++ b/wrapper/include/alphaskia.h
@@ -90,9 +90,9 @@ extern "C"
         alphaskia_text_baseline_middle = 2,
         alphaskia_text_baseline_bottom = 3
     } alphaskia_text_baseline_t;
-    AS_API void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas, const char16_t *text, alphaskia_typeface_t typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline);
+    AS_API void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas, const char16_t *text, int text_length, alphaskia_typeface_t typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline);
 
-    AS_API float alphaskia_canvas_measure_text(alphaskia_canvas_t canvas, const char16_t *text, alphaskia_typeface_t typeface, float font_size);
+    AS_API float alphaskia_canvas_measure_text(alphaskia_canvas_t canvas, const char16_t *text, int text_length, alphaskia_typeface_t typeface, float font_size);
     AS_API void alphaskia_canvas_begin_rotate(alphaskia_canvas_t canvas, float center_x, float center_y, float angle);
     AS_API void alphaskia_canvas_end_rotate(alphaskia_canvas_t canvas);
 }
\ No newline at end of file
diff --git a/wrapper/src/AlphaSkiaCanvas.cpp b/wrapper/src/AlphaSkiaCanvas.cpp
index db871e8..bcfcca4 100644
--- a/wrapper/src/AlphaSkiaCanvas.cpp
+++ b/wrapper/src/AlphaSkiaCanvas.cpp
@@ -9,6 +9,7 @@
 #include "../../externals/skia/include/core/SkStream.h"
 #include "../../externals/skia/include/core/SkFontMetrics.h"
 #include "../../externals/skia/include/core/SkTextBlob.h"
+#include "../../externals/skia/include/core/SkRefCnt.h"
 
 #include "../../externals/skia/third_party/externals/harfbuzz/src/hb.h"
 #include "../../externals/skia/third_party/externals/harfbuzz/src/hb-ot.h"
@@ -148,13 +149,13 @@ void AlphaSkiaCanvas::stroke()
     path_.reset();
 }
 
-void AlphaSkiaCanvas::fill_text(const char16_t *text, sk_sp<SkTypeface> type_face, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline)
+void AlphaSkiaCanvas::fill_text(const char16_t *text, int text_length, sk_sp<SkTypeface> type_face, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline)
 {
     sk_sp<SkTextBlob> realBlob;
     SkFont font(type_face, font_size);
 
     float width(0);
-    text_run(text, font, realBlob, width);
+    text_run(text, text_length, font, realBlob, width);
 
     switch (text_align)
     {
@@ -180,12 +181,12 @@ void AlphaSkiaCanvas::fill_text(const char16_t *text, sk_sp<SkTypeface> type_fac
     }
 }
 
-float AlphaSkiaCanvas::measure_text(const char16_t *text, sk_sp<SkTypeface> type_face, float font_size)
+float AlphaSkiaCanvas::measure_text(const char16_t *text, int text_length, sk_sp<SkTypeface> type_face, float font_size)
 {
     sk_sp<SkTextBlob> realBlob;
     SkFont font(type_face, font_size);
     float width(0);
-    text_run(text, font, realBlob, width);
+    text_run(text, text_length, font, realBlob, width);
     return width;
 }
 
@@ -201,11 +202,6 @@ void AlphaSkiaCanvas::end_rotate()
     surface_->getCanvas()->restore();
 }
 
-std::string AlphaSkiaCanvas::convert_utf16_to_utf8(const char16_t *text)
-{
-    return std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>().to_bytes(text);
-}
-
 using HBBlob = std::unique_ptr<hb_blob_t, SkFunctionObject<hb_blob_destroy>>;
 using HBFace = std::unique_ptr<hb_face_t, SkFunctionObject<hb_face_destroy>>;
 using HBFont = std::unique_ptr<hb_font_t, SkFunctionObject<hb_font_destroy>>;
@@ -214,33 +210,75 @@ using HBBuffer = std::unique_ptr<hb_buffer_t, SkFunctionObject<hb_buffer_destroy
 const int SkiaToHarfBuzzFontSize = 1 << 16;
 const float HarfBuzzToSkiaFontSize = 1.0f / SkiaToHarfBuzzFontSize;
 
+hb_blob_t* skhb_get_table(hb_face_t* face, hb_tag_t tag, void* user_data) 
+{
+    SkTypeface& typeface = *reinterpret_cast<SkTypeface*>(user_data);
+
+    auto data = typeface.copyTableData(tag);
+    if (!data) 
+    {
+        return nullptr;
+    }
+    SkData* rawData = data.release();
+    return hb_blob_create(reinterpret_cast<char*>(rawData->writable_data()), rawData->size(),
+                          HB_MEMORY_MODE_READONLY, rawData, [](void* ctx) {
+                              SkSafeUnref(((SkData*)ctx));
+                          });
+}
+
+
 HBFont make_harfbuzz_font(const SkFont &font)
 {
     int index = 0;
     std::unique_ptr<SkStreamAsset> typefaceAsset = font.getTypeface()->openExistingStream(&index);
 
-    size_t size = typefaceAsset->getLength();
+    HBFace hbFace;
 
-    HBBlob blob;
-    if (const void *base = typefaceAsset->getMemoryBase())
+    if (typefaceAsset)
     {
-        blob.reset(hb_blob_create((char *)base, SkToUInt(size),
-                                  HB_MEMORY_MODE_READONLY, typefaceAsset.release(),
-                                  [](void *p)
-                                  { delete (SkStreamAsset *)p; }));
+        size_t size = typefaceAsset->getLength();
+
+        HBBlob blob;
+        if (const void *base = typefaceAsset->getMemoryBase())
+        {
+            blob.reset(hb_blob_create((char *)base, SkToUInt(size),
+                                    HB_MEMORY_MODE_READONLY, typefaceAsset.release(),
+                                    [](void *p)
+                                    { delete (SkStreamAsset *)p; }));
+        }
+        else
+        {
+            void *ptr = size ? sk_malloc_throw(size) : nullptr;
+            typefaceAsset->read(ptr, size);
+            blob.reset(hb_blob_create((char *)ptr, SkToUInt(size),
+                                    HB_MEMORY_MODE_READONLY, ptr, sk_free));
+        }
+        hb_blob_make_immutable(blob.get());
+
+        hbFace.reset(hb_face_create(blob.get(), index));
+        hb_face_set_index(hbFace.get(), index);
+        hb_face_set_upem(hbFace.get(), font.getTypeface()->getUnitsPerEm());
     }
-    else
+    
+
+    if(!hbFace) 
     {
-        void *ptr = size ? sk_malloc_throw(size) : nullptr;
-        typefaceAsset->read(ptr, size);
-        blob.reset(hb_blob_create((char *)ptr, SkToUInt(size),
-                                  HB_MEMORY_MODE_READONLY, ptr, sk_free));
+        hbFace.reset(hb_face_create_for_tables(
+            skhb_get_table,
+            const_cast<SkTypeface*>(SkRef(font.getTypeface())),
+            [](void* user_data){ SkSafeUnref(reinterpret_cast<SkTypeface*>(user_data)); }));
+        
+        if(hbFace)
+        {
+            hb_face_set_index(hbFace.get(), (unsigned)index);
+            hb_face_set_upem(hbFace.get(), font.getTypeface()->getUnitsPerEm());
+        }
     }
-    hb_blob_make_immutable(blob.get());
 
-    HBFace hbFace(hb_face_create(blob.get(), index));
-    hb_face_set_index(hbFace.get(), index);
-    hb_face_set_upem(hbFace.get(), font.getTypeface()->getUnitsPerEm());
+    if(!hbFace) 
+    {
+        return HBFont();
+    }
 
     HBFont hbFont(hb_font_create(hbFace.get()));
     float scale = font.getSize() * SkiaToHarfBuzzFontSize;
@@ -250,6 +288,7 @@ HBFont make_harfbuzz_font(const SkFont &font)
 }
 
 void AlphaSkiaCanvas::text_run(const char16_t *text,
+                               int text_length,
                                SkFont &font,
                                sk_sp<SkTextBlob> &realBlob,
                                float &width)
@@ -258,13 +297,21 @@ void AlphaSkiaCanvas::text_run(const char16_t *text,
     font.setSubpixel(true);
     font.setHinting(SkFontHinting::kNormal);
 
-    std::string utf8(convert_utf16_to_utf8(text));
-
     HBFont harfBuzzFont(make_harfbuzz_font(font));
+
+    SkTextBlobBuilder builder;
+    if(!harfBuzzFont)
+    {
+        auto runBuffer = builder.allocRunPos(font, 0);
+        realBlob = builder.make();
+        width = 0.0f;
+        return;
+    }
+
     HBBuffer buffer(hb_buffer_create());
     hb_buffer_set_direction(buffer.get(), HB_DIRECTION_LTR);
     hb_buffer_set_language(buffer.get(), hb_language_get_default());
-    hb_buffer_add_utf8(buffer.get(), utf8.c_str(), -1, 0, -1);
+    hb_buffer_add_utf16(buffer.get(), reinterpret_cast<const uint16_t*>(text), text_length, 0, -1);
 
     hb_shape(harfBuzzFont.get(), buffer.get(), nullptr, 0);
 
@@ -275,7 +322,6 @@ void AlphaSkiaCanvas::text_run(const char16_t *text,
     hb_glyph_position_t *positions = hb_buffer_get_glyph_positions(buffer.get(),
                                                                    &positionsLength);
 
-    SkTextBlobBuilder builder;
     auto runBuffer = builder.allocRunPos(font, infosLength);
 
     auto glyphSpan = runBuffer.glyphs;
diff --git a/wrapper/src/alphaskia_canvas.cpp b/wrapper/src/alphaskia_canvas.cpp
index 1f0c8a4..39c5f74 100644
--- a/wrapper/src/alphaskia_canvas.cpp
+++ b/wrapper/src/alphaskia_canvas.cpp
@@ -117,16 +117,16 @@ extern "C"
         reinterpret_cast<AlphaSkiaCanvas *>(canvas)->stroke();
     }
 
-    AS_API void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas, const char16_t *text, alphaskia_typeface_t typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline)
+    AS_API void alphaskia_canvas_fill_text(alphaskia_canvas_t canvas, const char16_t *text, int text_length, alphaskia_typeface_t typeface, float font_size, float x, float y, alphaskia_text_align_t text_align, alphaskia_text_baseline_t baseline)
     {
         sk_sp<SkTypeface> *skTypeface = reinterpret_cast<sk_sp<SkTypeface> *>(typeface);
-        reinterpret_cast<AlphaSkiaCanvas *>(canvas)->fill_text(text, *skTypeface, font_size, x, y, text_align, baseline);
+        reinterpret_cast<AlphaSkiaCanvas *>(canvas)->fill_text(text, text_length, *skTypeface, font_size, x, y, text_align, baseline);
     }
 
-    AS_API float alphaskia_canvas_measure_text(alphaskia_canvas_t canvas, const char16_t *text, alphaskia_typeface_t typeface, float font_size)
+    AS_API float alphaskia_canvas_measure_text(alphaskia_canvas_t canvas, const char16_t *text, int text_length, alphaskia_typeface_t typeface, float font_size)
     {
         sk_sp<SkTypeface> *skTypeface = reinterpret_cast<sk_sp<SkTypeface> *>(typeface);
-        return reinterpret_cast<AlphaSkiaCanvas *>(canvas)->measure_text(text, *skTypeface, font_size);
+        return reinterpret_cast<AlphaSkiaCanvas *>(canvas)->measure_text(text, text_length, *skTypeface, font_size);
     }
 
     AS_API void alphaskia_canvas_begin_rotate(alphaskia_canvas_t canvas, float center_x, float center_y, float angle)