diff --git a/test/shape/data/text-rendering-tests/tests/AVAR-1.tests b/test/shape/data/text-rendering-tests/tests/AVAR-1.tests
index b6203c066..91eec84ad 100644
--- a/test/shape/data/text-rendering-tests/tests/AVAR-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/AVAR-1.tests
@@ -1,17 +1,17 @@
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=100;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=150;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=200;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=250;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=300;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=350;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=400;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=450;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=500;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=550;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=600;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=650;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=700;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=750;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=800;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=850;U+2A01;[gid1]
-../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=900;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=100;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=150;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=200;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=250;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=300;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=350;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=400;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=450;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=500;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=550;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=600;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=650;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=700;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=750;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=800;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=850;U+2A01;[gid1]
+../fonts/TestAVAR.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=900;U+2A01;[gid1]
diff --git a/test/shape/data/text-rendering-tests/tests/CFF-1.tests b/test/shape/data/text-rendering-tests/tests/CFF-1.tests
index 0d0d25294..63658c0a4 100644
--- a/test/shape/data/text-rendering-tests/tests/CFF-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/CFF-1.tests
@@ -1,13 +1,13 @@
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[gid66]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+211D;[gid30]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+24EA;[gid235]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2460;[gid97]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2461;[gid98]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+4EFF;[gid256]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+FF21;[gid34]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+10133;[gid52]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1D4D0;[gid209]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F33A;[gid59]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F33B;[gid60]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F4A7;[gid168]
-../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F95D;[gid94]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[gid66]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+211D;[gid30]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+24EA;[gid235]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+2460;[gid97]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+2461;[gid98]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+4EFF;[gid256]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+FF21;[gid34]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+10133;[gid52]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+1D4D0;[gid209]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F33A;[gid59]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F33B;[gid60]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F4A7;[gid168]
+../fonts/FDArrayTest257.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F95D;[gid94]
diff --git a/test/shape/data/text-rendering-tests/tests/CFF-2.tests b/test/shape/data/text-rendering-tests/tests/CFF-2.tests
index 3893b14d8..3b98a36dd 100644
--- a/test/shape/data/text-rendering-tests/tests/CFF-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/CFF-2.tests
@@ -1,13 +1,13 @@
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[gid66]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+211D;[gid8478]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+24EA;[gid9451]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2460;[gid9313]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2461;[gid9314]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+4EFF;[gid20224]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+FF21;[gid65314]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+10133;[gid308]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1D4D0;[gid54481]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F33A;[gid62267]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F33B;[gid62268]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F4A7;[gid62632]
-../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1F95D;[gid63838]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[gid66]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+211D;[gid8478]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+24EA;[gid9451]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+2460;[gid9313]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+2461;[gid9314]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+4EFF;[gid20224]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+FF21;[gid65314]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+10133;[gid308]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+1D4D0;[gid54481]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F33A;[gid62267]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F33B;[gid62268]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F4A7;[gid62632]
+../fonts/FDArrayTest65535.otf;--font-size=1000 --ned --remove-default-ignorables;U+1F95D;[gid63838]
diff --git a/test/shape/data/text-rendering-tests/tests/CFF-3.tests b/test/shape/data/text-rendering-tests/tests/CFF-3.tests
index c6916a5f4..20c9948d6 100644
--- a/test/shape/data/text-rendering-tests/tests/CFF-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/CFF-3.tests
@@ -1,2 +1,2 @@
-../fonts/TestCFFThree.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00C0;[Agrave]
-../fonts/TestCFFThree.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00DC;[Udieresis]
+../fonts/TestCFFThree.otf;--font-size=1000 --ned --remove-default-ignorables;U+00C0;[Agrave]
+../fonts/TestCFFThree.otf;--font-size=1000 --ned --remove-default-ignorables;U+00DC;[Udieresis]
diff --git a/test/shape/data/text-rendering-tests/tests/CFF2-1.tests b/test/shape/data/text-rendering-tests/tests/CFF2-1.tests
index 97ead223e..56a237b0c 100644
--- a/test/shape/data/text-rendering-tests/tests/CFF2-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/CFF2-1.tests
@@ -1,9 +1,9 @@
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=100;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=200;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=500;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=700;U+0024;[dollar]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=800;U+0024;[dollar.nostroke]
-../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=900;U+0024;[dollar.nostroke]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=100;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=200;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=500;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=700;U+0024;[dollar]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=800;U+0024;[dollar.nostroke]
+../fonts/AdobeVFPrototype-Subset.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=900;U+0024;[dollar.nostroke]
diff --git a/test/shape/data/text-rendering-tests/tests/CMAP-1.tests b/test/shape/data/text-rendering-tests/tests/CMAP-1.tests
index 708c0be90..f9bc4d72a 100644
--- a/test/shape/data/text-rendering-tests/tests/CMAP-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/CMAP-1.tests
@@ -1,4 +1,4 @@
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+82A6;[uni82A6_uE0100]
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+82A6,U+E0100;[uni82A6_uE0100]
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+82A6,U+E0101;[uni82A6_uE0101]
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+82A6,U+E0102;[uni82A6_uE0100]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+82A6;[uni82A6_uE0100]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+82A6,U+E0100;[uni82A6_uE0100]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+82A6,U+E0101;[uni82A6_uE0101]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+82A6,U+E0102;[uni82A6_uE0100]
diff --git a/test/shape/data/text-rendering-tests/tests/CMAP-2.tests b/test/shape/data/text-rendering-tests/tests/CMAP-2.tests
index d035f7c06..64f7bb498 100644
--- a/test/shape/data/text-rendering-tests/tests/CMAP-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/CMAP-2.tests
@@ -1,2 +1,2 @@
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2269;[uni2269]
-../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+2269,U+FE00;[uni2269FE00]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+2269;[uni2269]
+../fonts/TestCMAP14.otf;--font-size=1000 --ned --remove-default-ignorables;U+2269,U+FE00;[uni2269FE00]
diff --git a/test/shape/data/text-rendering-tests/tests/CMAP-3.tests b/test/shape/data/text-rendering-tests/tests/CMAP-3.tests
index 2ad17ea17..4b2658596 100644
--- a/test/shape/data/text-rendering-tests/tests/CMAP-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/CMAP-3.tests
@@ -1,20 +1,20 @@
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+201C;[gid200]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[gid34]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[gid35]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00C7;[gid126]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+011E;[gid176]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0049;[gid42]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0130;[gid178]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00D6;[gid140]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+015E;[gid181]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00DC;[gid145]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+201D;[gid201]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0061;[gid66]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0062;[gid67]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00E7;[gid154]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+011F;[gid177]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0131;[gid222]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0069;[gid74]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00F6;[gid168]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+015F;[gid182]
-../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+00FC;[gid174]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+201C;[gid200]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[gid34]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[gid35]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00C7;[gid126]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+011E;[gid176]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0049;[gid42]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0130;[gid178]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00D6;[gid140]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+015E;[gid181]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00DC;[gid145]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+201D;[gid201]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0061;[gid66]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0062;[gid67]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00E7;[gid154]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+011F;[gid177]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0131;[gid222]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0069;[gid74]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00F6;[gid168]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+015F;[gid182]
+../fonts/TestCMAPMacTurkish.ttf;--font-size=1000 --ned --remove-default-ignorables;U+00FC;[gid174]
diff --git a/test/shape/data/text-rendering-tests/tests/CMAP-4.tests b/test/shape/data/text-rendering-tests/tests/CMAP-4.tests
index 8b3c7c62a..4c97840c1 100644
--- a/test/shape/data/text-rendering-tests/tests/CMAP-4.tests
+++ b/test/shape/data/text-rendering-tests/tests/CMAP-4.tests
@@ -1,4 +1,4 @@
-../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0055;[lastresortlatin]
-../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+13EF;[lastresortcherokee]
-../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1203C;[lastresortcuneiform]
-../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1FA00;[lastresortchesssymbols]
+../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0055;[lastresortlatin]
+../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables;U+13EF;[lastresortcherokee]
+../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1203C;[lastresortcuneiform]
+../fonts/TestCMAP13.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1FA00;[lastresortchesssymbols]
diff --git a/test/shape/data/text-rendering-tests/tests/CVAR-1.tests b/test/shape/data/text-rendering-tests/tests/CVAR-1.tests
index a4dd2a54a..96ed0f072 100644
--- a/test/shape/data/text-rendering-tests/tests/CVAR-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/CVAR-1.tests
@@ -1,3 +1,3 @@
-../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=28,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@595,0|uni006E@1126,0]
-../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=94,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@635,0|uni006E@1212,0]
-../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=194,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@691,0|uni006E@1331,0]
+../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=28,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@595,0|uni006E@1126,0]
+../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=94,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@635,0|uni006E@1212,0]
+../fonts/TestCVARGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=194,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@691,0|uni006E@1331,0]
diff --git a/test/shape/data/text-rendering-tests/tests/CVAR-2.tests b/test/shape/data/text-rendering-tests/tests/CVAR-2.tests
index f797c949c..726011cff 100644
--- a/test/shape/data/text-rendering-tests/tests/CVAR-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/CVAR-2.tests
@@ -1,3 +1,3 @@
-../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=28,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@595,0|uni006E@1126,0]
-../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=94,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@635,0|uni006E@1212,0]
-../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=194,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@691,0|uni006E@1331,0]
+../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=28,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@595,0|uni006E@1126,0]
+../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=94,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@635,0|uni006E@1212,0]
+../fonts/TestCVARGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=194,wdth=100,opsz=72;U+0068,U+006F,U+006E;[uni0068|uni006F@691,0|uni006E@1331,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GLYF-1.tests b/test/shape/data/text-rendering-tests/tests/GLYF-1.tests
index 6b4919194..7d6ab84d5 100644
--- a/test/shape/data/text-rendering-tests/tests/GLYF-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/GLYF-1.tests
@@ -1 +1 @@
-../fonts/TestGLYFOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0123;[gcommaabove]
+../fonts/TestGLYFOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0123;[gcommaabove]
diff --git a/test/shape/data/text-rendering-tests/tests/GPOS-1.tests b/test/shape/data/text-rendering-tests/tests/GPOS-1.tests
index dfdf0b4d7..4cfee63f8 100644
--- a/test/shape/data/text-rendering-tests/tests/GPOS-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/GPOS-1.tests
@@ -1,19 +1,19 @@
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0104,U+004A;[Aogonek|J@732,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0104,U+0067;[Aogonek|g@692,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0104,U+0123;[Aogonek|gcommaabove@692,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0104,U+006A;[Aogonek|j@752,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0104,U+0237;[Aogonek|dotlessj@752,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0051,U+0237;[Q|dotlessj@734,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0105,U+006A;[aogonek|j@588,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0105,U+0237;[aogonek|dotlessj@588,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0067,U+0237;[g|dotlessj@563,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0123,U+0237;[gcommaabove|dotlessj@563,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0131,U+0237;[dotlessi|dotlessj@334,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0173,U+0237;[uogonek|dotlessj@656,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0076,U+0237;[v|dotlessj@587,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+0061;[V|a@594,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+00E1;[V|aacute@594,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+0105;[V|aogonek@594,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+0066;[V|f@634,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+FB02;[V|fl@634,0]
-../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0056,U+002E;[V|period@504,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0104,U+004A;[Aogonek|J@732,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0104,U+0067;[Aogonek|g@692,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0104,U+0123;[Aogonek|gcommaabove@692,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0104,U+006A;[Aogonek|j@752,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0104,U+0237;[Aogonek|dotlessj@752,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0051,U+0237;[Q|dotlessj@734,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0105,U+006A;[aogonek|j@588,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0105,U+0237;[aogonek|dotlessj@588,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0067,U+0237;[g|dotlessj@563,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0123,U+0237;[gcommaabove|dotlessj@563,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0131,U+0237;[dotlessi|dotlessj@334,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0173,U+0237;[uogonek|dotlessj@656,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0076,U+0237;[v|dotlessj@587,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+0061;[V|a@594,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+00E1;[V|aacute@594,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+0105;[V|aogonek@594,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+0066;[V|f@634,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+FB02;[V|fl@634,0]
+../fonts/TestGPOSOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0056,U+002E;[V|period@504,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GPOS-2.tests b/test/shape/data/text-rendering-tests/tests/GPOS-2.tests
index 3784c40ba..87501429c 100644
--- a/test/shape/data/text-rendering-tests/tests/GPOS-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/GPOS-2.tests
@@ -1,3 +1,3 @@
-../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+25EF;[uni25EF]
-../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+263C;[sun]
-../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+25EF,U+263C;[uni25EF|sun]
+../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables;U+25EF;[uni25EF]
+../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables;U+263C;[sun]
+../fonts/TestGPOSTwo.otf;--font-size=1000 --ned --remove-default-ignorables;U+25EF,U+263C;[uni25EF|sun]
diff --git a/test/shape/data/text-rendering-tests/tests/GPOS-3.tests b/test/shape/data/text-rendering-tests/tests/GPOS-3.tests
index e72d82b14..ad2cc75d9 100644
--- a/test/shape/data/text-rendering-tests/tests/GPOS-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/GPOS-3.tests
@@ -1,4 +1,4 @@
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1208;[uni1208]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1208,U+135E;[uni1208|uni135E@303,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1208,U+135F;[uni1208|uni135F@303,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1208,U+135D;[uni1208|uni135D@303,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1208;[uni1208]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1208,U+135E;[uni1208|uni135E@303,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1208,U+135F;[uni1208|uni135F@303,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1208,U+135D;[uni1208|uni135D@303,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GPOS-4.tests b/test/shape/data/text-rendering-tests/tests/GPOS-4.tests
index 7596c50f8..2762a053a 100644
--- a/test/shape/data/text-rendering-tests/tests/GPOS-4.tests
+++ b/test/shape/data/text-rendering-tests/tests/GPOS-4.tests
@@ -1,4 +1,4 @@
-../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0075,U+0308,U+0301;[u|uni0308@529,-31|acutecomb@537,138]
-../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0075,U+0308,U+0304;[u|uni0308@529,-31|uni0304@526,138]
-../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0075,U+0308,U+0308;[u|uni0308@529,-31|uni0308@529,138]
-../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0075,U+0308,U+0308,U+0308;[u|uni0308@529,-31|uni0308@529,138|uni0308@529,307]
+../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0075,U+0308,U+0301;[u|uni0308@529,-31|acutecomb@537,138]
+../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0075,U+0308,U+0304;[u|uni0308@529,-31|uni0304@526,138]
+../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0075,U+0308,U+0308;[u|uni0308@529,-31|uni0308@529,138]
+../fonts/TestGPOSThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0075,U+0308,U+0308,U+0308;[u|uni0308@529,-31|uni0308@529,138|uni0308@529,307]
diff --git a/test/shape/data/text-rendering-tests/tests/GPOS-5.tests b/test/shape/data/text-rendering-tests/tests/GPOS-5.tests
index 821a19b65..073c50aa4 100644
--- a/test/shape/data/text-rendering-tests/tests/GPOS-5.tests
+++ b/test/shape/data/text-rendering-tests/tests/GPOS-5.tests
@@ -1,5 +1,5 @@
-../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=100;U+0634,U+0652;[uni0652@663,144|uni0634]
-../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+0634,U+0652;[uni0652@680,165|uni0634]
-../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+0634,U+0652;[uni0652@730,246|uni0634]
-../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=700;U+0634,U+0652;[uni0652@750,282|uni0634]
-../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=900;U+0634,U+0652;[uni0652@784,351|uni0634]
+../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=100;U+0634,U+0652;[uni0652@663,144|uni0634]
+../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+0634,U+0652;[uni0652@680,165|uni0634]
+../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+0634,U+0652;[uni0652@730,246|uni0634]
+../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=700;U+0634,U+0652;[uni0652@750,282|uni0634]
+../fonts/TestGPOSFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=900;U+0634,U+0652;[uni0652@784,351|uni0634]
diff --git a/test/shape/data/text-rendering-tests/tests/GSUB-1.tests b/test/shape/data/text-rendering-tests/tests/GSUB-1.tests
index 7e185f7b5..d1143904f 100644
--- a/test/shape/data/text-rendering-tests/tests/GSUB-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/GSUB-1.tests
@@ -1 +1 @@
-../fonts/TestGSUBOne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0061,U+0020,U+0061;[a.alt|space@500,0|a@1000,0]
+../fonts/TestGSUBOne.otf;--font-size=1000 --ned --remove-default-ignorables;U+0061,U+0020,U+0061;[a.alt|space@500,0|a@1000,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GSUB-2.tests b/test/shape/data/text-rendering-tests/tests/GSUB-2.tests
index ef418c210..4847af6ad 100644
--- a/test/shape/data/text-rendering-tests/tests/GSUB-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/GSUB-2.tests
@@ -1,11 +1,11 @@
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1373;[uni1373]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+136B;[uni136B]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1375;[uni1375]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+136D;[uni136D]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1373,U+136B;[uni1373.init|uni136B.fina@621,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1375,U+136D;[uni1375.init|uni136D.fina@662,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+137B;[uni137B]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1373,U+136B,U+137B;[uni1373.init|uni136B.medi@621,0|uni137B.fina@1102,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1373,U+136B,U+137B,U+1373,U+136B;[uni1373.init|uni136B.medi@621,0|uni137B.medi@1102,0|uni1373.medi@1489,0|uni136B.fina@2110,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1373,U+136B,U+137B,U+1375,U+136D;[uni1373.init|uni136B.medi@621,0|uni137B.medi@1102,0|uni1375.medi@1489,0|uni136D.fina@2157,0]
-../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1375,U+136D,U+137B,U+1373,U+136B;[uni1375.init|uni136D.medi@662,0|uni137B.medi@1203,0|uni1373.medi@1590,0|uni136B.fina@2211,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1373;[uni1373]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+136B;[uni136B]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1375;[uni1375]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+136D;[uni136D]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1373,U+136B;[uni1373.init|uni136B.fina@621,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1375,U+136D;[uni1375.init|uni136D.fina@662,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+137B;[uni137B]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1373,U+136B,U+137B;[uni1373.init|uni136B.medi@621,0|uni137B.fina@1102,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1373,U+136B,U+137B,U+1373,U+136B;[uni1373.init|uni136B.medi@621,0|uni137B.medi@1102,0|uni1373.medi@1489,0|uni136B.fina@2110,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1373,U+136B,U+137B,U+1375,U+136D;[uni1373.init|uni136B.medi@621,0|uni137B.medi@1102,0|uni1375.medi@1489,0|uni136D.fina@2157,0]
+../fonts/TestShapeEthi.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1375,U+136D,U+137B,U+1373,U+136B;[uni1375.init|uni136D.medi@662,0|uni137B.medi@1203,0|uni1373.medi@1590,0|uni136B.fina@2211,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-1.tests b/test/shape/data/text-rendering-tests/tests/GVAR-1.tests
index 8c36b3603..660977cc6 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-1.tests
@@ -1,9 +1,9 @@
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=350;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=450;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=500;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=550;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=650;U+5F4C;[gid2]
-../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=700;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=350;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=450;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=500;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=550;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=650;U+5F4C;[gid2]
+../fonts/TestGVAROne.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=700;U+5F4C;[gid2]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-2.tests b/test/shape/data/text-rendering-tests/tests/GVAR-2.tests
index 414eca5fd..219b36078 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-2.tests
@@ -1,9 +1,9 @@
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=350;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=450;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=500;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=550;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=650;U+5F4C;[gid2]
-../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=700;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=350;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=450;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=500;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=550;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=650;U+5F4C;[gid2]
+../fonts/TestGVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=700;U+5F4C;[gid2]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-3.tests b/test/shape/data/text-rendering-tests/tests/GVAR-3.tests
index e9ba906f7..b21479f50 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-3.tests
@@ -1,9 +1,9 @@
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=350;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=450;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=500;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=550;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=650;U+5F4C;[gid2]
-../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=700;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=350;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=450;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=500;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=550;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=650;U+5F4C;[gid2]
+../fonts/TestGVARThree.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=700;U+5F4C;[gid2]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-4.tests b/test/shape/data/text-rendering-tests/tests/GVAR-4.tests
index 2fc216f57..e00a73d8a 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-4.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-4.tests
@@ -1,11 +1,11 @@
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-1.0,T1=0.0;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.8,T1=0.1;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.6,T1=0.2;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.4,T1=0.3;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.2,T1=0.4;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.0,T1=0.5;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.2,T1=0.6;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.4,T1=0.7;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.6,T1=0.8;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.8,T1=0.9;U+1F98E;[gid5]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=1.0,T1=1.0;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-1.0,T1=0.0;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.8,T1=0.1;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.6,T1=0.2;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.4,T1=0.3;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.2,T1=0.4;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.0,T1=0.5;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.2,T1=0.6;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.4,T1=0.7;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.6,T1=0.8;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.8,T1=0.9;U+1F98E;[gid5]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=1.0,T1=1.0;U+1F98E;[gid5]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-5.tests b/test/shape/data/text-rendering-tests/tests/GVAR-5.tests
index 4df737d34..e06ad3605 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-5.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-5.tests
@@ -1,11 +1,11 @@
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-1.0;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.8;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.6;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.4;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=-0.2;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.0;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.2;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.4;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.6;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=0.8;U+1F31D;[gid15]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=M1=1.0;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-1.0;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.8;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.6;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.4;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=-0.2;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.0;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.2;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.4;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.6;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=0.8;U+1F31D;[gid15]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=M1=1.0;U+1F31D;[gid15]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-6.tests b/test/shape/data/text-rendering-tests/tests/GVAR-6.tests
index 500337b85..f8a10d180 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-6.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-6.tests
@@ -1,11 +1,11 @@
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.0;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.1;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.2;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.3;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.4;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.5;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.6;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.7;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.8;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=0.9;U+1F422;[gid12]
-../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=T1=1.0;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.0;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.1;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.2;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.3;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.4;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.5;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.6;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.7;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.8;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=0.9;U+1F422;[gid12]
+../fonts/Zycon.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=T1=1.0;U+1F422;[gid12]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-7.tests b/test/shape/data/text-rendering-tests/tests/GVAR-7.tests
index a246ec3a7..c2c4218b6 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-7.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-7.tests
@@ -1,7 +1,7 @@
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=150;U+004F,U+0049,U+004F;[uni004F|uni0049@706,0|uni004F@1072,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=200;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1074,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=250;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1075,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=300;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1076,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=350;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1077,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1078,0]
-../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=450;U+004F,U+0049,U+004F;[uni004F|uni0049@706,0|uni004F@1079,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=150;U+004F,U+0049,U+004F;[uni004F|uni0049@706,0|uni004F@1072,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=200;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1074,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=250;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1075,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=300;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1076,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=350;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1077,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+004F,U+0049,U+004F;[uni004F|uni0049@707,0|uni004F@1078,0]
+../fonts/TestGVARFour.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=450;U+004F,U+0049,U+004F;[uni004F|uni0049@706,0|uni004F@1079,0]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-8.tests b/test/shape/data/text-rendering-tests/tests/GVAR-8.tests
index 4b4b54d37..af17c866c 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-8.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-8.tests
@@ -1,6 +1,6 @@
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=0.0;U+0048;[H]
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=-0.2;U+0048;[H]
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=-0.4;U+0048;[H]
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=-0.6;U+0048;[H]
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=-0.8;U+0048;[H]
-../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=HV=-1.0;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=0.0;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=-0.2;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=-0.4;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=-0.6;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=-0.8;U+0048;[H]
+../fonts/TestGVAREight.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=HV=-1.0;U+0048;[H]
diff --git a/test/shape/data/text-rendering-tests/tests/GVAR-9.tests b/test/shape/data/text-rendering-tests/tests/GVAR-9.tests
index bf0f3e59a..12918f1fa 100644
--- a/test/shape/data/text-rendering-tests/tests/GVAR-9.tests
+++ b/test/shape/data/text-rendering-tests/tests/GVAR-9.tests
@@ -1,10 +1,10 @@
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=-1.0;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=-0.5;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.0;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.5;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.6;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.7;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.8;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.9;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=0.944444;U+0041;[A]
-../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=TEST=1.0;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=-1.0;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=-0.5;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.0;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.5;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.6;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.7;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.8;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.9;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=0.944444;U+0041;[A]
+../fonts/TestGVARNine.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=TEST=1.0;U+0041;[A]
diff --git a/test/shape/data/text-rendering-tests/tests/HVAR-1.tests b/test/shape/data/text-rendering-tests/tests/HVAR-1.tests
index dbc4ba191..777538ed3 100644
--- a/test/shape/data/text-rendering-tests/tests/HVAR-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/HVAR-1.tests
@@ -1,6 +1,6 @@
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=0;U+0041,U+0042,U+0043;[A|B@520,0|C@1094,0]
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=200;U+0041,U+0042,U+0043;[A|B@533,0|C@1115,0]
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+0041,U+0042,U+0043;[A|B@546,0|C@1135,0]
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+0041,U+0042,U+0043;[A|B@558,0|C@1155,0]
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=800;U+0041,U+0042,U+0043;[A|B@571,0|C@1175,0]
-../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=1000;U+0041,U+0042,U+0043;[A|B@584,0|C@1196,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=0;U+0041,U+0042,U+0043;[A|B@520,0|C@1094,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=200;U+0041,U+0042,U+0043;[A|B@533,0|C@1115,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+0041,U+0042,U+0043;[A|B@546,0|C@1135,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+0041,U+0042,U+0043;[A|B@558,0|C@1155,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=800;U+0041,U+0042,U+0043;[A|B@571,0|C@1175,0]
+../fonts/TestHVAROne.otf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=1000;U+0041,U+0042,U+0043;[A|B@584,0|C@1196,0]
diff --git a/test/shape/data/text-rendering-tests/tests/HVAR-2.tests b/test/shape/data/text-rendering-tests/tests/HVAR-2.tests
index aa086e372..5acd6a84e 100644
--- a/test/shape/data/text-rendering-tests/tests/HVAR-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/HVAR-2.tests
@@ -1,6 +1,6 @@
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=0;U+0041,U+0042;[uni0041|uni0042@450,0]
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=200;U+0041,U+0042;[uni0041|uni0042@515,0]
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=400;U+0041,U+0042;[uni0041|uni0042@584,0]
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=600;U+0041,U+0042;[uni0041|uni0042@673,0]
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=800;U+0041,U+0042;[uni0041|uni0042@761,0]
-../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft --variations=wght=1000;U+0041,U+0042;[uni0041|uni0042@850,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=0;U+0041,U+0042;[uni0041|uni0042@450,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=200;U+0041,U+0042;[uni0041|uni0042@515,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=400;U+0041,U+0042;[uni0041|uni0042@584,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=600;U+0041,U+0042;[uni0041|uni0042@673,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=800;U+0041,U+0042;[uni0041|uni0042@761,0]
+../fonts/TestHVARTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --variations=wght=1000;U+0041,U+0042;[uni0041|uni0042@850,0]
diff --git a/test/shape/data/text-rendering-tests/tests/KERN-1.tests b/test/shape/data/text-rendering-tests/tests/KERN-1.tests
index e72befffd..9d44dea5c 100644
--- a/test/shape/data/text-rendering-tests/tests/KERN-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/KERN-1.tests
@@ -1 +1 @@
-../fonts/TestKERNOne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0131,U+0054,U+0075,U+0054,U+0075,U+0054,U+0131;[dotlessi|T|u@400,0|T@600,0|u@1000,0|T@1200,0|dotlessi@1600,0]
+../fonts/TestKERNOne.otf;--font-size=1000 --ned --remove-default-ignorables;U+0131,U+0054,U+0075,U+0054,U+0075,U+0054,U+0131;[dotlessi|T|u@400,0|T@600,0|u@1000,0|T@1200,0|dotlessi@1600,0]
diff --git a/test/shape/data/text-rendering-tests/tests/KERN-2.tests b/test/shape/data/text-rendering-tests/tests/KERN-2.tests
index 1601eef65..7f31b3f2b 100644
--- a/test/shape/data/text-rendering-tests/tests/KERN-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/KERN-2.tests
@@ -1 +1 @@
-../fonts/TestKERNOne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0075,U+0131,U+0131,U+0054,U+0131,U+0131,U+0054,U+0131,U+0131,U+0075;[u|dotlessi@400,0|dotlessi@1100,0|T@1100,0|dotlessi@1500,0|dotlessi@2200,0|T@2200,0|dotlessi@2600,0|dotlessi@3300,0|u@3500,0]
+../fonts/TestKERNOne.otf;--font-size=1000 --ned --remove-default-ignorables;U+0075,U+0131,U+0131,U+0054,U+0131,U+0131,U+0054,U+0131,U+0131,U+0075;[u|dotlessi@400,0|dotlessi@1100,0|T@1100,0|dotlessi@1500,0|dotlessi@2200,0|T@2200,0|dotlessi@2600,0|dotlessi@3300,0|u@3500,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-1.tests b/test/shape/data/text-rendering-tests/tests/MORX-1.tests
index 175fd736a..2a39fafe5 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-1.tests
@@ -1 +1 @@
-../fonts/TestMORXOne.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043;[A.alt|B@1000,0|C.alt@2000,0]
+../fonts/TestMORXOne.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043;[A.alt|B@1000,0|C.alt@2000,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-10.tests b/test/shape/data/text-rendering-tests/tests/MORX-10.tests
index ea9a6d5bf..4a23deab2 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-10.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-10.tests
@@ -1 +1 @@
-../fonts/TestMORXTen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0041,U+0042,U+0041,U+0042;[A|B@638,0|A@1288,0|B@1926,0|B@2576,0|A@3226,0]
+../fonts/TestMORXTen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0041,U+0042,U+0041,U+0042;[A|B@638,0|A@1288,0|B@1926,0|B@2576,0|A@3226,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-11.tests b/test/shape/data/text-rendering-tests/tests/MORX-11.tests
index adbad2add..053ef5ca5 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-11.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-11.tests
@@ -1 +1 @@
-../fonts/TestMORXEleven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041,U+0042,U+0042,U+0041,U+0041,U+0042,U+0058;[B|A@650,0|B@1288,0|B@1938,0|A@2588,0|X@3226,0|A@3812,0|B@4450,0]
+../fonts/TestMORXEleven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041,U+0042,U+0042,U+0041,U+0041,U+0042,U+0058;[B|A@650,0|B@1288,0|B@1938,0|A@2588,0|X@3226,0|A@3812,0|B@4450,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-12.tests b/test/shape/data/text-rendering-tests/tests/MORX-12.tests
index a37aa7288..a6d880803 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-12.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-12.tests
@@ -1,3 +1,3 @@
-../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0041,U+0042,U+0043,U+0058,U+0031;[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|one@3116,0]
-../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0041,U+0042,U+0043,U+0058,U+0032;[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|two@3116,0]
-../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0041,U+0042,U+0043,U+0058,U+0033;[X|B@598,0|C@1248,0|A@1880,0|X@2518,0|three@3116,0]
+../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0041,U+0042,U+0043,U+0058,U+0031;[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|one@3116,0]
+../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0041,U+0042,U+0043,U+0058,U+0032;[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|two@3116,0]
+../fonts/TestMORXTwelve.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0041,U+0042,U+0043,U+0058,U+0033;[X|B@598,0|C@1248,0|A@1880,0|X@2518,0|three@3116,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-13.tests b/test/shape/data/text-rendering-tests/tests/MORX-13.tests
index 3273b5738..ca2bcea5f 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-13.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-13.tests
@@ -1 +1 @@
-../fonts/TestMORXThirteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
+../fonts/TestMORXThirteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-14.tests b/test/shape/data/text-rendering-tests/tests/MORX-14.tests
index 9526005ff..38d632091 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-14.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-14.tests
@@ -1,2 +1,2 @@
-../fonts/TestMORXFourteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
+../fonts/TestMORXFourteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
 ../fonts/TestMORXFourteen.ttf;;U+0041,U+0042,U+0042,U+0042,U+0043,U+0043,U+0043,U+0044,U+0044,U+0044,U+0042,U+0043,U+0044,U+0043,U+0045;*
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-16.tests b/test/shape/data/text-rendering-tests/tests/MORX-16.tests
index a87e84b90..746909d16 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-16.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-16.tests
@@ -1 +1 @@
-../fonts/TestMORXSixteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
+../fonts/TestMORXSixteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[B|C@626,0|D@1222,0|E@1896,0|A@2452,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-17.tests b/test/shape/data/text-rendering-tests/tests/MORX-17.tests
index 066137f37..39556f506 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-17.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-17.tests
@@ -1 +1 @@
-../fonts/TestMORXSeventeen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[B|A@626,0]
+../fonts/TestMORXSeventeen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[B|A@626,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-18.tests b/test/shape/data/text-rendering-tests/tests/MORX-18.tests
index c0654394f..2eef50938 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-18.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-18.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B.alt@639,0|C@1639,0|D.alt1@2235,0|E@3235,0]
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0042,U+0042,U+0044,U+0045;[A|B@639,0|B@1265,0|B.alt@1891,0|D.alt1@2891,0|E@3891,0]
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0044,U+0045;[A|B.alt@639,0|D.alt1@1639,0|E@2639,0]
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0045;[A|B@639,0|E@1265,0]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B.alt@639,0|C@1639,0|D.alt1@2235,0|E@3235,0]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0042,U+0042,U+0044,U+0045;[A|B@639,0|B@1265,0|B.alt@1891,0|D.alt1@2891,0|E@3891,0]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0044,U+0045;[A|B.alt@639,0|D.alt1@1639,0|E@2639,0]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0045;[A|B@639,0|E@1265,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-19.tests b/test/shape/data/text-rendering-tests/tests/MORX-19.tests
index ccc03ac1d..e88e6f3e4 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-19.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-19.tests
@@ -1,2 +1,2 @@
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0043,U+0044,U+0045;[A.alt|C@1000,0|D.alt1@1596,0|E@2596,0]
-../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0044;[D.alt]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0043,U+0044,U+0045;[A.alt|C@1000,0|D.alt1@1596,0|E@2596,0]
+../fonts/TestMORXEighteen.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0044;[D.alt]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-2.tests b/test/shape/data/text-rendering-tests/tests/MORX-2.tests
index a1ff1848c..29fb7b770 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-2.tests
@@ -1,16 +1,16 @@
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24FF;[O|O@418,0|O@836,0|A@1254,0|B@2084,0|X@2914,0|Y@3744,0|Z@4574,0|C@5404,0|D@6234,0|O@7064,0|O@7482,0|O@7900,0|zero@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+278A;[O|O@418,0|O@836,0|B@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|D@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+278B;[O|O@418,0|O@836,0|D@1254,0|A@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|C@6234,0|O@7064,0|O@7482,0|O@7900,0|two@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0033;[O|O@418,0|O@836,0|D@1254,0|B@2084,0|X@2914,0|Y@3744,0|Z@4574,0|C@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|three@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0034;[O|O@418,0|O@836,0|X@1254,0|Y@2084,0|Z@2914,0|C@3744,0|D@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|four@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0035;[O|O@418,0|O@836,0|X@1254,0|Y@2084,0|Z@2914,0|C@3744,0|D@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|five@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0036;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|A@2914,0|B@3744,0|X@4574,0|Y@5404,0|Z@6234,0|O@7064,0|O@7482,0|O@7900,0|six@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0037;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|A@2914,0|B@3744,0|X@4574,0|Y@5404,0|Z@6234,0|O@7064,0|O@7482,0|O@7900,0|seven@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0038;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|eight@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0039;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|nine@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+2793;[O|O@418,0|O@836,0|D@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_zero@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EB;[O|O@418,0|O@836,0|D@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_one@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EC;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|X@2914,0|Y@3744,0|Z@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_two@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24ED;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|X@2914,0|Y@3744,0|Z@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_three@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EE;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|X@2914,0|Y@3744,0|Z@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_four@8318,0]
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EF;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|X@2914,0|Y@3744,0|Z@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_five@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24FF;[O|O@418,0|O@836,0|A@1254,0|B@2084,0|X@2914,0|Y@3744,0|Z@4574,0|C@5404,0|D@6234,0|O@7064,0|O@7482,0|O@7900,0|zero@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+278A;[O|O@418,0|O@836,0|B@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|D@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+278B;[O|O@418,0|O@836,0|D@1254,0|A@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|C@6234,0|O@7064,0|O@7482,0|O@7900,0|two@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0033;[O|O@418,0|O@836,0|D@1254,0|B@2084,0|X@2914,0|Y@3744,0|Z@4574,0|C@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|three@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0034;[O|O@418,0|O@836,0|X@1254,0|Y@2084,0|Z@2914,0|C@3744,0|D@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|four@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0035;[O|O@418,0|O@836,0|X@1254,0|Y@2084,0|Z@2914,0|C@3744,0|D@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|five@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0036;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|A@2914,0|B@3744,0|X@4574,0|Y@5404,0|Z@6234,0|O@7064,0|O@7482,0|O@7900,0|six@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0037;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|A@2914,0|B@3744,0|X@4574,0|Y@5404,0|Z@6234,0|O@7064,0|O@7482,0|O@7900,0|seven@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0038;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|eight@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+0039;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|B@2914,0|X@3744,0|Y@4574,0|Z@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|nine@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+2793;[O|O@418,0|O@836,0|D@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_zero@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EB;[O|O@418,0|O@836,0|D@1254,0|X@2084,0|Y@2914,0|Z@3744,0|C@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_one@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EC;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|X@2914,0|Y@3744,0|Z@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_two@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24ED;[O|O@418,0|O@836,0|C@1254,0|D@2084,0|X@2914,0|Y@3744,0|Z@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_three@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EE;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|X@2914,0|Y@3744,0|Z@4574,0|A@5404,0|B@6234,0|O@7064,0|O@7482,0|O@7900,0|one_four@8318,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0058,U+0059,U+005A,U+0043,U+0044,U+004F,U+004F,U+004F,U+24EF;[O|O@418,0|O@836,0|D@1254,0|C@2084,0|X@2914,0|Y@3744,0|Z@4574,0|B@5404,0|A@6234,0|O@7064,0|O@7482,0|O@7900,0|one_five@8318,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-20.tests b/test/shape/data/text-rendering-tests/tests/MORX-20.tests
index 1f599a18c..824702587 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-20.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-20.tests
@@ -1,7 +1,7 @@
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B@639,0|C.alt@1265,0|D@2265,0|E.alt1@2939,0]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043;[A|B@639,0|C.alt@1265,0]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0045;[A|B.alt@639,0|E.alt1@1639,0]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045;[A.alt|E.alt1@1000,0]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0045,U+0045;[E|E@556,0]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[A.alt]
-../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0045;[E]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B@639,0|C.alt@1265,0|D@2265,0|E.alt1@2939,0]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043;[A|B@639,0|C.alt@1265,0]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0045;[A|B.alt@639,0|E.alt1@1639,0]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045;[A.alt|E.alt1@1000,0]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0045,U+0045;[E|E@556,0]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[A.alt]
+../fonts/TestMORXTwenty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0045;[E]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-21.tests b/test/shape/data/text-rendering-tests/tests/MORX-21.tests
index 0014de72e..b7db3cb24 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-21.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-21.tests
@@ -1 +1 @@
-../fonts/TestMORXTwentyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B.alt@639,0|C@1639,0|D@2235,0|E@2909,0]
+../fonts/TestMORXTwentyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[A|B.alt@639,0|C@1639,0|D@2235,0|E@2909,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-22.tests b/test/shape/data/text-rendering-tests/tests/MORX-22.tests
index 76136d682..fca7baeee 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-22.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-22.tests
@@ -1 +1 @@
-../fonts/TestMORXTwentytwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[C]
+../fonts/TestMORXTwentytwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[C]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-23.tests b/test/shape/data/text-rendering-tests/tests/MORX-23.tests
index 3ae018f94..08f01e038 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-23.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-23.tests
@@ -1 +1 @@
-../fonts/TestMORXTwentythree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[E|E@556,0|E@1112,0|E@1668,0|E@2224,0]
+../fonts/TestMORXTwentythree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[E|E@556,0|E@1112,0|E@1668,0|E@2224,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-25.tests b/test/shape/data/text-rendering-tests/tests/MORX-25.tests
index cec3be44e..aad4c2caf 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-25.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-25.tests
@@ -1,9 +1,9 @@
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043,U+0044,U+0045;[A.alt|B.alt@1000,0|C.alt@2000,0|D.alt@3000,0|E.alt@4000,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0045,U+0042,U+0043,U+0044,U+0041;[E|B@556,0|C@1182,0|D@1778,0|A@2452,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0043,U+0042,U+0041,U+0042,U+0043;[C|B@596,0|A.alt@1222,0|B.alt@2222,0|C.alt@3222,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0043;[A.alt|B.alt@1000,0|C.alt@2000,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0043,U+0042,U+0041;[C|B@596,0|A@1222,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A.alt|B.alt@1000,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041;[B|A@626,0]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[A]
-../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[B]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043,U+0044,U+0045;[A.alt|B.alt@1000,0|C.alt@2000,0|D.alt@3000,0|E.alt@4000,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0045,U+0042,U+0043,U+0044,U+0041;[E|B@556,0|C@1182,0|D@1778,0|A@2452,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0043,U+0042,U+0041,U+0042,U+0043;[C|B@596,0|A.alt@1222,0|B.alt@2222,0|C.alt@3222,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0043;[A.alt|B.alt@1000,0|C.alt@2000,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0043,U+0042,U+0041;[C|B@596,0|A@1222,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A.alt|B.alt@1000,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041;[B|A@626,0]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[A]
+../fonts/TestMORXTwentyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[B]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-26.tests b/test/shape/data/text-rendering-tests/tests/MORX-26.tests
index 18683e9de..3a5f48e54 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-26.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-26.tests
@@ -1,2 +1,2 @@
-../fonts/TestMORXTwentysix.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A|B@639,0]
-../fonts/TestMORXTwentysix.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[B.alt]
+../fonts/TestMORXTwentysix.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A|B@639,0]
+../fonts/TestMORXTwentysix.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[B.alt]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-27.tests b/test/shape/data/text-rendering-tests/tests/MORX-27.tests
index b830f7553..9732b9c7c 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-27.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-27.tests
@@ -1,3 +1,3 @@
-../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045,U+0042;[A_E_B]
-../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045,U+0043;[A_E_C]
-../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045,U+0044;[A_E_D]
+../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045,U+0042;[A_E_B]
+../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045,U+0043;[A_E_C]
+../fonts/TestMORXTwentyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045,U+0044;[A_E_D]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-28.tests b/test/shape/data/text-rendering-tests/tests/MORX-28.tests
index 19d930c24..2d57adb3b 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-28.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-28.tests
@@ -1,5 +1,5 @@
-../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045,U+0044;[A_E_D]
-../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0078,U+0045,U+0044;[A_E_D|x@1394,0]
-../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0045,U+0079,U+0044;[A_E_D|y@1394,0]
-../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0078,U+0045,U+0079,U+0044;[A_E_D|x@1394,0|y@1923,0]
-../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0078,U+0078,U+0078,U+0045,U+0079,U+0079,U+0079,U+0044;[A_E_D|x@1394,0|x@1923,0|x@2452,0|y@2981,0|y@3491,0|y@4001,0]
+../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045,U+0044;[A_E_D]
+../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0078,U+0045,U+0044;[A_E_D|x@1394,0]
+../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0045,U+0079,U+0044;[A_E_D|y@1394,0]
+../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0078,U+0045,U+0079,U+0044;[A_E_D|x@1394,0|y@1923,0]
+../fonts/TestMORXTwentyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0078,U+0078,U+0078,U+0045,U+0079,U+0079,U+0079,U+0044;[A_E_D|x@1394,0|x@1923,0|x@2452,0|y@2981,0|y@3491,0|y@4001,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-29.tests b/test/shape/data/text-rendering-tests/tests/MORX-29.tests
index 7ef9112a6..20a6a4956 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-29.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-29.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|I@4268,0|N@5098,0|S@5928,0|M@6758,0|Y@7588,0|Y@7920,0|A@8252,0|Z@9082,0|Z@9404,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|I@5098,0|N@5928,0|S@6758,0|Y@7588,0|Y@7920,0|B@8252,0|Z@9082,0|Z@9404,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0043,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|I@5762,0|N@6592,0|S@7422,0|C@8252,0|Z@9082,0|Z@9404,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0044,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|D@5762,0|I@6592,0|N@7422,0|S@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|I@4268,0|N@5098,0|S@5928,0|M@6758,0|Y@7588,0|Y@7920,0|A@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|I@5098,0|N@5928,0|S@6758,0|Y@7588,0|Y@7920,0|B@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0043,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|I@5762,0|N@6592,0|S@7422,0|C@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0044,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|D@5762,0|I@6592,0|N@7422,0|S@8252,0|Z@9082,0|Z@9404,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-3.tests b/test/shape/data/text-rendering-tests/tests/MORX-3.tests
index cbb8c1577..332f65137 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-3.tests
@@ -1,16 +1,16 @@
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0030;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|zero@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0031;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0032;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|two@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0033;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|three@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0034;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|four@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0035;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|five@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0036;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|six@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0037;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|seven@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0038;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|eight@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+0039;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|nine@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+2793;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_zero@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EB;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_one@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EC;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_two@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+24ED;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_three@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EE;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_four@1793,0]
-../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EF;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_five@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0030;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|zero@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0031;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0032;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|two@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0033;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|three@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0034;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|four@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0035;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|five@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0036;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|six@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0037;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|seven@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0038;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|eight@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+0039;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|nine@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+2793;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_zero@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EB;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_one@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EC;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_two@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+24ED;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_three@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EE;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_four@1793,0]
+../fonts/TestMORXThree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0043,U+0044,U+24EF;[A|B@363,0|X@722,0|C@1086,0|D@1402,0|one_five@1793,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-30.tests b/test/shape/data/text-rendering-tests/tests/MORX-30.tests
index aa0f3a734..d271aa6c9 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-30.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-30.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|I@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|I@2710,0|N@3540,0|S@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|M@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
-../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|I@2710,0|N@3540,0|S@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|I@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|I@2710,0|N@3540,0|S@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|M@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A;[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|I@2710,0|N@3540,0|S@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-31.tests b/test/shape/data/text-rendering-tests/tests/MORX-31.tests
index e6a30147a..abdfd04e4 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-31.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-31.tests
@@ -1,8 +1,8 @@
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A;[I|N@830,0|I@1660,0|N@2490,0|S@3320,0|S@4150,0|X@4980,0|X@5344,0|A@5708,0|Y@6538,0|Y@6870,0|A@7202,0|Z@8032,0|Z@8354,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+0059,U+0059;[I|N@830,0|S@1660,0|I@2490,0|N@3320,0|S@4150,0|X@4980,0|X@5344,0|A@5708,0|Y@6538,0|Y@6870,0|B@7202,0|Y@8032,0|Y@8364,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A;[X|I@364,0|I@1194,0|N@2024,0|S@2854,0|N@3684,0|S@4514,0|X@5344,0|B@5708,0|Y@6538,0|Y@6870,0|A@7202,0|Z@8032,0|Z@8354,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A;[X|I@364,0|N@1194,0|I@2024,0|N@2854,0|S@3684,0|S@4514,0|X@5344,0|B@5708,0|Y@6538,0|Y@6870,0|B@7202,0|Z@8032,0|Z@8354,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0041;[I|N@830,0|S@1660,0|M@2490,0|I@3320,0|N@4150,0|S@4980,0|P@5810,0|Q@6143,0|R@6509,0|A@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0042;[I|N@830,0|S@1660,0|M@2490,0|P@3320,0|I@3653,0|N@4483,0|S@5313,0|Q@6143,0|R@6509,0|A@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0041;[M|I@830,0|N@1660,0|S@2490,0|I@3320,0|N@4150,0|S@4980,0|P@5810,0|Q@6143,0|R@6509,0|B@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
-../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0042;[M|I@830,0|N@1660,0|S@2490,0|P@3320,0|I@3653,0|N@4483,0|S@5313,0|Q@6143,0|R@6509,0|B@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A;[I|N@830,0|I@1660,0|N@2490,0|S@3320,0|S@4150,0|X@4980,0|X@5344,0|A@5708,0|Y@6538,0|Y@6870,0|A@7202,0|Z@8032,0|Z@8354,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+0059,U+0059;[I|N@830,0|S@1660,0|I@2490,0|N@3320,0|S@4150,0|X@4980,0|X@5344,0|A@5708,0|Y@6538,0|Y@6870,0|B@7202,0|Y@8032,0|Y@8364,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A;[X|I@364,0|I@1194,0|N@2024,0|S@2854,0|N@3684,0|S@4514,0|X@5344,0|B@5708,0|Y@6538,0|Y@6870,0|A@7202,0|Z@8032,0|Z@8354,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A;[X|I@364,0|N@1194,0|I@2024,0|N@2854,0|S@3684,0|S@4514,0|X@5344,0|B@5708,0|Y@6538,0|Y@6870,0|B@7202,0|Z@8032,0|Z@8354,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0041;[I|N@830,0|S@1660,0|M@2490,0|I@3320,0|N@4150,0|S@4980,0|P@5810,0|Q@6143,0|R@6509,0|A@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0042;[I|N@830,0|S@1660,0|M@2490,0|P@3320,0|I@3653,0|N@4483,0|S@5313,0|Q@6143,0|R@6509,0|A@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0041;[M|I@830,0|N@1660,0|S@2490,0|I@3320,0|N@4150,0|S@4980,0|P@5810,0|Q@6143,0|R@6509,0|B@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
+../fonts/TestMORXThirtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0042;[M|I@830,0|N@1660,0|S@2490,0|P@3320,0|I@3653,0|N@4483,0|S@5313,0|Q@6143,0|R@6509,0|B@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-32.tests b/test/shape/data/text-rendering-tests/tests/MORX-32.tests
index 441913510..055f0869d 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-32.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-32.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[I|N@830,0|S@1660,0|A@2490,0]
-../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0041,U+0059;[I|N@830,0|S@1660,0|X@2490,0|A@2854,0|Y@3684,0]
-../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[B|I@830,0|N@1660,0|S@2490,0]
-../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0042,U+0059;[X|I@364,0|N@1194,0|S@2024,0|B@2854,0|Y@3684,0]
+../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[I|N@830,0|S@1660,0|A@2490,0]
+../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0041,U+0059;[I|N@830,0|S@1660,0|X@2490,0|A@2854,0|Y@3684,0]
+../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[B|I@830,0|N@1660,0|S@2490,0]
+../fonts/TestMORXThirtytwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0042,U+0059;[X|I@364,0|N@1194,0|S@2024,0|B@2854,0|Y@3684,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-33.tests b/test/shape/data/text-rendering-tests/tests/MORX-33.tests
index ddff193a3..0a96853bb 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-33.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-33.tests
@@ -1,3 +1,3 @@
-../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0068,U+0061;[h|a@618,0|h@1179,0|a@1797,0]
-../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0068,U+0061,U+0068,U+0061;[h|a@618,0|h@1179,0|a@1797,0|h@2358,0|a@2976,0|h@3537,0|a@4155,0]
-../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0061,U+0068;[a|h@561,0]
+../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0068,U+0061;[h|a@618,0|h@1179,0|a@1797,0]
+../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0068,U+0061,U+0068,U+0061;[h|a@618,0|h@1179,0|a@1797,0|h@2358,0|a@2976,0|h@3537,0|a@4155,0]
+../fonts/TestMORXThirtythree.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0061,U+0068;[a|h@561,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-35.tests b/test/shape/data/text-rendering-tests/tests/MORX-35.tests
index f804943c1..afb7ef13e 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-35.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-35.tests
@@ -1,2 +1,2 @@
-../fonts/TestMORXThirtyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[A|B@639,0|C@1265,0|E@1861,0]
-../fonts/TestMORXThirtyfive.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0058,U+0041,U+0059;[X|A@586,0|B@1225,0|C@1851,0|E@2447,0|Y@3003,0]
+../fonts/TestMORXThirtyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[A|B@639,0|C@1265,0|E@1861,0]
+../fonts/TestMORXThirtyfive.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0058,U+0041,U+0059;[X|A@586,0|B@1225,0|C@1851,0|E@2447,0|Y@3003,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-37.tests b/test/shape/data/text-rendering-tests/tests/MORX-37.tests
index 1105e1cfe..1f8e0fe7f 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-37.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-37.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A.alt|B.alt@1000,0]
-../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041;[B|A@650,0]
-../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D0,U+05D1;[uni05D1|uni05D0@542,0]
-../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D1,U+05D0;[uni05D0.alt|uni05D1.alt@1000,0]
+../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A.alt|B.alt@1000,0]
+../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041;[B|A@650,0]
+../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D0,U+05D1;[uni05D1|uni05D0@542,0]
+../fonts/TestMORXThirtyseven.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D1,U+05D0;[uni05D0.alt|uni05D1.alt@1000,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-38.tests b/test/shape/data/text-rendering-tests/tests/MORX-38.tests
index c2cd14710..55fe3c8d4 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-38.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-38.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A.alt|B.alt@1000,0]
-../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041;[B|A@650,0]
-../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D0,U+05D1;[uni05D1.alt|uni05D0.alt@1000,0]
-../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D1,U+05D0;[uni05D0|uni05D1@606,0]
+../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A.alt|B.alt@1000,0]
+../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041;[B|A@650,0]
+../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D0,U+05D1;[uni05D1.alt|uni05D0.alt@1000,0]
+../fonts/TestMORXThirtyeight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D1,U+05D0;[uni05D0|uni05D1@606,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-39.tests b/test/shape/data/text-rendering-tests/tests/MORX-39.tests
index 1eaba46d7..3a43b3a31 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-39.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-39.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A|B@639,0]
-../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041;[B.alt|A.alt@1000,0]
-../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D0,U+05D1;[uni05D1.alt|uni05D0.alt@1000,0]
-../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D1,U+05D0;[uni05D0|uni05D1@606,0]
+../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A|B@639,0]
+../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041;[B.alt|A.alt@1000,0]
+../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D0,U+05D1;[uni05D1.alt|uni05D0.alt@1000,0]
+../fonts/TestMORXThirtynine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D1,U+05D0;[uni05D0|uni05D1@606,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-4.tests b/test/shape/data/text-rendering-tests/tests/MORX-4.tests
index 12e0d9890..0f6abbed5 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-4.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-4.tests
@@ -1,15 +1,15 @@
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0031;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0032;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|two@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0044,U+0058,U+0059,U+005A,U+0033;[P|Q@333,0|R@699,0|D@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|three@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0034;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|four@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0035;[P|Q@333,0|R@699,0|B@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|five@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0036;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|six@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0037;[P|Q@333,0|R@699,0|B@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|seven@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0043,U+0044,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|eight@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0043,U+0044,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|nine@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0044,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|D@1050,0|A@1880,0|B@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_zero@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0044,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|D@1050,0|B@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_one@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|A@2710,0|B@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_two@5388,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|B@2710,0|A@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_three@5388,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|A@2710,0|B@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_four@5388,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|B@2710,0|A@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_five@5388,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0031;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0032;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|two@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0044,U+0058,U+0059,U+005A,U+0033;[P|Q@333,0|R@699,0|D@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|three@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0034;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|four@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0035;[P|Q@333,0|R@699,0|B@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|five@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0036;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|six@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0037;[P|Q@333,0|R@699,0|B@1050,0|A@1880,0|X@2710,0|Y@3074,0|Z@3406,0|seven@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0043,U+0044,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|eight@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0043,U+0044,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|nine@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0044,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|D@1050,0|A@1880,0|B@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_zero@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0044,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|D@1050,0|B@1880,0|A@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_one@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|A@2710,0|B@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_two@5388,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|C@1050,0|D@1880,0|B@2710,0|A@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_three@5388,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|A@2710,0|B@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_four@5388,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0044,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|D@1050,0|C@1880,0|B@2710,0|A@3540,0|X@4370,0|Y@4734,0|Z@5066,0|one_five@5388,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-40.tests b/test/shape/data/text-rendering-tests/tests/MORX-40.tests
index a25fafd6d..c3f8335ea 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-40.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-40.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042;[A|B@639,0]
-../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042,U+0041;[B.alt|A.alt@1000,0]
-../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D0,U+05D1;[uni05D1|uni05D0@542,0]
-../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+05D1,U+05D0;[uni05D0.alt|uni05D1.alt@1000,0]
+../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042;[A|B@639,0]
+../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042,U+0041;[B.alt|A.alt@1000,0]
+../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D0,U+05D1;[uni05D1|uni05D0@542,0]
+../fonts/TestMORXForty.ttf;--font-size=1000 --ned --remove-default-ignorables;U+05D1,U+05D0;[uni05D0.alt|uni05D1.alt@1000,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-41.tests b/test/shape/data/text-rendering-tests/tests/MORX-41.tests
index 2e75e715f..40aef2391 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-41.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-41.tests
@@ -1,4 +1,4 @@
-../fonts/TestMORXFourtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0061,U+0063;[a_c]
-../fonts/TestMORXFourtyone.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0062,U+0063;[b_c]
+../fonts/TestMORXFourtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0061,U+0063;[a_c]
+../fonts/TestMORXFourtyone.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0062,U+0063;[b_c]
 ../fonts/TestMORXFourtyone.ttf;;U+0063,U+0063;*
 ../fonts/TestMORXFourtyone.ttf;;U+0061,U+0062,U+0063,U+0063;*
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-5.tests b/test/shape/data/text-rendering-tests/tests/MORX-5.tests
index f46172fa8..5fa20895b 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-5.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-5.tests
@@ -1,25 +1,25 @@
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0033;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|three@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0034;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|four@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0035;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|five@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0036;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|six@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0037;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|seven@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|eight@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|eight@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|nine@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|nine@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_zero@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_zero@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_one@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_one@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_two@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_two@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_two@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_three@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_three@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_three@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_four@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_four@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_four@4558,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_five@2898,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_five@3728,0]
-../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_five@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0033;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|three@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0034;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|four@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0035;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|five@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0036;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|six@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0037;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|seven@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|eight@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0038;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|eight@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|nine@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0039;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|nine@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_zero@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+2793;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_zero@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_one@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EB;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_one@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_two@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_two@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EC;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_two@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_three@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_three@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24ED;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_three@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_four@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_four@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EE;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_four@4558,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_five@2898,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_five@3728,0]
+../fonts/TestMORXFour.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EF;[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_five@4558,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-6.tests b/test/shape/data/text-rendering-tests/tests/MORX-6.tests
index c5b18416a..ab7bbda87 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-6.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-6.tests
@@ -1 +1 @@
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+004F,U+004F,U+0041,U+0042,U+0043,U+0044,U+0045,U+0046,U+0047,U+004F,U+004F,U+004F,U+0033,U+0031,U+0034,U+0031;[O|O@418,0|O@836,0|E@1254,0|F@2084,0|A@2914,0|G@3744,0|B@4574,0|C@5404,0|D@6234,0|O@7064,0|O@7482,0|O@7900,0|three@8318,0|one@9168,0|four@10018,0|one@10868,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+004F,U+004F,U+0041,U+0042,U+0043,U+0044,U+0045,U+0046,U+0047,U+004F,U+004F,U+004F,U+0033,U+0031,U+0034,U+0031;[O|O@418,0|O@836,0|E@1254,0|F@2084,0|A@2914,0|G@3744,0|B@4574,0|C@5404,0|D@6234,0|O@7064,0|O@7482,0|O@7900,0|three@8318,0|one@9168,0|four@10018,0|one@10868,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-7.tests b/test/shape/data/text-rendering-tests/tests/MORX-7.tests
index 05e6bdca7..3d755c30f 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-7.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-7.tests
@@ -1 +1 @@
-../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+004F,U+0042,U+0043,U+0044,U+0031;[B|C@830,0|D@1660,0|O@2490,0|one@2908,0]
+../fonts/TestMORXTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+004F,U+0042,U+0043,U+0044,U+0031;[B|C@830,0|D@1660,0|O@2490,0|one@2908,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-8.tests b/test/shape/data/text-rendering-tests/tests/MORX-8.tests
index 68323c504..a98aefe30 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-8.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-8.tests
@@ -1,3 +1,3 @@
-../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0030,U+0041,U+0042,U+0043;[zero|A@914,0|B@1552,0|C@2202,0]
-../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0031,U+0041,U+0042,U+0043;[one|B@914,0|C@1564,0|A@2196,0]
-../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0032,U+0041,U+0042,U+0043;[two|C@914,0|A@1546,0|B@2184,0]
+../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0030,U+0041,U+0042,U+0043;[zero|A@914,0|B@1552,0|C@2202,0]
+../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0031,U+0041,U+0042,U+0043;[one|B@914,0|C@1564,0|A@2196,0]
+../fonts/TestMORXEight.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0032,U+0041,U+0042,U+0043;[two|C@914,0|A@1546,0|B@2184,0]
diff --git a/test/shape/data/text-rendering-tests/tests/MORX-9.tests b/test/shape/data/text-rendering-tests/tests/MORX-9.tests
index 1eed22bd5..7c94e2560 100644
--- a/test/shape/data/text-rendering-tests/tests/MORX-9.tests
+++ b/test/shape/data/text-rendering-tests/tests/MORX-9.tests
@@ -1 +1 @@
-../fonts/TestMORXNine.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041,U+0042,U+0058,U+0041,U+0042;[B|A@650,0|X@1288,0|A@1874,0|B@2512,0]
+../fonts/TestMORXNine.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041,U+0042,U+0058,U+0041,U+0042;[B|A@650,0|X@1288,0|A@1874,0|B@2512,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SFNT-1.tests b/test/shape/data/text-rendering-tests/tests/SFNT-1.tests
index b069cf63c..dae40f338 100644
--- a/test/shape/data/text-rendering-tests/tests/SFNT-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/SFNT-1.tests
@@ -1,2 +1,2 @@
-../fonts/TestSFNTOne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[A]
-../fonts/TestSFNTOne.otf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[B]
+../fonts/TestSFNTOne.otf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[A]
+../fonts/TestSFNTOne.otf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[B]
diff --git a/test/shape/data/text-rendering-tests/tests/SFNT-2.tests b/test/shape/data/text-rendering-tests/tests/SFNT-2.tests
index 28efff1fe..490e787c9 100644
--- a/test/shape/data/text-rendering-tests/tests/SFNT-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/SFNT-2.tests
@@ -1,2 +1,2 @@
-../fonts/TestSFNTTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0041;[A]
-../fonts/TestSFNTTwo.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0042;[B]
+../fonts/TestSFNTTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0041;[A]
+../fonts/TestSFNTTwo.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0042;[B]
diff --git a/test/shape/data/text-rendering-tests/tests/SHARAN-1.tests b/test/shape/data/text-rendering-tests/tests/SHARAN-1.tests
index 9dcf59d14..03f55741a 100644
--- a/test/shape/data/text-rendering-tests/tests/SHARAN-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHARAN-1.tests
@@ -1,6 +1,6 @@
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0644,U+0633,U+0627,U+0646;[OneDotEnclNS@398,-1|NoonxSep|AlefFin@861,0|SeenMed.inT2outT1@1125,0|sp0@1664,0|LamIni.outT2@1664,223]
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+06CC,U+0648,U+0646,U+06CC,U+06A9,U+0648,U+0688;[TahSmallNS@118,-213|DalSep|WawFin.cut@300,0|KafMed.outT3@573,206|TwoDotsBelowNS@1115,220|BehxMed.inT2outT1@903,304|OneDotAboveNS@1271,-71|sp1@1170,0|BehxIni.outT2@1170,449|WawFin.inD2@1387,0|TwoDotsBelowNS@1867,1|sp0@1758,0|BehxIni.outD2WQ@1758,323]
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0641,U+0648,U+0646,U+0679;[TahSmallNS@595,-331|BehxFin.soft|OneDotAboveNS@1163,-182|sp0@1184,0|BehxIni.outT2B@1184,300|WawFin.inD2alt@1340,0|OneDotAboveNS@1784,108|sp0@1599,0|FehxIni.outD2WQ@1599,237]
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0679,U+0627,U+0626,U+067E,U+0020,U+0641,U+06CC,U+0633;[SeenFin|TwoDotsBelowNS@1216,269|BehxMed.inT1outT2SeenWide@1041,455|OneDotAboveNS@1454,224|sp0@1271,0|FehxIni@1271,490|space@1584,0|ThreeDotsDownBelowNS@2290,-159|BehxFin.soft@1715,0|HamzaAboveNS@2878,-201|sp0@2899,0|BehxIni.outT2B@2899,300|AlefFin.narrow@3056,0|TahSmallNS@3442,-420|sp0@3295,0|BehxIni.A@3295,0]
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0641,U+0646,U+0020,U+062E,U+0637,U+0627,U+0637,U+06CC;[YehxFin|sp0@521,0|TahIni.outD2@521,380|AlefFin@1119,0|TahMed.inD1outT1@1382,0|OneDotAboveNS@2081,-47|sp0@1451,0|HahIni.outD1@1451,36|space@2326,0|OneDotEnclNS@2855,-2|NoonxFin@2458,0|OneDotAboveNS@3361,188|sp0@3208,0|FehxIni.outT2N@3208,336]
-../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0646,U+0633,U+062A,U+0639,U+0644,U+06CC,U+0642;[TwoDotsAboveNS@519,-199|QafxFin.cut|TwoDotsBelowNS@977,141|BehxMed.inT2outD2WQ@692,272|LamMed.outT2@1023,434|AinMed.inT3outT1@1301,507|TwoDotsAboveNS@1785,209|BehxMed.inT2outT3@1563,603|SeenMed.inT2outT2@1865,735|OneDotAboveNS@2574,670|sp0@2434,0|BehxIni.outT2tall@2434,952]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0644,U+0633,U+0627,U+0646;[OneDotEnclNS@398,-1|NoonxSep|AlefFin@861,0|SeenMed.inT2outT1@1125,0|sp0@1664,0|LamIni.outT2@1664,223]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+06CC,U+0648,U+0646,U+06CC,U+06A9,U+0648,U+0688;[TahSmallNS@118,-213|DalSep|WawFin.cut@300,0|KafMed.outT3@573,206|TwoDotsBelowNS@1115,220|BehxMed.inT2outT1@903,304|OneDotAboveNS@1271,-71|sp1@1170,0|BehxIni.outT2@1170,449|WawFin.inD2@1387,0|TwoDotsBelowNS@1867,1|sp0@1758,0|BehxIni.outD2WQ@1758,323]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0641,U+0648,U+0646,U+0679;[TahSmallNS@595,-331|BehxFin.soft|OneDotAboveNS@1163,-182|sp0@1184,0|BehxIni.outT2B@1184,300|WawFin.inD2alt@1340,0|OneDotAboveNS@1784,108|sp0@1599,0|FehxIni.outD2WQ@1599,237]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0679,U+0627,U+0626,U+067E,U+0020,U+0641,U+06CC,U+0633;[SeenFin|TwoDotsBelowNS@1216,269|BehxMed.inT1outT2SeenWide@1041,455|OneDotAboveNS@1454,224|sp0@1271,0|FehxIni@1271,490|space@1584,0|ThreeDotsDownBelowNS@2290,-159|BehxFin.soft@1715,0|HamzaAboveNS@2878,-201|sp0@2899,0|BehxIni.outT2B@2899,300|AlefFin.narrow@3056,0|TahSmallNS@3442,-420|sp0@3295,0|BehxIni.A@3295,0]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0641,U+0646,U+0020,U+062E,U+0637,U+0627,U+0637,U+06CC;[YehxFin|sp0@521,0|TahIni.outD2@521,380|AlefFin@1119,0|TahMed.inD1outT1@1382,0|OneDotAboveNS@2081,-47|sp0@1451,0|HahIni.outD1@1451,36|space@2326,0|OneDotEnclNS@2855,-2|NoonxFin@2458,0|OneDotAboveNS@3361,188|sp0@3208,0|FehxIni.outT2N@3208,336]
+../fonts/TestShapeAran.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0646,U+0633,U+062A,U+0639,U+0644,U+06CC,U+0642;[TwoDotsAboveNS@519,-199|QafxFin.cut|TwoDotsBelowNS@977,141|BehxMed.inT2outD2WQ@692,272|LamMed.outT2@1023,434|AinMed.inT3outT1@1301,507|TwoDotsAboveNS@1785,209|BehxMed.inT2outT3@1563,603|SeenMed.inT2outT2@1865,735|OneDotAboveNS@2574,670|sp0@2434,0|BehxIni.outT2tall@2434,952]
diff --git a/test/shape/data/text-rendering-tests/tests/SHBALI-1.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-1.tests
index 388d44059..580bc48d5 100644
--- a/test/shape/data/text-rendering-tests/tests/SHBALI-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHBALI-1.tests
@@ -1,22 +1,22 @@
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B38,U+1B00;[gid23|gid60@1113,0|gid4@1064,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B15,U+1B44,U+1B16,U+1B02;[gid25|gid132@1092,0|gid6@942,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B18,U+1B3B;[gid28|gid62@796,0|gid57@794,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B19,U+1B40;[gid66|gid29@483,0|gid57@1536,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B1A,U+1B3F;[gid67|gid30@483,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B14,U+1B36;[gid24|gid58@828,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B13,U+1B01;[gid23|gid129@1111,0|gid5@1064,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B1B,U+1B01;[gid23|gid137@1111,0|gid5@1379,181]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B26,U+1B03;[gid23|gid148@1111,0|gid7@991,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B13,U+1B38;[gid23|gid129@1111,0|gid60@1111,-488]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B13,U+1B3C;[gid23|gid129@1111,0|gid70@1128,0|gid170@1113,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B13,U+1B3D;[gid23|gid129@1111,0|gid70@1128,0|gid170@1113,0|gid57@1111,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B3E;[gid66|gid23@483,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B36,U+1B3E;[gid23|gid58@1064,0|gid66@1111,0|gid128@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B38,U+1B3E;[gid23|gid60@1113,0|gid66@1111,0|gid128@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B15,U+1B3E;[gid66|gid23@483,0|gid131@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B40;[gid66|gid23@483,0|gid57@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B3E;[gid66|gid23@483,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B3E,U+1B36;[gid66|gid23@483,0|gid58@1548,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B3E,U+1B38;[gid66|gid23@483,0|gid60@1597,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B15,U+1B3E;[gid66|gid23@483,0|gid131@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B40;[gid66|gid23@483,0|gid57@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B38,U+1B00;[gid23|gid60@1113,0|gid4@1064,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B15,U+1B44,U+1B16,U+1B02;[gid25|gid132@1092,0|gid6@942,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B18,U+1B3B;[gid28|gid62@796,0|gid57@794,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B19,U+1B40;[gid66|gid29@483,0|gid57@1536,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B1A,U+1B3F;[gid67|gid30@483,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B14,U+1B36;[gid24|gid58@828,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B13,U+1B01;[gid23|gid129@1111,0|gid5@1064,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B1B,U+1B01;[gid23|gid137@1111,0|gid5@1379,181]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B26,U+1B03;[gid23|gid148@1111,0|gid7@991,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B13,U+1B38;[gid23|gid129@1111,0|gid60@1111,-488]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B13,U+1B3C;[gid23|gid129@1111,0|gid70@1128,0|gid170@1113,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B13,U+1B3D;[gid23|gid129@1111,0|gid70@1128,0|gid170@1113,0|gid57@1111,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B3E;[gid66|gid23@483,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B36,U+1B3E;[gid23|gid58@1064,0|gid66@1111,0|gid128@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B38,U+1B3E;[gid23|gid60@1113,0|gid66@1111,0|gid128@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B15,U+1B3E;[gid66|gid23@483,0|gid131@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B40;[gid66|gid23@483,0|gid57@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B3E;[gid66|gid23@483,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B3E,U+1B36;[gid66|gid23@483,0|gid58@1548,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B3E,U+1B38;[gid66|gid23@483,0|gid60@1597,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B15,U+1B3E;[gid66|gid23@483,0|gid131@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B40;[gid66|gid23@483,0|gid57@1594,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHBALI-2.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-2.tests
index dbde07d7e..cd71059b7 100644
--- a/test/shape/data/text-rendering-tests/tests/SHBALI-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHBALI-2.tests
@@ -1,12 +1,12 @@
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B27,U+1B3E;[gid66|gid23@483,0|gid149@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B28,U+1B3F;[gid67|gid23@483,0|gid150@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B31,U+1B3E;[gid66|gid23@483,0|gid159@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B32,U+1B3E;[gid66|gid23@483,0|gid60@1597,0|gid149@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B4A,U+1B3E;[gid66|gid23@483,0|gid60@1597,0|gid165@1594,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B1B,U+1B44,U+1B13;[gid181|gid129@1064,-195]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B1B,U+1B44,U+1B13,U+1B3E;[gid66|gid181@483,0|gid129@1548,-195]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B1B,U+1B44,U+1B13,U+1B38,U+1B00;[gid181|gid129@1064,-195|gid60@1064,-684|gid4@855,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B13,U+1B38;[gid23|gid129@1111,0|gid60@1111,-488]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B1B,U+1B39;[gid23|gid137@1111,0|gid61@1261,-488]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B31,U+1B3A;[gid23|gid159@1111,0|gid62@1753,0]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B13,U+1B44,U+1B45,U+1B38;[gid23|gid162@1111,0|gid60@1111,-488]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B27,U+1B3E;[gid66|gid23@483,0|gid149@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B28,U+1B3F;[gid67|gid23@483,0|gid150@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B31,U+1B3E;[gid66|gid23@483,0|gid159@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B32,U+1B3E;[gid66|gid23@483,0|gid60@1597,0|gid149@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B4A,U+1B3E;[gid66|gid23@483,0|gid60@1597,0|gid165@1594,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B1B,U+1B44,U+1B13;[gid181|gid129@1064,-195]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B1B,U+1B44,U+1B13,U+1B3E;[gid66|gid181@483,0|gid129@1548,-195]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B1B,U+1B44,U+1B13,U+1B38,U+1B00;[gid181|gid129@1064,-195|gid60@1064,-684|gid4@855,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B13,U+1B38;[gid23|gid129@1111,0|gid60@1111,-488]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B1B,U+1B39;[gid23|gid137@1111,0|gid61@1261,-488]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B31,U+1B3A;[gid23|gid159@1111,0|gid62@1753,0]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B13,U+1B44,U+1B45,U+1B38;[gid23|gid162@1111,0|gid60@1111,-488]
diff --git a/test/shape/data/text-rendering-tests/tests/SHBALI-3.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-3.tests
index 2e73dca40..3223d2bc4 100644
--- a/test/shape/data/text-rendering-tests/tests/SHBALI-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHBALI-3.tests
@@ -1,9 +1,9 @@
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B6B;[gid102|gid107@560,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B6C;[gid102|gid108@573,49]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B6D;[gid102|gid109@652,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B6E;[gid102|gid110@652,-98]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B6F;[gid102|gid111@667,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B70;[gid102|gid112@667,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B71;[gid102|gid113@667,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B72;[gid102|gid114@667,-10]
-../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1B66,U+1B73;[gid102|gid115@599,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B6B;[gid102|gid107@560,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B6C;[gid102|gid108@573,49]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B6D;[gid102|gid109@652,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B6E;[gid102|gid110@652,-98]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B6F;[gid102|gid111@667,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B70;[gid102|gid112@667,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B71;[gid102|gid113@667,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B72;[gid102|gid114@667,-10]
+../fonts/NotoSansBalinese-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1B66,U+1B73;[gid102|gid115@599,-10]
diff --git a/test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests
index cb8dc859b..a1b6d4931 100644
--- a/test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests
@@ -1,34 +1,34 @@
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB2,U+0CCD,U+0CB2,U+0CBF;[knLI|knLAc2@757,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9F,U+0CCD,U+0CB8,U+0CCD;[knTT|knSAc2@1021,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB3,U+0CBF;[knLLI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA1,U+0CBF;[knDDI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAE,U+0CC6;[knME]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB0,U+0CBF;[knRI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C96,U+0CCD,U+0CAF,U+0CC6;[knKHE|knYAc2@846,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAB,U+0CCD,U+0CB0,U+0CBF;[knPHI|knRAc2@735,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CC6;[knNE]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C97,U+0CBF;[knGI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB7,U+0CCD,U+0C9F,U+0CBF;[knSSI|knTTAc2@746,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAF,U+0CBF,U+0C82;[knYI|knAnusvara@1252,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9A,U+0CC0;[knCI|knLengthmark@766,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CBF;[knNI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C97,U+0CCD,U+0CB2,U+0CBF;[knGI|knLAc2@621,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB7,U+0CBF;[knSSI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C97,U+0CC6;[knGE]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA6,U+0CCD,U+0CB5,U+0CBF;[knDI|knVAc2@740,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA4,U+0CC0;[knTI|knLengthmark@613,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAE,U+0CBF;[knMI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB2,U+0CBF;[knLI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C97,U+0CBF;[knGI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CCD;[knN]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAC,U+0CBF;[knBI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB2,U+0CBF;[knLI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CCD,U+0CA8,U+0CBF,U+0C82;[knNI|knNAc2@678,0|knAnusvara@755,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB2,U+0CCD,U+0CB2,U+0CBF;[knLI|knLAc2@757,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA7,U+0CBF;[knDHI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAA,U+0CCC;[knPA.base|knmAU@739,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB5,U+0CBF,U+0C82;[knVI|knAnusvara@749,0]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA1,U+0CBF;[knDDI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9F,U+0CBF;[knTTI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CBF;[knNI]
-../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA7,U+0CBF;[knDHI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB2,U+0CCD,U+0CB2,U+0CBF;[knLI|knLAc2@757,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9F,U+0CCD,U+0CB8,U+0CCD;[knTT|knSAc2@1021,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB3,U+0CBF;[knLLI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA1,U+0CBF;[knDDI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAE,U+0CC6;[knME]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB0,U+0CBF;[knRI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C96,U+0CCD,U+0CAF,U+0CC6;[knKHE|knYAc2@846,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAB,U+0CCD,U+0CB0,U+0CBF;[knPHI|knRAc2@735,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CC6;[knNE]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C97,U+0CBF;[knGI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB7,U+0CCD,U+0C9F,U+0CBF;[knSSI|knTTAc2@746,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAF,U+0CBF,U+0C82;[knYI|knAnusvara@1252,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9A,U+0CC0;[knCI|knLengthmark@766,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CBF;[knNI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C97,U+0CCD,U+0CB2,U+0CBF;[knGI|knLAc2@621,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB7,U+0CBF;[knSSI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C97,U+0CC6;[knGE]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA6,U+0CCD,U+0CB5,U+0CBF;[knDI|knVAc2@740,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA4,U+0CC0;[knTI|knLengthmark@613,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAE,U+0CBF;[knMI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB2,U+0CBF;[knLI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C97,U+0CBF;[knGI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CCD;[knN]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAC,U+0CBF;[knBI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB2,U+0CBF;[knLI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CCD,U+0CA8,U+0CBF,U+0C82;[knNI|knNAc2@678,0|knAnusvara@755,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB2,U+0CCD,U+0CB2,U+0CBF;[knLI|knLAc2@757,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA7,U+0CBF;[knDHI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAA,U+0CCC;[knPA.base|knmAU@739,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB5,U+0CBF,U+0C82;[knVI|knAnusvara@749,0]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA1,U+0CBF;[knDDI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9F,U+0CBF;[knTTI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CBF;[knNI]
+../fonts/NotoSerifKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA7,U+0CBF;[knDHI]
diff --git a/test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests
index c78a08296..58d6e539d 100644
--- a/test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests
@@ -1,16 +1,16 @@
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CCD,U+0CA8,U+0CBE;[gid150|gid57@711,0|gid116@1160,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CCD,U+0CA8,U+0CBE;[gid150|gid57@711,0|gid116@1160,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA4,U+0CCD,U+0CA4,U+0CBE;[gid146|gid57@623,0|gid112@1071,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9F,U+0CCD,U+0C9F,U+0CBE;[gid141|gid57@815,0|gid107@1264,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA1,U+0CCB,U+0C82,U+0C97,U+0CBF;[gid249|gid61@768,0|gid71@1513,0|gid4@1925,0|gid207@2475,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9C,U+0CBF,U+0CBC,U+0CD5,U+0CAC,U+0CC6,U+0CA8,U+0CCD;[gid211|gid55@652,0|gid71@776,0|gid259@1188,0|gid186@1994,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9C,U+0CBE,U+0CBC,U+0C95,U+0CBF,U+0CB0,U+0CCD;[gid139|gid57@776,0|gid55@652,0|gid205@1225,0|gid193@1799,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C87,U+0CA8,U+0CCD,U+0CAB,U+0CCD,U+0CB2,U+0CC6,U+0C95,U+0CCD,U+0CB7,U+0CA8,U+0CB2,U+0CCD;[gid8|gid256@711,0|gid118@1422,0|gid335@1591,0|gid282@1978,0|gid39@2552,0|gid195@3263,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C87,U+0CA8,U+0CCD,U+0CAB,U+0CCD,U+0CB2,U+0CC6,U+0C95,U+0CCD,U+0CB7,U+0CA8,U+0CCD;[gid8|gid256@711,0|gid118@1422,0|gid335@1591,0|gid282@1978,0|gid186@2552,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA6,U+0C9F,U+0CCD,U+0CB8,U+0CCD;[gid37|gid177@765,0|gid130@1814,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C8E,U+0C95,U+0CCD,U+0CB8,U+0CCD;[gid14|gid167@787,0|gid130@1596,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAE,U+0CBE,U+0CB0,U+0CCD,U+0C9A,U+0CCD;[gid155|gid57@1156,0|gid172@1605,0|gid94@2718,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9F,U+0CC6,U+0C95,U+0CCD,U+0CB8,U+0CCD,U+0C9F,U+0CCD;[gid247|gid167@815,0|gid130@1624,0|gid317@1792,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAC,U+0CC1,U+0C95,U+0CCD,U+0CB8,U+0CCD;[gid42|gid60@801,0|gid167@1165,0|gid130@1974,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB8,U+0CBE,U+0CAB,U+0CCD,U+0C9F,U+0CCD;[gid163|gid57@709,0|gid188@1158,0|gid107@2184,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9C,U+0CB8,U+0CCD,U+0C9F,U+0CCD;[gid27|gid200@776,0|gid107@1720,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CCD,U+0CA8,U+0CBE;[gid150|gid57@711,0|gid116@1160,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CCD,U+0CA8,U+0CBE;[gid150|gid57@711,0|gid116@1160,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA4,U+0CCD,U+0CA4,U+0CBE;[gid146|gid57@623,0|gid112@1071,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9F,U+0CCD,U+0C9F,U+0CBE;[gid141|gid57@815,0|gid107@1264,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA1,U+0CCB,U+0C82,U+0C97,U+0CBF;[gid249|gid61@768,0|gid71@1513,0|gid4@1925,0|gid207@2475,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9C,U+0CBF,U+0CBC,U+0CD5,U+0CAC,U+0CC6,U+0CA8,U+0CCD;[gid211|gid55@652,0|gid71@776,0|gid259@1188,0|gid186@1994,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9C,U+0CBE,U+0CBC,U+0C95,U+0CBF,U+0CB0,U+0CCD;[gid139|gid57@776,0|gid55@652,0|gid205@1225,0|gid193@1799,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C87,U+0CA8,U+0CCD,U+0CAB,U+0CCD,U+0CB2,U+0CC6,U+0C95,U+0CCD,U+0CB7,U+0CA8,U+0CB2,U+0CCD;[gid8|gid256@711,0|gid118@1422,0|gid335@1591,0|gid282@1978,0|gid39@2552,0|gid195@3263,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C87,U+0CA8,U+0CCD,U+0CAB,U+0CCD,U+0CB2,U+0CC6,U+0C95,U+0CCD,U+0CB7,U+0CA8,U+0CCD;[gid8|gid256@711,0|gid118@1422,0|gid335@1591,0|gid282@1978,0|gid186@2552,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA6,U+0C9F,U+0CCD,U+0CB8,U+0CCD;[gid37|gid177@765,0|gid130@1814,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C8E,U+0C95,U+0CCD,U+0CB8,U+0CCD;[gid14|gid167@787,0|gid130@1596,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAE,U+0CBE,U+0CB0,U+0CCD,U+0C9A,U+0CCD;[gid155|gid57@1156,0|gid172@1605,0|gid94@2718,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9F,U+0CC6,U+0C95,U+0CCD,U+0CB8,U+0CCD,U+0C9F,U+0CCD;[gid247|gid167@815,0|gid130@1624,0|gid317@1792,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAC,U+0CC1,U+0C95,U+0CCD,U+0CB8,U+0CCD;[gid42|gid60@801,0|gid167@1165,0|gid130@1974,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB8,U+0CBE,U+0CAB,U+0CCD,U+0C9F,U+0CCD;[gid163|gid57@709,0|gid188@1158,0|gid107@2184,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9C,U+0CB8,U+0CCD,U+0C9F,U+0CCD;[gid27|gid200@776,0|gid107@1720,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests
index c00713571..0f512eb0c 100644
--- a/test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests
@@ -1,31 +1,31 @@
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C95,U+0CCB,U+0C82;[gid239|gid61@574,0|gid71@1319,0|gid4@1731,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C96,U+0CCB,U+0C82;[gid240|gid61@865,0|gid71@1610,0|gid4@2022,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C97,U+0CCB,U+0C82;[gid241|gid61@648,0|gid71@1393,0|gid4@1805,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C98,U+0CCB,U+0C82;[gid242|gid279@997,0|gid71@1742,0|gid4@2153,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C99,U+0CCB,U+0C82;[gid24|gid67@737,0|gid71@1718,0|gid4@2130,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9A,U+0CCB,U+0C82;[gid243|gid61@795,0|gid71@1540,0|gid4@1952,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9B,U+0CCB,U+0C82;[gid244|gid61@843,0|gid71@1588,0|gid4@2000,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9C,U+0CCB,U+0C82;[gid245|gid61@776,0|gid71@1522,0|gid4@1933,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9D,U+0CCB,U+0C82;[gid246|gid61@1379,0|gid71@2124,0|gid4@2536,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9E,U+0CCB,U+0C82;[gid29|gid67@968,0|gid71@1949,0|gid4@2360,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C9F,U+0CCB,U+0C82;[gid247|gid61@815,0|gid71@1560,0|gid4@1972,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA0,U+0CCB,U+0C82;[gid248|gid61@651,0|gid71@1397,0|gid4@1808,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA1,U+0CCB,U+0C82;[gid249|gid61@768,0|gid71@1513,0|gid4@1925,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA2,U+0CCB,U+0C82;[gid250|gid61@768,0|gid71@1513,0|gid4@1925,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA3,U+0CCB,U+0C82;[gid251|gid61@867,0|gid71@1612,0|gid4@2023,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA4,U+0CCB,U+0C82;[gid252|gid61@623,0|gid71@1368,0|gid4@1779,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA5,U+0CCB,U+0C82;[gid253|gid61@765,0|gid71@1510,0|gid4@1921,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA6,U+0CCB,U+0C82;[gid254|gid61@765,0|gid71@1510,0|gid4@1921,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA7,U+0CCB,U+0C82,U+0020;[gid255|gid61@765,0|gid71@1510,0|gid4@1921,0|gid3@2472,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CA8,U+0CCB,U+0C82;[gid256|gid61@711,0|gid71@1456,0|gid4@1868,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAA,U+0CCB,U+0C82;[gid257|gid275@792,0|gid71@1434,0|gid4@1846,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAB,U+0CCB,U+0C82;[gid258|gid277@792,0|gid71@1434,0|gid4@1846,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAC,U+0CCB,U+0C82;[gid259|gid61@806,0|gid71@1551,0|gid4@1963,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAD,U+0CCB,U+0C82;[gid260|gid61@806,0|gid71@1551,0|gid4@1963,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAE,U+0CCB,U+0C82;[gid280|gid71@1539,0|gid4@1951,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CAF,U+0CCB,U+0C82;[gid281|gid71@1712,0|gid4@2124,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB0,U+0CCB,U+0C82;[gid263|gid61@651,0|gid71@1397,0|gid4@1808,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB1,U+0CCB,U+0C82;[gid47|gid67@831,0|gid71@1812,0|gid4@2223,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB2,U+0CCB,U+0C82;[gid264|gid61@769,0|gid71@1514,0|gid4@1925,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0CB5,U+0CCB,U+0C82;[gid266|gid275@794,0|gid71@1437,0|gid4@1848,0]
-../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+0C86,U+0CCD,U+0CAF,U+0C95,U+0CCD,U+0CB7,U+0CBF,U+0CB8,U+0CCD,U+200C;[gid7|gid122@838,0|gid285@1098,0|gid200@1672,0|gid3@2694,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C95,U+0CCB,U+0C82;[gid239|gid61@574,0|gid71@1319,0|gid4@1731,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C96,U+0CCB,U+0C82;[gid240|gid61@865,0|gid71@1610,0|gid4@2022,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C97,U+0CCB,U+0C82;[gid241|gid61@648,0|gid71@1393,0|gid4@1805,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C98,U+0CCB,U+0C82;[gid242|gid279@997,0|gid71@1742,0|gid4@2153,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C99,U+0CCB,U+0C82;[gid24|gid67@737,0|gid71@1718,0|gid4@2130,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9A,U+0CCB,U+0C82;[gid243|gid61@795,0|gid71@1540,0|gid4@1952,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9B,U+0CCB,U+0C82;[gid244|gid61@843,0|gid71@1588,0|gid4@2000,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9C,U+0CCB,U+0C82;[gid245|gid61@776,0|gid71@1522,0|gid4@1933,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9D,U+0CCB,U+0C82;[gid246|gid61@1379,0|gid71@2124,0|gid4@2536,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9E,U+0CCB,U+0C82;[gid29|gid67@968,0|gid71@1949,0|gid4@2360,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C9F,U+0CCB,U+0C82;[gid247|gid61@815,0|gid71@1560,0|gid4@1972,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA0,U+0CCB,U+0C82;[gid248|gid61@651,0|gid71@1397,0|gid4@1808,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA1,U+0CCB,U+0C82;[gid249|gid61@768,0|gid71@1513,0|gid4@1925,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA2,U+0CCB,U+0C82;[gid250|gid61@768,0|gid71@1513,0|gid4@1925,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA3,U+0CCB,U+0C82;[gid251|gid61@867,0|gid71@1612,0|gid4@2023,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA4,U+0CCB,U+0C82;[gid252|gid61@623,0|gid71@1368,0|gid4@1779,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA5,U+0CCB,U+0C82;[gid253|gid61@765,0|gid71@1510,0|gid4@1921,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA6,U+0CCB,U+0C82;[gid254|gid61@765,0|gid71@1510,0|gid4@1921,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA7,U+0CCB,U+0C82,U+0020;[gid255|gid61@765,0|gid71@1510,0|gid4@1921,0|gid3@2472,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CA8,U+0CCB,U+0C82;[gid256|gid61@711,0|gid71@1456,0|gid4@1868,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAA,U+0CCB,U+0C82;[gid257|gid275@792,0|gid71@1434,0|gid4@1846,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAB,U+0CCB,U+0C82;[gid258|gid277@792,0|gid71@1434,0|gid4@1846,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAC,U+0CCB,U+0C82;[gid259|gid61@806,0|gid71@1551,0|gid4@1963,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAD,U+0CCB,U+0C82;[gid260|gid61@806,0|gid71@1551,0|gid4@1963,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAE,U+0CCB,U+0C82;[gid280|gid71@1539,0|gid4@1951,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CAF,U+0CCB,U+0C82;[gid281|gid71@1712,0|gid4@2124,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB0,U+0CCB,U+0C82;[gid263|gid61@651,0|gid71@1397,0|gid4@1808,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB1,U+0CCB,U+0C82;[gid47|gid67@831,0|gid71@1812,0|gid4@2223,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB2,U+0CCB,U+0C82;[gid264|gid61@769,0|gid71@1514,0|gid4@1925,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0CB5,U+0CCB,U+0C82;[gid266|gid275@794,0|gid71@1437,0|gid4@1848,0]
+../fonts/NotoSansKannada-Regular.ttf;--font-size=1000 --ned --remove-default-ignorables;U+0C86,U+0CCD,U+0CAF,U+0C95,U+0CCD,U+0CB7,U+0CBF,U+0CB8,U+0CCD,U+200C;[gid7|gid122@838,0|gid285@1098,0|gid200@1672,0|gid3@2694,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-1.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-1.tests
index 3c16c1f66..de17641cd 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-1.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-1.tests
@@ -1,52 +1,52 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6B;[uni1A20|uni1A6B@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A74;[uni1A23|uni1A74@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A27,U+1A62;[uni1A27|uni1A62@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A60,U+1A45,U+1A6B,U+1A61;[uni1A32|uni1A601A45@762,0|uni1A6B@762,0|uni1A61@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A60,U+1A45,U+1A6B;[uni1A37|uni1A601A45@592,0|uni1A6B@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A60,U+1A45;[uni1A20|uni1A601A45@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A21,U+1A6C,U+1A74;[uni1A21|uni1A6C@592,-98|uni1A74@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6C;[uni1A20|uni1A6C.wide@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A26,U+1A61;[uni1A26|uni1A61@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A63;[uni1A20|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A64;[uni1A34|uni1A64@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4C,U+1A63,U+1A74;[uni1A4C|uni1A74@762,0|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A64,U+1A74;[uni1A23|uni1A74@592,0|uni1A64@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A33,U+1A65;[uni1A33|uni1A65@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3A,U+1A66,U+0020;[uni1A3A|uni1A66@738,0|space@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A29,U+1A67;[uni1A29|uni1A67@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A68;[uni1A3E.v2|uni1A68@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A35,U+1A69;[uni1A35|uni1A69@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A26,U+1A6A;[uni1A26|uni1A6A@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A6E,U+1A61;[uni1A6E|uni1A32@592,0|uni1A61@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3D,U+1A6E;[uni1A6E|uni1A3D@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A24,U+1A6F,U+1A61;[uni1A6F|uni1A24@1096,0|uni1A61@1688,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A27,U+1A6F;[uni1A6F|uni1A27@1096,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A38,U+1A6E,U+1A6C,U+1A65,U+1A61;[uni1A6E|uni1A38@592,0|uni1A6C@1184,0|uni1A65@1098,0|uni1A61@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A6E,U+1A6C,U+1A65;[uni1A6E|uni1A36@592,0|uni1A6C@1184,0|uni1A65@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A6C,U+1A68,U+1A61;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0|uni1A61@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A6C,U+1A68;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A6E,U+1A62,U+1A63;[uni1A6E|uni1A41@592,0|uni1A62@1184,0|uni1A63@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A73;[uni1A3E.v2|uni1A73@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A63;[uni1A6E|uni1A20@592,0|uni1A63@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A39,U+1A60,U+1A3F,U+1A6E,U+1A61;[uni1A6E|uni1A39@592,0|uni1A601A3F@1324,0|uni1A61@1551,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A60,U+1A3F,U+1A6E;[uni1A6E|uni1A3B@592,0|uni1A601A3F@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A60,U+1A3F;[uni1A20|uni1A601A3F@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A6E,U+1A6C,U+1A65,U+1A4B,U+1A61;[uni1A6E|uni1A3E.v2@592,0|uni1A6C@1184,0|uni1A65@1184,0|uni1A4B@1324,0|uni1A61@1916,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A56,U+1A6E,U+1A6C,U+1A65,U+1A4B;[uni1A6E|uni1A20@592,0|uni1A56.wide@1524,0|uni1A6C.wide@1524,-547|uni1A65@1524,0|uni1A4B@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A70,U+1A61;[uni1A70|uni1A48@592,0|uni1A61@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A70;[uni1A70|uni1A3E.v2@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2A,U+1A70,U+1A6C,U+1A61;[uni1A70|uni1A2A@592,0|uni1A6C@1184,0|uni1A61@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A29,U+1A62,U+1A60,U+1A3F;[uni1A29|uni1A62@592,0|uni1A601A3F@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A72;[uni1A72|uni1A36@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A22,U+1A71;[uni1A71|uni1A22@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A71,U+1A60,U+1A3F;[uni1A71|uni1A34@592,0|uni1A601A3F@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A6C,U+1A68,U+1A61;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0|uni1A61@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A6C,U+1A68;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A70,U+1A62;[uni1A70|uni1A20@592,0|uni1A62@1354,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A58;[uni1A48|uni1A58@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A62,U+1A60,U+1A26;[uni1A34|uni1A62@592,0|uni1A601A26@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4C,U+1A65,U+1A74,U+0020;[uni1A4C|uni1A65@762,0|uni1A74@1211,0|space@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A65,U+1A60,U+1A26;[uni1A20|uni1A65@762,0|uni1A601A26@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A62,U+1A60,U+1A3E;[uni1A20|uni1A62@762,0|uni1A601A3E@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A62,U+1A3E;[uni1A20|uni1A62@762,0|uni1A3E.v2@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A6D;[uni1A2F|uni1A6D@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6B;[uni1A20|uni1A6B@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A74;[uni1A23|uni1A74@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A27,U+1A62;[uni1A27|uni1A62@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A60,U+1A45,U+1A6B,U+1A61;[uni1A32|uni1A601A45@762,0|uni1A6B@762,0|uni1A61@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A60,U+1A45,U+1A6B;[uni1A37|uni1A601A45@592,0|uni1A6B@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A60,U+1A45;[uni1A20|uni1A601A45@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A21,U+1A6C,U+1A74;[uni1A21|uni1A6C@592,-98|uni1A74@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6C;[uni1A20|uni1A6C.wide@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A26,U+1A61;[uni1A26|uni1A61@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A63;[uni1A20|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A64;[uni1A34|uni1A64@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4C,U+1A63,U+1A74;[uni1A4C|uni1A74@762,0|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A64,U+1A74;[uni1A23|uni1A74@592,0|uni1A64@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A33,U+1A65;[uni1A33|uni1A65@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3A,U+1A66,U+0020;[uni1A3A|uni1A66@738,0|space@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A29,U+1A67;[uni1A29|uni1A67@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A68;[uni1A3E.v2|uni1A68@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A35,U+1A69;[uni1A35|uni1A69@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A26,U+1A6A;[uni1A26|uni1A6A@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A6E,U+1A61;[uni1A6E|uni1A32@592,0|uni1A61@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3D,U+1A6E;[uni1A6E|uni1A3D@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A24,U+1A6F,U+1A61;[uni1A6F|uni1A24@1096,0|uni1A61@1688,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A27,U+1A6F;[uni1A6F|uni1A27@1096,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A38,U+1A6E,U+1A6C,U+1A65,U+1A61;[uni1A6E|uni1A38@592,0|uni1A6C@1184,0|uni1A65@1098,0|uni1A61@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A6E,U+1A6C,U+1A65;[uni1A6E|uni1A36@592,0|uni1A6C@1184,0|uni1A65@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A6C,U+1A68,U+1A61;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0|uni1A61@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A6C,U+1A68;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A6E,U+1A62,U+1A63;[uni1A6E|uni1A41@592,0|uni1A62@1184,0|uni1A63@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A73;[uni1A3E.v2|uni1A73@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A63;[uni1A6E|uni1A20@592,0|uni1A63@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A39,U+1A60,U+1A3F,U+1A6E,U+1A61;[uni1A6E|uni1A39@592,0|uni1A601A3F@1324,0|uni1A61@1551,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A60,U+1A3F,U+1A6E;[uni1A6E|uni1A3B@592,0|uni1A601A3F@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A60,U+1A3F;[uni1A20|uni1A601A3F@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A6E,U+1A6C,U+1A65,U+1A4B,U+1A61;[uni1A6E|uni1A3E.v2@592,0|uni1A6C@1184,0|uni1A65@1184,0|uni1A4B@1324,0|uni1A61@1916,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A56,U+1A6E,U+1A6C,U+1A65,U+1A4B;[uni1A6E|uni1A20@592,0|uni1A56.wide@1524,0|uni1A6C.wide@1524,-547|uni1A65@1524,0|uni1A4B@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A70,U+1A61;[uni1A70|uni1A48@592,0|uni1A61@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A70;[uni1A70|uni1A3E.v2@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2A,U+1A70,U+1A6C,U+1A61;[uni1A70|uni1A2A@592,0|uni1A6C@1184,0|uni1A61@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A29,U+1A62,U+1A60,U+1A3F;[uni1A29|uni1A62@592,0|uni1A601A3F@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A72;[uni1A72|uni1A36@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A22,U+1A71;[uni1A71|uni1A22@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A71,U+1A60,U+1A3F;[uni1A71|uni1A34@592,0|uni1A601A3F@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A6C,U+1A68,U+1A61;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0|uni1A61@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A6C,U+1A68;[uni1A6E|uni1A20@592,0|uni1A6C.wide@1524,0|uni1A68@1354,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A70,U+1A62;[uni1A70|uni1A20@592,0|uni1A62@1354,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A58;[uni1A48|uni1A58@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A62,U+1A60,U+1A26;[uni1A34|uni1A62@592,0|uni1A601A26@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4C,U+1A65,U+1A74,U+0020;[uni1A4C|uni1A65@762,0|uni1A74@1211,0|space@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A65,U+1A60,U+1A26;[uni1A20|uni1A65@762,0|uni1A601A26@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A62,U+1A60,U+1A3E;[uni1A20|uni1A62@762,0|uni1A601A3E@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A62,U+1A3E;[uni1A20|uni1A62@762,0|uni1A3E.v2@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A6D;[uni1A2F|uni1A6D@592,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-10.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-10.tests
index 5e1484394..f6b3465cf 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-10.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-10.tests
@@ -1,47 +1,47 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A53,U+1A6F;[uni1A6F|uni1A53@1096,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A50,U+1A63;[uni1A50|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A50,U+1A75,U+1A63;[uni1A50|uni1A75@738,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A6A,U+1A55,U+1A63;[uni1A55|uni1A2F@227,0|uni1A6A@818,0|uni1A63@818,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A6E,U+1A6C,U+1A65,U+1A41,U+1A39,U+1A6B,U+1A56,U+1A23,U+1A69,U+1A31,U+1A7A;[uni1A6E|uni1A2F@592,0|uni1A6C@1184,-188|uni1A65@1184,0|uni1A41@1184,0|uni1A39@1775,0|uni1A6B@2367,0|uni1A56@2367,0|uni1A23@2508,0|uni1A69@3100,0|uni1A31@3100,0|uni1A7A@3861,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A63,U+1A37,U+1A70,U+1A56;[uni1A3B|uni1A63@933,0|uni1A70@1524,0|uni1A37@2116,0|uni1A56@2708,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A76,U+1A6D;[uni1A36|uni1A76@592,0|uni1A6D@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A39,U+1A65,U+1A56,U+1A69,U+1A75,U+1A7B;[uni1A39|uni1A65@592,0|uni1A56@592,0|uni1A69@592,-547|uni1A75@592,357|uni1A78@864,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A56,U+1A60,U+1A45,U+1A26;[uni1A49|uni1A56.wide@933,0|uni1A601A45@762,-547|uni1A26@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A56,U+1A60,U+1A45,U+1A63;[uni1A49|uni1A56.wide@933,0|uni1A601A45@762,-547|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A55,U+1A60,U+1A3F,U+1A6E,U+1A61;[uni1A6E|uni1A55@592,0|uni1A3B@818,0|uni1A601A3F@1751,0|uni1A61@1978,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A69,U+1A76,U+1A63,U+1A60,U+1A36,U+1A60,U+1A26;[uni1A20|uni1A69@762,0|uni1A76@762,0|uni1A63@933,0|uni1A601A36@1524,0|uni1A601A26@1524,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4B,U+1A62,U+1A60,U+1A2D,U+1A5B;[uni1A4B|uni1A62@592,0|uni1A601A2D1A5B@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A46,U+1A62,U+1A20,U+1A60,U+1A2F,U+1A65,U+1A7A;[uni1A46|uni1A62@592,0|uni1A20@681,0|uni1A601A2F@1442,0|uni1A65@1442,0|uni1A7A@1442,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A46,U+1A62,U+1A20,U+1A60,U+1A2F,U+1A65,U+1A7C;[uni1A46|uni1A62@592,0|uni1A20@681,0|uni1A601A2F@1442,0|uni1A65@1442,0|uni1A7C@1442,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A49,U+1A63,U+1A49,U+1A65,U+1A26,U+1A60,U+1A23,U+1A69,U+1A7A;[uni1A3E.v2|uni1A49@732,0|uni1A63@1665,0|uni1A49@2257,0|uni1A65@3019,0|uni1A26@3189,0|uni1A601A23@3781,0|uni1A69@3781,-547|uni1A7A@3781,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A49,U+1A63,U+1A49,U+1A65,U+1A26,U+1A60,U+1A23,U+1A69,U+1A7C;[uni1A3E.v2|uni1A49@732,0|uni1A63@1665,0|uni1A49@2257,0|uni1A65@3019,0|uni1A26@3189,0|uni1A601A23@3781,0|uni1A69@3781,-547|uni1A7C@3781,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A46,U+1A63,U+1A48,U+1A60,U+1A32,U+1A55,U+1A7A;[uni1A46|uni1A63@681,0|uni1A55@1272,0|uni1A48@1499,0|uni1A601A32@2091,0|uni1A7A@2091,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A63,U+1A48,U+1A60,U+1A32,U+1A55,U+1A7C;[uni1A48|uni1A63@592,0|uni1A55@1184,0|uni1A48@1410,0|uni1A601A32@2002,0|uni1A7C@2002,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A6A,U+1A60,U+1A37;[uni1A41|uni1A601A37@592,0|uni1A6A@725,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A66,U+1A75,U+1A60,U+1A36,U+1A6C,U+1A76,U+1A26;[uni1A3B|uni1A66@762,0|uni1A75@762,357|uni1A601A36@762,0|uni1A6C@762,-367|uni1A76@1087,357|uni1A26@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A38,U+1A62,U+1A63;[uni1A38|uni1A62@506,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A43,U+1A6A,U+1A62;[uni1A43|uni1A6A@762,0|uni1A62@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A6C,U+1A62;[uni1A2F|uni1A6C@592,-188|uni1A62@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A6C,U+1A62,U+1A61;[uni1A2F|uni1A6C@592,-188|uni1A62@592,0|uni1A61@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A60,U+1A45,U+1A62,U+1A61;[uni1A3B|uni1A601A45@762,0|uni1A62@762,0|uni1A61@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A6F,U+1A60,U+1A36,U+1A6C,U+1A74,U+1A75;[uni1A6F|uni1A32@1096,0|uni1A601A36@1857,0|uni1A6C@1857,-367|uni1A74@1857,0|uni1A75@1857,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A6C,U+1A74,U+1A75,U+034F,U+1A6F,U+1A60,U+1A36;[uni1A6F|uni1A32@1096,0|uni1A6C.wide@2028,0|uni1A74@2028,0|uni1A75@2028,357|uni1A601A36@1857,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A6C,U+1A74,U+1A75,U+1A6F,U+1A60,U+1A36;[uni1A6F|uni1A32@1096,0|uni1A6C.wide@2028,0|uni1A74@2028,0|uni1A75@2028,357|uni1A601A36@1857,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A60,U+1A36,U+1A6B,U+1A7B;[uni1A48|uni1A601A36@592,0|uni1A6B@592,0|uni1A78@592,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A3E,U+1A5B,U+1A66;[uni1A20|uni1A3E1A5B@933,0|uni1A66@1549,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A65,U+1A3B,U+1A5B,U+1A63,U+1A60,U+1A36;[uni1A36|uni1A65@592,0|uni1A3B1A5B@592,0|uni1A63@1524,0|uni1A601A36@2116,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A35,U+1A3E,U+1A5C,U+1A65,U+1A20;[uni1A35|uni1A3E.v2@592,0|uni1A5C@1184,0|uni1A65@1184,0|uni1A20@1324,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A35,U+1A69,U+1A60,U+1A37;[uni1A48|uni1A35@592,0|uni1A601A37@1184,0|uni1A69@1317,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A65,U+1A48,U+1A6E,U+1A60,U+1A48;[uni1A45|uni1A65@592,0|uni1A6E@592,0|uni1A48@1184,0|uni1A601A48@1775,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A22,U+1A76,U+1A63;[uni1A22|uni1A76@738,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A63,U+1A48,U+1A36,U+1A63;[uni1A48|uni1A63@592,0|uni1A48@1184,0|uni1A361A63@1775,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A63,U+1A48,U+1A60,U+1A36,U+1A7B,U+1A63;[uni1A48|uni1A63@592,0|uni1A48@1184,0|uni1A601A36@1775,0|uni1A78@1775,0|uni1A63@1775,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A60,U+1A36,U+1A7B,U+1A6E,U+1A62,U+1A76,U+1A63;[uni1A6E|uni1A48@592,0|uni1A601A36@1184,0|uni1A78@1184,0|uni1A621A76@1599,0|uni1A63@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A60,U+1A36,U+1A7B,U+1A6E,U+1A62,U+1A62,U+1A76,U+1A63;[uni1A6E|uni1A48@592,0|uni1A601A36@1184,0|uni1A78@1184,0|uni1A621A621A76@1599,0|uni1A63@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A66,U+034F,U+1A63,U+1A60,U+1A3F;[uni1A32|uni1A66@762,0|uni1A63@933,0|uni1A601A3F@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A75,U+1A63,U+1A74,U+1A7B;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A78@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A43,U+1A6E,U+1A5E;[uni1A6E|uni1A43@592,0|uni1A5E@1354,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4B,U+1A36,U+1A63,U+1A33,U+1A37,U+1A65,U+1A31,U+1A60,U+1A2F,U+1A65,U+1A20,U+1A48,U+1A5E;[uni1A4B|uni1A361A63@592,0|uni1A33@1184,0|uni1A37@1775,0|uni1A65@2367,0|uni1A31@2367,0|uni1A601A2F@3129,0|uni1A65@3129,0|uni1A20@3300,0|uni1A48@4232,0|uni1A5E@4824,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A63,U+1A74,U+1A7B;[uni1A2F|uni1A74@592,0|uni1A63@592,0|uni1A78@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A74,U+1A75,U+1A63,U+1A7B;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A78@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A74,U+1A63,U+1A7B;[uni1A2F|uni1A74@592,0|uni1A63@592,0|uni1A78@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A53,U+1A6F;[uni1A6F|uni1A53@1096,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A50,U+1A63;[uni1A50|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A50,U+1A75,U+1A63;[uni1A50|uni1A75@738,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A6A,U+1A55,U+1A63;[uni1A55|uni1A2F@227,0|uni1A6A@818,0|uni1A63@818,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A6E,U+1A6C,U+1A65,U+1A41,U+1A39,U+1A6B,U+1A56,U+1A23,U+1A69,U+1A31,U+1A7A;[uni1A6E|uni1A2F@592,0|uni1A6C@1184,-188|uni1A65@1184,0|uni1A41@1184,0|uni1A39@1775,0|uni1A6B@2367,0|uni1A56@2367,0|uni1A23@2508,0|uni1A69@3100,0|uni1A31@3100,0|uni1A7A@3861,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A63,U+1A37,U+1A70,U+1A56;[uni1A3B|uni1A63@933,0|uni1A70@1524,0|uni1A37@2116,0|uni1A56@2708,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A76,U+1A6D;[uni1A36|uni1A76@592,0|uni1A6D@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A39,U+1A65,U+1A56,U+1A69,U+1A75,U+1A7B;[uni1A39|uni1A65@592,0|uni1A56@592,0|uni1A69@592,-547|uni1A75@592,357|uni1A78@864,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A56,U+1A60,U+1A45,U+1A26;[uni1A49|uni1A56.wide@933,0|uni1A601A45@762,-547|uni1A26@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A56,U+1A60,U+1A45,U+1A63;[uni1A49|uni1A56.wide@933,0|uni1A601A45@762,-547|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A55,U+1A60,U+1A3F,U+1A6E,U+1A61;[uni1A6E|uni1A55@592,0|uni1A3B@818,0|uni1A601A3F@1751,0|uni1A61@1978,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A69,U+1A76,U+1A63,U+1A60,U+1A36,U+1A60,U+1A26;[uni1A20|uni1A69@762,0|uni1A76@762,0|uni1A63@933,0|uni1A601A36@1524,0|uni1A601A26@1524,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4B,U+1A62,U+1A60,U+1A2D,U+1A5B;[uni1A4B|uni1A62@592,0|uni1A601A2D1A5B@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A46,U+1A62,U+1A20,U+1A60,U+1A2F,U+1A65,U+1A7A;[uni1A46|uni1A62@592,0|uni1A20@681,0|uni1A601A2F@1442,0|uni1A65@1442,0|uni1A7A@1442,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A46,U+1A62,U+1A20,U+1A60,U+1A2F,U+1A65,U+1A7C;[uni1A46|uni1A62@592,0|uni1A20@681,0|uni1A601A2F@1442,0|uni1A65@1442,0|uni1A7C@1442,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A49,U+1A63,U+1A49,U+1A65,U+1A26,U+1A60,U+1A23,U+1A69,U+1A7A;[uni1A3E.v2|uni1A49@732,0|uni1A63@1665,0|uni1A49@2257,0|uni1A65@3019,0|uni1A26@3189,0|uni1A601A23@3781,0|uni1A69@3781,-547|uni1A7A@3781,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A49,U+1A63,U+1A49,U+1A65,U+1A26,U+1A60,U+1A23,U+1A69,U+1A7C;[uni1A3E.v2|uni1A49@732,0|uni1A63@1665,0|uni1A49@2257,0|uni1A65@3019,0|uni1A26@3189,0|uni1A601A23@3781,0|uni1A69@3781,-547|uni1A7C@3781,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A46,U+1A63,U+1A48,U+1A60,U+1A32,U+1A55,U+1A7A;[uni1A46|uni1A63@681,0|uni1A55@1272,0|uni1A48@1499,0|uni1A601A32@2091,0|uni1A7A@2091,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A63,U+1A48,U+1A60,U+1A32,U+1A55,U+1A7C;[uni1A48|uni1A63@592,0|uni1A55@1184,0|uni1A48@1410,0|uni1A601A32@2002,0|uni1A7C@2002,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A6A,U+1A60,U+1A37;[uni1A41|uni1A601A37@592,0|uni1A6A@725,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A66,U+1A75,U+1A60,U+1A36,U+1A6C,U+1A76,U+1A26;[uni1A3B|uni1A66@762,0|uni1A75@762,357|uni1A601A36@762,0|uni1A6C@762,-367|uni1A76@1087,357|uni1A26@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A38,U+1A62,U+1A63;[uni1A38|uni1A62@506,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A43,U+1A6A,U+1A62;[uni1A43|uni1A6A@762,0|uni1A62@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A6C,U+1A62;[uni1A2F|uni1A6C@592,-188|uni1A62@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A6C,U+1A62,U+1A61;[uni1A2F|uni1A6C@592,-188|uni1A62@592,0|uni1A61@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A60,U+1A45,U+1A62,U+1A61;[uni1A3B|uni1A601A45@762,0|uni1A62@762,0|uni1A61@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A6F,U+1A60,U+1A36,U+1A6C,U+1A74,U+1A75;[uni1A6F|uni1A32@1096,0|uni1A601A36@1857,0|uni1A6C@1857,-367|uni1A74@1857,0|uni1A75@1857,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A6C,U+1A74,U+1A75,U+034F,U+1A6F,U+1A60,U+1A36;[uni1A6F|uni1A32@1096,0|uni1A6C.wide@2028,0|uni1A74@2028,0|uni1A75@2028,357|uni1A601A36@1857,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A6C,U+1A74,U+1A75,U+1A6F,U+1A60,U+1A36;[uni1A6F|uni1A32@1096,0|uni1A6C.wide@2028,0|uni1A74@2028,0|uni1A75@2028,357|uni1A601A36@1857,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A60,U+1A36,U+1A6B,U+1A7B;[uni1A48|uni1A601A36@592,0|uni1A6B@592,0|uni1A78@592,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A3E,U+1A5B,U+1A66;[uni1A20|uni1A3E1A5B@933,0|uni1A66@1549,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A65,U+1A3B,U+1A5B,U+1A63,U+1A60,U+1A36;[uni1A36|uni1A65@592,0|uni1A3B1A5B@592,0|uni1A63@1524,0|uni1A601A36@2116,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A35,U+1A3E,U+1A5C,U+1A65,U+1A20;[uni1A35|uni1A3E.v2@592,0|uni1A5C@1184,0|uni1A65@1184,0|uni1A20@1324,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A35,U+1A69,U+1A60,U+1A37;[uni1A48|uni1A35@592,0|uni1A601A37@1184,0|uni1A69@1317,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A65,U+1A48,U+1A6E,U+1A60,U+1A48;[uni1A45|uni1A65@592,0|uni1A6E@592,0|uni1A48@1184,0|uni1A601A48@1775,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A22,U+1A76,U+1A63;[uni1A22|uni1A76@738,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A63,U+1A48,U+1A36,U+1A63;[uni1A48|uni1A63@592,0|uni1A48@1184,0|uni1A361A63@1775,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A63,U+1A48,U+1A60,U+1A36,U+1A7B,U+1A63;[uni1A48|uni1A63@592,0|uni1A48@1184,0|uni1A601A36@1775,0|uni1A78@1775,0|uni1A63@1775,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A60,U+1A36,U+1A7B,U+1A6E,U+1A62,U+1A76,U+1A63;[uni1A6E|uni1A48@592,0|uni1A601A36@1184,0|uni1A78@1184,0|uni1A621A76@1599,0|uni1A63@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A60,U+1A36,U+1A7B,U+1A6E,U+1A62,U+1A62,U+1A76,U+1A63;[uni1A6E|uni1A48@592,0|uni1A601A36@1184,0|uni1A78@1184,0|uni1A621A621A76@1599,0|uni1A63@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A66,U+034F,U+1A63,U+1A60,U+1A3F;[uni1A32|uni1A66@762,0|uni1A63@933,0|uni1A601A3F@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A75,U+1A63,U+1A74,U+1A7B;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A78@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A43,U+1A6E,U+1A5E;[uni1A6E|uni1A43@592,0|uni1A5E@1354,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4B,U+1A36,U+1A63,U+1A33,U+1A37,U+1A65,U+1A31,U+1A60,U+1A2F,U+1A65,U+1A20,U+1A48,U+1A5E;[uni1A4B|uni1A361A63@592,0|uni1A33@1184,0|uni1A37@1775,0|uni1A65@2367,0|uni1A31@2367,0|uni1A601A2F@3129,0|uni1A65@3129,0|uni1A20@3300,0|uni1A48@4232,0|uni1A5E@4824,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A63,U+1A74,U+1A7B;[uni1A2F|uni1A74@592,0|uni1A63@592,0|uni1A78@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A74,U+1A75,U+1A63,U+1A7B;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A78@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A74,U+1A63,U+1A7B;[uni1A2F|uni1A74@592,0|uni1A63@592,0|uni1A78@1184,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-2.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-2.tests
index 379fdac74..a48d61f3b 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-2.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-2.tests
@@ -1,37 +1,37 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A93,U+1A60,U+1A34;[uni1A93|uni1A601A34@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A75,U+1A63,U+1A60,U+1A26,U+1A7B;[uni1A32|uni1A75@762,0|uni1A63@933,0|uni1A601A26@1524,0|uni1A78@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A33,U+1A60,U+1A36,U+1A7B,U+1A6B,U+1A41;[uni1A33|uni1A601A36@592,0|uni1A78@592,0|uni1A6B@954,0|uni1A41@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A21,U+1A62,U+1A76,U+1A7B,U+1A6C,U+1A26;[uni1A21|uni1A621A76@592,0|uni1A78@1007,0|uni1A6C@592,-98|uni1A26@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1AAD,U+1A63;[uni1AAD|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A36,U+1A66;[uni1A49|uni1A601A36@762,0|uni1A66@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A24,U+1A60,U+1A45,U+1A6F,U+1A76,U+1A41;[uni1A6F|uni1A24@1096,0|uni1A601A45@1688,0|uni1A76@1688,0|uni1A41@1688,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A45,U+1A6B;[uni1A49|uni1A601A45@762,0|uni1A6B@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A62,U+1A75,U+1A26,U+1A60,U+1A36,U+1A66,U+1A76;[uni1A2F|uni1A621A75@592,0|uni1A26@592,0|uni1A601A36@1184,0|uni1A66@1184,0|uni1A76@1184,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A65,U+1A60,U+1A36;[uni1A49|uni1A65@762,0|uni1A601A36@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A63,U+1A60,U+1A3E;[uni1A32|uni1A63@933,0|uni1A601A3E@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A60,U+1A3F,U+1A63,U+1A60,U+1A35,U+1A65;[uni1A3B|uni1A601A3F@933,0|uni1A63@1159,0|uni1A601A35@1751,0|uni1A65@1751,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A38,U+1A60,U+1A43,U+1A60,U+1A3F,U+1A75,U+1A41;[uni1A38|uni1A601A43@592,0|uni1A601A3F@818,0|uni1A75@1049,0|uni1A41@1045,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A6F,U+1A76,U+1A60,U+1A36,U+1A60,U+1A45,U+1A75,U+1A63;[uni1A6F|uni1A3E.v2@1096,0|uni1A76@1688,0|uni1A601A36@1688,0|uni1A601A45@1688,-367|uni1A75@2013,0|uni1A63@1828,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A60,U+1A45,U+1A6F,U+1A75;[uni1A6F|uni1A48@1096,0|uni1A601A45@1688,0|uni1A75@1688,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A75,U+1A6F,U+1A60,U+1A45;[uni1A6F|uni1A48@1096,0|uni1A75@1688,0|uni1A601A45@1688,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3F,U+1A6A;[uni1A3F|uni1A6A@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A66;[uni1A3E.v2|uni1A66@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A6A;[uni1A49|uni1A601A3E@762,0|uni1A6A@762,-367]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A66;[uni1A49|uni1A601A3E@762,0|uni1A66@762,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A39,U+1A60,U+1A45,U+1A6B;[uni1A39|uni1A601A45@592,0|uni1A6B@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A43,U+1A6C,U+1A74,U+1A75;[uni1A49|uni1A601A43@933,0|uni1A6C@1060,-547|uni1A74@1164,0|uni1A75@1164,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A63;[uni1A3E.v2|uni1A63@732,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A71,U+1A75;[uni1A71|uni1A49@592,0|uni1A75@1354,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A60,U+1A3F,U+1A26;[uni1A45|uni1A601A3F@592,0|uni1A26@818,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A63,U+1A60,U+1A3E;[uni1A49|uni1A63@933,0|uni1A601A3E@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A63,U+1A74;[uni1A2F|uni1A74@592,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A63;[uni1A49|uni1A601A3E@762,0|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A55,U+1A63,U+1A60,U+1A38;[uni1A55|uni1A20@227,0|uni1A63@1159,0|uni1A601A37@1751,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A55,U+1A75,U+1A63,U+1A74;[uni1A55|uni1A3B@227,0|uni1A74@988,0|uni1A75@988,357|uni1A63@1159,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A55,U+1A6C,U+1A26;[uni1A55|uni1A20@227,0|uni1A6C.wide@1159,0|uni1A26@1159,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A55,U+1A6B,U+1A3E,U+1A60,U+1A31,U+1A7A;[uni1A55|uni1A48@227,0|uni1A6B@818,0|uni1A3E.v2@818,0|uni1A601A31.narrow@1410,0|uni1A7A@1410,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A55,U+1A60,U+1A45,U+1A6B,U+1A3E;[uni1A55|uni1A48@227,0|uni1A601A45@818,0|uni1A6B@818,0|uni1A3E.v2@818,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A75,U+1A63,U+1A74;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3E,U+1A6E,U+1A6C,U+1A68,U+1A26;[uni1A6E|uni1A49@592,0|uni1A601A3E@1524,0|uni1A6C@1524,-367|uni1A68@1524,0|uni1A26@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A3F,U+1A6E,U+1A6C,U+1A68,U+1A26;[uni1A6E|uni1A49@592,0|uni1A601A3F@1524,0|uni1A6C@1729,-367|uni1A68@1755,0|uni1A26@1751,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A43,U+1A63,U+1A60,U+1A3F;[uni1A49|uni1A601A43@933,0|uni1A63@1159,0|uni1A601A3F@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A93,U+1A60,U+1A34;[uni1A93|uni1A601A34@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A75,U+1A63,U+1A60,U+1A26,U+1A7B;[uni1A32|uni1A75@762,0|uni1A63@933,0|uni1A601A26@1524,0|uni1A78@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A33,U+1A60,U+1A36,U+1A7B,U+1A6B,U+1A41;[uni1A33|uni1A601A36@592,0|uni1A78@592,0|uni1A6B@954,0|uni1A41@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A21,U+1A62,U+1A76,U+1A7B,U+1A6C,U+1A26;[uni1A21|uni1A621A76@592,0|uni1A78@1007,0|uni1A6C@592,-98|uni1A26@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1AAD,U+1A63;[uni1AAD|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A36,U+1A66;[uni1A49|uni1A601A36@762,0|uni1A66@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A24,U+1A60,U+1A45,U+1A6F,U+1A76,U+1A41;[uni1A6F|uni1A24@1096,0|uni1A601A45@1688,0|uni1A76@1688,0|uni1A41@1688,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A45,U+1A6B;[uni1A49|uni1A601A45@762,0|uni1A6B@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A62,U+1A75,U+1A26,U+1A60,U+1A36,U+1A66,U+1A76;[uni1A2F|uni1A621A75@592,0|uni1A26@592,0|uni1A601A36@1184,0|uni1A66@1184,0|uni1A76@1184,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A65,U+1A60,U+1A36;[uni1A49|uni1A65@762,0|uni1A601A36@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A63,U+1A60,U+1A3E;[uni1A32|uni1A63@933,0|uni1A601A3E@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A60,U+1A3F,U+1A63,U+1A60,U+1A35,U+1A65;[uni1A3B|uni1A601A3F@933,0|uni1A63@1159,0|uni1A601A35@1751,0|uni1A65@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A38,U+1A60,U+1A43,U+1A60,U+1A3F,U+1A75,U+1A41;[uni1A38|uni1A601A43@592,0|uni1A601A3F@818,0|uni1A75@1049,0|uni1A41@1045,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A6F,U+1A76,U+1A60,U+1A36,U+1A60,U+1A45,U+1A75,U+1A63;[uni1A6F|uni1A3E.v2@1096,0|uni1A76@1688,0|uni1A601A36@1688,0|uni1A601A45@1688,-367|uni1A75@2013,0|uni1A63@1828,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A60,U+1A45,U+1A6F,U+1A75;[uni1A6F|uni1A48@1096,0|uni1A601A45@1688,0|uni1A75@1688,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A75,U+1A6F,U+1A60,U+1A45;[uni1A6F|uni1A48@1096,0|uni1A75@1688,0|uni1A601A45@1688,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3F,U+1A6A;[uni1A3F|uni1A6A@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A66;[uni1A3E.v2|uni1A66@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A6A;[uni1A49|uni1A601A3E@762,0|uni1A6A@762,-367]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A66;[uni1A49|uni1A601A3E@762,0|uni1A66@762,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A39,U+1A60,U+1A45,U+1A6B;[uni1A39|uni1A601A45@592,0|uni1A6B@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A43,U+1A6C,U+1A74,U+1A75;[uni1A49|uni1A601A43@933,0|uni1A6C@1060,-547|uni1A74@1164,0|uni1A75@1164,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A63;[uni1A3E.v2|uni1A63@732,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A71,U+1A75;[uni1A71|uni1A49@592,0|uni1A75@1354,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A60,U+1A3F,U+1A26;[uni1A45|uni1A601A3F@592,0|uni1A26@818,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A63,U+1A60,U+1A3E;[uni1A49|uni1A63@933,0|uni1A601A3E@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A63,U+1A74;[uni1A2F|uni1A74@592,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A63;[uni1A49|uni1A601A3E@762,0|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A55,U+1A63,U+1A60,U+1A38;[uni1A55|uni1A20@227,0|uni1A63@1159,0|uni1A601A37@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A55,U+1A75,U+1A63,U+1A74;[uni1A55|uni1A3B@227,0|uni1A74@988,0|uni1A75@988,357|uni1A63@1159,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A55,U+1A6C,U+1A26;[uni1A55|uni1A20@227,0|uni1A6C.wide@1159,0|uni1A26@1159,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A55,U+1A6B,U+1A3E,U+1A60,U+1A31,U+1A7A;[uni1A55|uni1A48@227,0|uni1A6B@818,0|uni1A3E.v2@818,0|uni1A601A31.narrow@1410,0|uni1A7A@1410,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A55,U+1A60,U+1A45,U+1A6B,U+1A3E;[uni1A55|uni1A48@227,0|uni1A601A45@818,0|uni1A6B@818,0|uni1A3E.v2@818,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A75,U+1A63,U+1A74;[uni1A49|uni1A601A3E@762,0|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3E,U+1A6E,U+1A6C,U+1A68,U+1A26;[uni1A6E|uni1A49@592,0|uni1A601A3E@1524,0|uni1A6C@1524,-367|uni1A68@1524,0|uni1A26@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A3F,U+1A6E,U+1A6C,U+1A68,U+1A26;[uni1A6E|uni1A49@592,0|uni1A601A3F@1524,0|uni1A6C@1729,-367|uni1A68@1755,0|uni1A26@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A43,U+1A63,U+1A60,U+1A3F;[uni1A49|uni1A601A43@933,0|uni1A63@1159,0|uni1A601A3F@1751,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-3.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-3.tests
index a37f3cecc..d5d7eaf9d 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-3.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-3.tests
@@ -1,13 +1,13 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A60,U+1A3C,U+1A7A;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A601A3C.wide@1865,0|uni1A7A@1964,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A7A,U+1A60,U+1A3C;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A7A@1964,0|uni1A601A3C.wide@1865,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A60,U+1A7A,U+1A3C;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A7A@1964,0|uni1A601A3C.wide@1865,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A55,U+1A63,U+1A60,U+1A3C;[uni1A55|uni1A20@227,0|uni1A63@1159,0|antler@1159,0|uni1A601A3C@1751,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A6C,U+1A3C,U+1A60,U+1A3C,U+1A66,U+1A75;[uni1A34|uni1A6C@592,0|uni1A3C@592,0|antler@771,0|uni1A601A3C.wide@1524,0|uni1A66@1558,0|uni1A75@1558,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A3D,U+1A5A;[uni1A20|uni1A3D@933,0|uni1A5A@1865,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A31,U+1A5B,U+1A63,U+1A60,U+1A36;[uni1A48|uni1A311A5B@592,0|uni1A63@1524,0|uni1A601A36@2116,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A2D,U+1A5B,U+1A37,U+1A63,U+1A60,U+1A43;[uni1A41|uni1A2D1A5B@592,0|uni1A37@1184,0|uni1A63@1775,0|uni1A601A43@2367,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A62,U+1A2D,U+1A5B,U+1A37,U+1A63,U+1A60,U+1A43;[uni1A41|uni1A62@592,0|uni1A2D1A5B@592,0|uni1A37@1184,0|uni1A63@1775,0|uni1A601A43@2367,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A3B,U+1A5B;[uni1A48|uni1A3B1A5B@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4B,U+1A3E,U+1A5B;[uni1A4B|uni1A3E1A5B@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A63,U+1A29,U+1A3D,U+1A62,U+1A60,U+1A2E;[uni1A41|uni1A63@592,0|uni1A29@1184,0|uni1A3D@1775,0|uni1A62@2537,0|uni1A601A2E@2537,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A62,U+1A31,U+1A60,U+1A3B,U+1A37,U+1A69,U+1A41,U+1A69,U+1A48;[uni1A37|uni1A62@592,0|uni1A31@592,0|uni1A601A3B.wide@1524,0|uni1A37@1524,0|uni1A69@2116,0|uni1A41@2116,0|uni1A69@2708,0|uni1A48@2708,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A60,U+1A3C,U+1A7A;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A601A3C.wide@1865,0|uni1A7A@1964,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A7A,U+1A60,U+1A3C;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A7A@1964,0|uni1A601A3C.wide@1865,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6C,U+1A62,U+1A43,U+1A60,U+1A7A,U+1A3C;[uni1A20|uni1A6C.wide@933,0|uni1A62@762,0|uni1A43@933,0|antler@933,0|uni1A7A@1964,0|uni1A601A3C.wide@1865,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A55,U+1A63,U+1A60,U+1A3C;[uni1A55|uni1A20@227,0|uni1A63@1159,0|antler@1159,0|uni1A601A3C@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A6C,U+1A3C,U+1A60,U+1A3C,U+1A66,U+1A75;[uni1A34|uni1A6C@592,0|uni1A3C@592,0|antler@771,0|uni1A601A3C.wide@1524,0|uni1A66@1558,0|uni1A75@1558,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A3D,U+1A5A;[uni1A20|uni1A3D@933,0|uni1A5A@1865,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A31,U+1A5B,U+1A63,U+1A60,U+1A36;[uni1A48|uni1A311A5B@592,0|uni1A63@1524,0|uni1A601A36@2116,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A2D,U+1A5B,U+1A37,U+1A63,U+1A60,U+1A43;[uni1A41|uni1A2D1A5B@592,0|uni1A37@1184,0|uni1A63@1775,0|uni1A601A43@2367,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A62,U+1A2D,U+1A5B,U+1A37,U+1A63,U+1A60,U+1A43;[uni1A41|uni1A62@592,0|uni1A2D1A5B@592,0|uni1A37@1184,0|uni1A63@1775,0|uni1A601A43@2367,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A3B,U+1A5B;[uni1A48|uni1A3B1A5B@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4B,U+1A3E,U+1A5B;[uni1A4B|uni1A3E1A5B@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A63,U+1A29,U+1A3D,U+1A62,U+1A60,U+1A2E;[uni1A41|uni1A63@592,0|uni1A29@1184,0|uni1A3D@1775,0|uni1A62@2537,0|uni1A601A2E@2537,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A62,U+1A31,U+1A60,U+1A3B,U+1A37,U+1A69,U+1A41,U+1A69,U+1A48;[uni1A37|uni1A62@592,0|uni1A31@592,0|uni1A601A3B.wide@1524,0|uni1A37@1524,0|uni1A69@2116,0|uni1A41@2116,0|uni1A69@2708,0|uni1A48@2708,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-4.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-4.tests
index 6ce33fcef..c5a013880 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-4.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-4.tests
@@ -1,3 +1,3 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A58,U+1A60,U+1A43,U+1A63,U+1A60,U+1A3F;[uni1A34|uni1A58@592,0|uni1A601A43@592,0|uni1A63@818,0|uni1A601A3F@1410,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A58,U+1A25,U+1A6E,U+1A63;[uni1A48|uni1A6E@592,0|uni1A25@1184,0|uni1A58@1945,0|uni1A63@2117,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A58,U+1A48,U+1A66;[uni1A41|uni1A58@592,0|uni1A48@592,0|uni1A66@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A58,U+1A60,U+1A43,U+1A63,U+1A60,U+1A3F;[uni1A34|uni1A58@592,0|uni1A601A43@592,0|uni1A63@818,0|uni1A601A3F@1410,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A58,U+1A25,U+1A6E,U+1A63;[uni1A48|uni1A6E@592,0|uni1A25@1184,0|uni1A58@1945,0|uni1A63@2117,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A58,U+1A48,U+1A66;[uni1A41|uni1A58@592,0|uni1A48@592,0|uni1A66@1184,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-5.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-5.tests
index da1918b2b..41893a420 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-5.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-5.tests
@@ -1,13 +1,13 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A63,U+1A74;[uni1A361A63|uni1A74@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3E,U+1A36,U+1A6E,U+1A63;[uni1A3E.v2|uni1A6E@732,0|uni1A361A63@1324,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A6E,U+1A62,U+1A63;[uni1A6E|uni1A361A63@592,0|uni1A62@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A63,U+1A60,U+1A3F;[uni1A361A63|uni1A601A3F@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A75,U+1A63,U+1A60,U+1A36;[uni1A361A63|uni1A75@592,0|uni1A601A36@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4D,U+1A36,U+1A60,U+1A34,U+1A63;[uni1A4D|uni1A361A63@933,0|uni1A601A34@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A4B,U+1A6B,U+1A36,U+1A60,U+1A32,U+1A55,U+1A63,U+1A60,U+1A3F;[uni1A4B|uni1A6B@592,0|uni1A55@592,0|uni1A361A63@818,0|uni1A601A32@1410,0|uni1A601A3F@1410,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A76,U+1A63,U+1A74;[uni1A361A63|uni1A74@592,0|uni1A76@592,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A60,U+1A45,U+1A63,U+1A60,U+1A37;[uni1A361A63|uni1A601A45@592,0|uni1A601A37@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A64,U+1A74,U+1A36,U+1A60,U+1A45,U+200C,U+1A63,U+1A60,U+1A3F;[uni1A34|uni1A74@592,0|uni1A64@592,0|uni1A36@818,0|uni1A601A45@1410,0|uni1A63@1410,0|uni1A601A3F@2002,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A32,U+1A75,U+1A63,U+1A74,U+1A36,U+1A60,U+1A45,U+1A63,U+1A60,U+1A3F;[uni1A32|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A361A63@1524,0|uni1A601A45@2116,0|uni1A601A3F@2116,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+200C,U+1A63;[uni1A36|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A36,U+1A76,U+1A63;[uni1A49|uni1A601A36@762,0|uni1A76@762,0|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A63,U+1A74;[uni1A361A63|uni1A74@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3E,U+1A36,U+1A6E,U+1A63;[uni1A3E.v2|uni1A6E@732,0|uni1A361A63@1324,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A6E,U+1A62,U+1A63;[uni1A6E|uni1A361A63@592,0|uni1A62@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A63,U+1A60,U+1A3F;[uni1A361A63|uni1A601A3F@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A75,U+1A63,U+1A60,U+1A36;[uni1A361A63|uni1A75@592,0|uni1A601A36@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4D,U+1A36,U+1A60,U+1A34,U+1A63;[uni1A4D|uni1A361A63@933,0|uni1A601A34@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A4B,U+1A6B,U+1A36,U+1A60,U+1A32,U+1A55,U+1A63,U+1A60,U+1A3F;[uni1A4B|uni1A6B@592,0|uni1A55@592,0|uni1A361A63@818,0|uni1A601A32@1410,0|uni1A601A3F@1410,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A76,U+1A63,U+1A74;[uni1A361A63|uni1A74@592,0|uni1A76@592,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A60,U+1A45,U+1A63,U+1A60,U+1A37;[uni1A361A63|uni1A601A45@592,0|uni1A601A37@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A64,U+1A74,U+1A36,U+1A60,U+1A45,U+200C,U+1A63,U+1A60,U+1A3F;[uni1A34|uni1A74@592,0|uni1A64@592,0|uni1A36@818,0|uni1A601A45@1410,0|uni1A63@1410,0|uni1A601A3F@2002,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A32,U+1A75,U+1A63,U+1A74,U+1A36,U+1A60,U+1A45,U+1A63,U+1A60,U+1A3F;[uni1A32|uni1A74@762,0|uni1A75@762,357|uni1A63@933,0|uni1A361A63@1524,0|uni1A601A45@2116,0|uni1A601A3F@2116,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+200C,U+1A63;[uni1A36|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A36,U+1A76,U+1A63;[uni1A49|uni1A601A36@762,0|uni1A76@762,0|uni1A63@933,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-6.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-6.tests
index fd4bd12d8..b1ad2cf3a 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-6.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-6.tests
@@ -1,7 +1,7 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6F,U+1A62,U+1A60,U+1A48;[uni1A6F|uni1A20@1096,0|uni1A62@1857,0|uni1A601A48@2028,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A55,U+1A6F,U+1A60,U+1A20,U+1A34,U+1A6E,U+1A6C,U+1A65,U+1A41,U+1A7A;[uni1A6F|uni1A55@1096,0|uni1A34@1322,0|uni1A601A20@1914,0|uni1A6E@1914,0|uni1A34@2506,0|uni1A6C@3098,0|uni1A65@3098,0|uni1A41@3098,0|uni1A7A@3689,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A36,U+1A70,U+1A6B,U+1A76,U+1A60,U+1A32;[uni1A70|uni1A36@592,0|uni1A6B@1184,0|uni1A76@1184,357|uni1A601A32@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A55,U+1A70,U+1A34,U+1A66,U+1A60,U+1A36;[uni1A70|uni1A55@592,0|uni1A37@818,0|uni1A34@1410,0|uni1A66@2002,0|uni1A601A36@2002,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3C,U+1A65,U+1A45,U+1A60,U+1A48,U+1A7A;[uni1A3C|uni1A65@859,0|uni1A45@933,0|uni1A601A48@1524,0|uni1A7A@1755,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A32,U+1A6F,U+1A3E,U+1A60,U+1A37,U+1A7A;[uni1A48|uni1A6F@592,0|uni1A32@1688,0|uni1A3E.v2@2620,0|uni1A601A37@3353,0|uni1A7A@3584,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A6E,U+1A65,U+1A41,U+1A7A,U+1A60,U+1A37;[uni1A6E|uni1A48@592,0|uni1A65@1184,0|uni1A41@1184,0|uni1A7A@1775,0|uni1A601A37@1775,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6F,U+1A62,U+1A60,U+1A48;[uni1A6F|uni1A20@1096,0|uni1A62@1857,0|uni1A601A48@2028,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A55,U+1A6F,U+1A60,U+1A20,U+1A34,U+1A6E,U+1A6C,U+1A65,U+1A41,U+1A7A;[uni1A6F|uni1A55@1096,0|uni1A34@1322,0|uni1A601A20@1914,0|uni1A6E@1914,0|uni1A34@2506,0|uni1A6C@3098,0|uni1A65@3098,0|uni1A41@3098,0|uni1A7A@3689,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A36,U+1A70,U+1A6B,U+1A76,U+1A60,U+1A32;[uni1A70|uni1A36@592,0|uni1A6B@1184,0|uni1A76@1184,357|uni1A601A32@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A55,U+1A70,U+1A34,U+1A66,U+1A60,U+1A36;[uni1A70|uni1A55@592,0|uni1A37@818,0|uni1A34@1410,0|uni1A66@2002,0|uni1A601A36@2002,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3C,U+1A65,U+1A45,U+1A60,U+1A48,U+1A7A;[uni1A3C|uni1A65@859,0|uni1A45@933,0|uni1A601A48@1524,0|uni1A7A@1755,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A32,U+1A6F,U+1A3E,U+1A60,U+1A37,U+1A7A;[uni1A48|uni1A6F@592,0|uni1A32@1688,0|uni1A3E.v2@2620,0|uni1A601A37@3353,0|uni1A7A@3584,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A6E,U+1A65,U+1A41,U+1A7A,U+1A60,U+1A37;[uni1A6E|uni1A48@592,0|uni1A65@1184,0|uni1A41@1184,0|uni1A7A@1775,0|uni1A601A37@1775,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-7.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-7.tests
index 292bb64ea..19bf28a92 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-7.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-7.tests
@@ -1,18 +1,18 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A62,U+1A75,U+1A57,U+1A63;[uni1A34|uni1A621A75@592,0|uni1A57@592,0|uni1A63@818,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A21,U+1A36,U+1A60,U+1A35,U+1A63;[uni1A21|uni1A361A63@592,0|uni1A601A35@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A76,U+1A60,U+1A2F,U+1A66,U+00A0;[uni1A23|uni1A76@592,0|uni1A601A2F@592,0|uni1A66@1095,0|space_nb@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A76,U+1A60,U+1A3E,U+1A63;[uni1A37|uni1A76@592,0|uni1A601A3E@592,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A60,U+1A76,U+1A3E,U+1A63;[uni1A37|uni1A76@592,0|uni1A601A3E@592,0|uni1A63@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A37,U+1A76,U+1A60,U+1A2F,U+1A63,U+1A60,U+1A3F;[uni1A37|uni1A76@592,0|uni1A601A2F@592,0|uni1A63@592,0|uni1A601A3F@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A27,U+1A62,U+1A60,U+1A45,U+1A64;[uni1A27|uni1A62@592,0|uni1A601A45@592,0|uni1A64@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A6E,U+1A60,U+1A53,U+1A60,U+1A45;[uni1A6E|uni1A48@592,0|uni1A601A53@1184,0|uni1A601A45@1311,-547]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A34,U+1A6F,U+1A60,U+1A36,U+1A73;[uni1A6F|uni1A34@1096,0|uni1A601A36@1688,0|uni1A73@1688,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A53,U+1A60,U+1A3E,U+1A63;[uni1A53|uni1A601A3E@762,0|uni1A63@933,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A20,U+1A6E,U+1A60,U+1A48,U+1A63;[uni1A6E|uni1A20@592,0|uni1A601A48@1524,0|uni1A63@1751,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A71,U+1A60,U+1A3E,U+1A63;[uni1A71|uni1A3B@592,0|uni1A601A3E@1354,0|uni1A63@1524,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A6E,U+1A60,U+1A45,U+1A76,U+1A64;[uni1A6E|uni1A48@592,0|uni1A601A45@1184,0|uni1A76@1184,0|uni1A64@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A6E,U+1A60,U+1A43,U+1A63;[uni1A6E|uni1A45@592,0|uni1A601A43@1184,0|uni1A63@1410,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A35,U+1A64,U+1A60,U+1A32,U+1A69;[uni1A35|uni1A64@592,0|uni1A601A32@863,0|uni1A69@863,-547]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A29,U+1A60,U+1A53;[uni1A29|uni1A601A53@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A6D,U+1A60,U+1A45,U+1A7B,U+1A63;[uni1A3B|uni1A6D@933,0|uni1A601A45@1137,-547|uni1A78@1204,195|uni1A63@1159,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A6B,U+1A60,U+1A26,U+1A63,U+1A60,U+1A36;[uni1A48|uni1A6B@592,0|uni1A601A26@592,0|uni1A63@592,0|uni1A601A36@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A62,U+1A75,U+1A57,U+1A63;[uni1A34|uni1A621A75@592,0|uni1A57@592,0|uni1A63@818,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A21,U+1A36,U+1A60,U+1A35,U+1A63;[uni1A21|uni1A361A63@592,0|uni1A601A35@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A76,U+1A60,U+1A2F,U+1A66,U+00A0;[uni1A23|uni1A76@592,0|uni1A601A2F@592,0|uni1A66@1095,0|space_nb@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A76,U+1A60,U+1A3E,U+1A63;[uni1A37|uni1A76@592,0|uni1A601A3E@592,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A60,U+1A76,U+1A3E,U+1A63;[uni1A37|uni1A76@592,0|uni1A601A3E@592,0|uni1A63@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A37,U+1A76,U+1A60,U+1A2F,U+1A63,U+1A60,U+1A3F;[uni1A37|uni1A76@592,0|uni1A601A2F@592,0|uni1A63@592,0|uni1A601A3F@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A27,U+1A62,U+1A60,U+1A45,U+1A64;[uni1A27|uni1A62@592,0|uni1A601A45@592,0|uni1A64@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A6E,U+1A60,U+1A53,U+1A60,U+1A45;[uni1A6E|uni1A48@592,0|uni1A601A53@1184,0|uni1A601A45@1311,-547]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A34,U+1A6F,U+1A60,U+1A36,U+1A73;[uni1A6F|uni1A34@1096,0|uni1A601A36@1688,0|uni1A73@1688,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A53,U+1A60,U+1A3E,U+1A63;[uni1A53|uni1A601A3E@762,0|uni1A63@933,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A20,U+1A6E,U+1A60,U+1A48,U+1A63;[uni1A6E|uni1A20@592,0|uni1A601A48@1524,0|uni1A63@1751,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A71,U+1A60,U+1A3E,U+1A63;[uni1A71|uni1A3B@592,0|uni1A601A3E@1354,0|uni1A63@1524,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A6E,U+1A60,U+1A45,U+1A76,U+1A64;[uni1A6E|uni1A48@592,0|uni1A601A45@1184,0|uni1A76@1184,0|uni1A64@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A6E,U+1A60,U+1A43,U+1A63;[uni1A6E|uni1A45@592,0|uni1A601A43@1184,0|uni1A63@1410,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A35,U+1A64,U+1A60,U+1A32,U+1A69;[uni1A35|uni1A64@592,0|uni1A601A32@863,0|uni1A69@863,-547]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A29,U+1A60,U+1A53;[uni1A29|uni1A601A53@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A6D,U+1A60,U+1A45,U+1A7B,U+1A63;[uni1A3B|uni1A6D@933,0|uni1A601A45@1137,-547|uni1A78@1204,195|uni1A63@1159,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A6B,U+1A60,U+1A26,U+1A63,U+1A60,U+1A36;[uni1A48|uni1A6B@592,0|uni1A601A26@592,0|uni1A63@592,0|uni1A601A36@1184,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-8.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-8.tests
index 9db085cc0..d255584f5 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-8.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-8.tests
@@ -1,13 +1,13 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A6C,U+1A73,U+1A75;[uni1A3B|uni1A6C.wide@933,0|uni1A73@762,0|uni1A75@762,447]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A48,U+1A37,U+1A77,U+1A63,U+1A60,U+1A3F;[uni1A48|uni1A37@592,0|uni1A77@1184,0|uni1A63@1184,0|uni1A601A3F@1775,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A60,U+1A3F,U+1A59;[uni1A45|uni1A601A3F@592,0|uni1A59@823,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A6A,U+1A7A;[uni1A23|uni1A6A@592,0|uni1A7A@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A81,U+1A82,U+00A0,U+1A3B,U+1A62,U+1A60,U+1A36,U+1A7B,U+1A63;[uni1A81|uni1A82@592,0|space_nb@1184,0|uni1A3B@1501,0|uni1A62@2263,0|uni1A601A36@2263,0|uni1A78@2263,357|uni1A63@2434,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A3B,U+1A71,U+1A7B,U+1A63,U+1A60,U+1A3F;[uni1A71|uni1A3B@592,0|uni1A78@1354,0|uni1A63@1524,0|uni1A601A3F@2116,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A29,U+1A60,U+1A3F,U+1A59,U+1A32,U+1A69,U+1A74;[uni1A29|uni1A601A3F@592,0|uni1A59@823,0|uni1A32@818,0|uni1A69@1580,0|uni1A74@1580,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A32,U+1A5B,U+1A69;[uni1A45|uni1A321A5B@592,0|uni1A69@1184,-734]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A45,U+1A32,U+1A60,U+1A33,U+1A69;[uni1A45|uni1A32@592,0|uni1A601A33@1354,0|uni1A69@1354,-547]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A2F,U+1A60,U+1A3F,U+1A74;[uni1A2F|uni1A601A3F@592,0|uni1A74@823,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A49,U+1A60,U+1A36,U+1A66,U+1A62,U+1A76;[uni1A49|uni1A601A36@762,0|uni1A66@762,0|uni1A621A76@1265,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A6E,U+1A42,U+1A60,U+1A20;[uni1A6E|uni1A41@592,0|uni1A42@1184,0|uni1A601A20@1775,-547]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A41,U+1A60,U+1A3F,U+1A7A;[uni1A41|uni1A601A3F@592,0|uni1A7A@823,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A6C,U+1A73,U+1A75;[uni1A3B|uni1A6C.wide@933,0|uni1A73@762,0|uni1A75@762,447]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A48,U+1A37,U+1A77,U+1A63,U+1A60,U+1A3F;[uni1A48|uni1A37@592,0|uni1A77@1184,0|uni1A63@1184,0|uni1A601A3F@1775,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A60,U+1A3F,U+1A59;[uni1A45|uni1A601A3F@592,0|uni1A59@823,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A6A,U+1A7A;[uni1A23|uni1A6A@592,0|uni1A7A@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A81,U+1A82,U+00A0,U+1A3B,U+1A62,U+1A60,U+1A36,U+1A7B,U+1A63;[uni1A81|uni1A82@592,0|space_nb@1184,0|uni1A3B@1501,0|uni1A62@2263,0|uni1A601A36@2263,0|uni1A78@2263,357|uni1A63@2434,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A3B,U+1A71,U+1A7B,U+1A63,U+1A60,U+1A3F;[uni1A71|uni1A3B@592,0|uni1A78@1354,0|uni1A63@1524,0|uni1A601A3F@2116,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A29,U+1A60,U+1A3F,U+1A59,U+1A32,U+1A69,U+1A74;[uni1A29|uni1A601A3F@592,0|uni1A59@823,0|uni1A32@818,0|uni1A69@1580,0|uni1A74@1580,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A32,U+1A5B,U+1A69;[uni1A45|uni1A321A5B@592,0|uni1A69@1184,-734]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A45,U+1A32,U+1A60,U+1A33,U+1A69;[uni1A45|uni1A32@592,0|uni1A601A33@1354,0|uni1A69@1354,-547]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A2F,U+1A60,U+1A3F,U+1A74;[uni1A2F|uni1A601A3F@592,0|uni1A74@823,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A49,U+1A60,U+1A36,U+1A66,U+1A62,U+1A76;[uni1A49|uni1A601A36@762,0|uni1A66@762,0|uni1A621A76@1265,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A6E,U+1A42,U+1A60,U+1A20;[uni1A6E|uni1A41@592,0|uni1A42@1184,0|uni1A601A20@1775,-547]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A41,U+1A60,U+1A3F,U+1A7A;[uni1A41|uni1A601A3F@592,0|uni1A7A@823,0]
diff --git a/test/shape/data/text-rendering-tests/tests/SHLANA-9.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-9.tests
index ffdcdc47e..244f920f3 100644
--- a/test/shape/data/text-rendering-tests/tests/SHLANA-9.tests
+++ b/test/shape/data/text-rendering-tests/tests/SHLANA-9.tests
@@ -1,6 +1,6 @@
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A74,U+1A37,U+1A74,U+1A75;[uni1A23|uni1A74@592,0|uni1A37@592,0|uni1A74@1184,0|uni1A75@1184,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A74,U+1A37,U+1A74;[uni1A23|uni1A74@592,0|uni1A37@592,0|uni1A74@1184,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A5D,U+1A74,U+1A75;[uni1A23|uni1A5D@592,0|uni1A74@592,0|uni1A75@592,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A74,U+1A5D,U+1A75;[uni1A23|uni1A74@592,0|uni1A5D@592,0|uni1A75@592,357]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A5D,U+1A74;[uni1A23|uni1A5D@592,0|uni1A74@592,0]
-../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft;U+1A23,U+1A74,U+1A5D;[uni1A23|uni1A74@592,0|uni1A5D@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A74,U+1A37,U+1A74,U+1A75;[uni1A23|uni1A74@592,0|uni1A37@592,0|uni1A74@1184,0|uni1A75@1184,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A74,U+1A37,U+1A74;[uni1A23|uni1A74@592,0|uni1A37@592,0|uni1A74@1184,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A5D,U+1A74,U+1A75;[uni1A23|uni1A5D@592,0|uni1A74@592,0|uni1A75@592,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A74,U+1A5D,U+1A75;[uni1A23|uni1A74@592,0|uni1A5D@592,0|uni1A75@592,357]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A5D,U+1A74;[uni1A23|uni1A5D@592,0|uni1A74@592,0]
+../fonts/TestShapeLana.ttf;--font-size=1000 --ned --remove-default-ignorables;U+1A23,U+1A74,U+1A5D;[uni1A23|uni1A74@592,0|uni1A5D@592,0]
diff --git a/test/shape/data/text-rendering-tests/update.py b/test/shape/data/text-rendering-tests/update.py
index 215891d5f..bfe21f2c3 100755
--- a/test/shape/data/text-rendering-tests/update.py
+++ b/test/shape/data/text-rendering-tests/update.py
@@ -44,7 +44,7 @@ def extract_tests (input):
 			assert href[0] == '#'
 			glyphname = '.'.join (href[1:].split ('/')[1].split ('.')[1:])
 			glyphs.append ((glyphname, x, y))
-		opts = '--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft'
+		opts = '--font-size=1000 --ned --remove-default-ignorables'
 		if variations:
 			opts = opts + ' --variations=%s' % variations
 		result.append ("../fonts/%s;%s;%s;%s" % (font, opts, unistr(text), glyphstr(glyphs)))