@@ -15,14 +15,14 @@
 
 #include "config.h"
 
 #import "OFString.h"
 
-static const of_unichar_t emptyPage[0x100] = { 0 };
+static const OFUnichar emptyPage[0x100] = { 0 };
 static const char *emptyDecompositionPage[0x100] = { NULL };
 
-static const of_unichar_t uppercasePage0[0x100] = {
+static const OFUnichar uppercasePage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -53,11 +53,11 @@
 	200, 201, 202, 203, 204, 205, 206, 207,
 	208, 209, 210, 211, 212, 213, 214, 0,
 	216, 217, 218, 219, 220, 221, 222, 376,
 };
 
-static const of_unichar_t uppercasePage1[0x100] = {
+static const OFUnichar uppercasePage1[0x100] = {
 	0, 256, 0, 258, 0, 260, 0, 262,
 	0, 264, 0, 266, 0, 268, 0, 270,
 	0, 272, 0, 274, 0, 276, 0, 278,
 	0, 280, 0, 282, 0, 284, 0, 286,
 	0, 288, 0, 290, 0, 292, 0, 294,
@@ -88,11 +88,11 @@
 	0, 488, 0, 490, 0, 492, 0, 494,
 	0, 0, 497, 497, 0, 500, 0, 0,
 	0, 504, 0, 506, 0, 508, 0, 510,
 };
 
-static const of_unichar_t uppercasePage2[0x100] = {
+static const OFUnichar uppercasePage2[0x100] = {
 	0, 512, 0, 514, 0, 516, 0, 518,
 	0, 520, 0, 522, 0, 524, 0, 526,
 	0, 528, 0, 530, 0, 532, 0, 534,
 	0, 536, 0, 538, 0, 540, 0, 542,
 	0, 0, 0, 546, 0, 548, 0, 550,
@@ -123,11 +123,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage3[0x100] = {
+static const OFUnichar uppercasePage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -158,11 +158,11 @@
 	0, 1000, 0, 1002, 0, 1004, 0, 1006,
 	922, 929, 1017, 895, 0, 917, 0, 0,
 	1015, 0, 0, 1018, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage4[0x100] = {
+static const OFUnichar uppercasePage4[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -193,11 +193,11 @@
 	0, 1256, 0, 1258, 0, 1260, 0, 1262,
 	0, 1264, 0, 1266, 0, 1268, 0, 1270,
 	0, 1272, 0, 1274, 0, 1276, 0, 1278,
 };
 
-static const of_unichar_t uppercasePage5[0x100] = {
+static const OFUnichar uppercasePage5[0x100] = {
 	0, 1280, 0, 1282, 0, 1284, 0, 1286,
 	0, 1288, 0, 1290, 0, 1292, 0, 1294,
 	0, 1296, 0, 1298, 0, 1300, 0, 1302,
 	0, 1304, 0, 1306, 0, 1308, 0, 1310,
 	0, 1312, 0, 1314, 0, 1316, 0, 1318,
@@ -228,11 +228,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage16[0x100] = {
+static const OFUnichar uppercasePage16[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -263,11 +263,11 @@
 	7336, 7337, 7338, 7339, 7340, 7341, 7342, 7343,
 	7344, 7345, 7346, 7347, 7348, 7349, 7350, 7351,
 	7352, 7353, 7354, 0, 0, 7357, 7358, 7359,
 };
 
-static const of_unichar_t uppercasePage19[0x100] = {
+static const OFUnichar uppercasePage19[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -298,11 +298,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	5104, 5105, 5106, 5107, 5108, 5109, 0, 0,
 };
 
-static const of_unichar_t uppercasePage28[0x100] = {
+static const OFUnichar uppercasePage28[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -333,11 +333,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage29[0x100] = {
+static const OFUnichar uppercasePage29[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -368,11 +368,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage30[0x100] = {
+static const OFUnichar uppercasePage30[0x100] = {
 	0, 7680, 0, 7682, 0, 7684, 0, 7686,
 	0, 7688, 0, 7690, 0, 7692, 0, 7694,
 	0, 7696, 0, 7698, 0, 7700, 0, 7702,
 	0, 7704, 0, 7706, 0, 7708, 0, 7710,
 	0, 7712, 0, 7714, 0, 7716, 0, 7718,
@@ -403,11 +403,11 @@
 	0, 7912, 0, 7914, 0, 7916, 0, 7918,
 	0, 7920, 0, 7922, 0, 7924, 0, 7926,
 	0, 7928, 0, 7930, 0, 7932, 0, 7934,
 };
 
-static const of_unichar_t uppercasePage31[0x100] = {
+static const OFUnichar uppercasePage31[0x100] = {
 	7944, 7945, 7946, 7947, 7948, 7949, 7950, 7951,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7960, 7961, 7962, 7963, 7964, 7965, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7976, 7977, 7978, 7979, 7980, 7981, 7982, 7983,
@@ -438,11 +438,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 8188, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage33[0x100] = {
+static const OFUnichar uppercasePage33[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -473,11 +473,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage36[0x100] = {
+static const OFUnichar uppercasePage36[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -508,11 +508,11 @@
 	9422, 9423, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage44[0x100] = {
+static const OFUnichar uppercasePage44[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -543,11 +543,11 @@
 	0, 0, 0, 0, 11499, 0, 11501, 0,
 	0, 0, 0, 11506, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage45[0x100] = {
+static const OFUnichar uppercasePage45[0x100] = {
 	4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263,
 	4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271,
 	4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279,
 	4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287,
 	4288, 4289, 4290, 4291, 4292, 4293, 0, 4295,
@@ -578,11 +578,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage166[0x100] = {
+static const OFUnichar uppercasePage166[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -613,11 +613,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage167[0x100] = {
+static const OFUnichar uppercasePage167[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 42786, 0, 42788, 0, 42790,
@@ -648,11 +648,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 42997, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage171[0x100] = {
+static const OFUnichar uppercasePage171[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -683,11 +683,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage255[0x100] = {
+static const OFUnichar uppercasePage255[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -718,11 +718,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage260[0x100] = {
+static const OFUnichar uppercasePage260[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -753,11 +753,11 @@
 	66752, 66753, 66754, 66755, 66756, 66757, 66758, 66759,
 	66760, 66761, 66762, 66763, 66764, 66765, 66766, 66767,
 	66768, 66769, 66770, 66771, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage268[0x100] = {
+static const OFUnichar uppercasePage268[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -788,11 +788,11 @@
 	68776, 68777, 68778, 68779, 68780, 68781, 68782, 68783,
 	68784, 68785, 68786, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage280[0x100] = {
+static const OFUnichar uppercasePage280[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -823,11 +823,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage366[0x100] = {
+static const OFUnichar uppercasePage366[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -858,11 +858,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercasePage489[0x100] = {
+static const OFUnichar uppercasePage489[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 125184, 125185, 125186, 125187, 125188, 125189,
@@ -893,11 +893,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage0[0x100] = {
+static const OFUnichar lowercasePage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -928,11 +928,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage1[0x100] = {
+static const OFUnichar lowercasePage1[0x100] = {
 	257, 0, 259, 0, 261, 0, 263, 0,
 	265, 0, 267, 0, 269, 0, 271, 0,
 	273, 0, 275, 0, 277, 0, 279, 0,
 	281, 0, 283, 0, 285, 0, 287, 0,
 	289, 0, 291, 0, 293, 0, 295, 0,
@@ -963,11 +963,11 @@
 	489, 0, 491, 0, 493, 0, 495, 0,
 	0, 499, 499, 0, 501, 0, 405, 447,
 	505, 0, 507, 0, 509, 0, 511, 0,
 };
 
-static const of_unichar_t lowercasePage2[0x100] = {
+static const OFUnichar lowercasePage2[0x100] = {
 	513, 0, 515, 0, 517, 0, 519, 0,
 	521, 0, 523, 0, 525, 0, 527, 0,
 	529, 0, 531, 0, 533, 0, 535, 0,
 	537, 0, 539, 0, 541, 0, 543, 0,
 	414, 0, 547, 0, 549, 0, 551, 0,
@@ -998,11 +998,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage3[0x100] = {
+static const OFUnichar lowercasePage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1033,11 +1033,11 @@
 	1001, 0, 1003, 0, 1005, 0, 1007, 0,
 	0, 0, 0, 0, 952, 0, 0, 1016,
 	0, 1010, 1019, 0, 0, 891, 892, 893,
 };
 
-static const of_unichar_t lowercasePage4[0x100] = {
+static const OFUnichar lowercasePage4[0x100] = {
 	1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111,
 	1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119,
 	1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079,
 	1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
 	1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095,
@@ -1068,11 +1068,11 @@
 	1257, 0, 1259, 0, 1261, 0, 1263, 0,
 	1265, 0, 1267, 0, 1269, 0, 1271, 0,
 	1273, 0, 1275, 0, 1277, 0, 1279, 0,
 };
 
-static const of_unichar_t lowercasePage5[0x100] = {
+static const OFUnichar lowercasePage5[0x100] = {
 	1281, 0, 1283, 0, 1285, 0, 1287, 0,
 	1289, 0, 1291, 0, 1293, 0, 1295, 0,
 	1297, 0, 1299, 0, 1301, 0, 1303, 0,
 	1305, 0, 1307, 0, 1309, 0, 1311, 0,
 	1313, 0, 1315, 0, 1317, 0, 1319, 0,
@@ -1103,11 +1103,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage16[0x100] = {
+static const OFUnichar lowercasePage16[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1138,11 +1138,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage19[0x100] = {
+static const OFUnichar lowercasePage19[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1173,11 +1173,11 @@
 	43960, 43961, 43962, 43963, 43964, 43965, 43966, 43967,
 	5112, 5113, 5114, 5115, 5116, 5117, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage28[0x100] = {
+static const OFUnichar lowercasePage28[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1208,11 +1208,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage30[0x100] = {
+static const OFUnichar lowercasePage30[0x100] = {
 	7681, 0, 7683, 0, 7685, 0, 7687, 0,
 	7689, 0, 7691, 0, 7693, 0, 7695, 0,
 	7697, 0, 7699, 0, 7701, 0, 7703, 0,
 	7705, 0, 7707, 0, 7709, 0, 7711, 0,
 	7713, 0, 7715, 0, 7717, 0, 7719, 0,
@@ -1243,11 +1243,11 @@
 	7913, 0, 7915, 0, 7917, 0, 7919, 0,
 	7921, 0, 7923, 0, 7925, 0, 7927, 0,
 	7929, 0, 7931, 0, 7933, 0, 7935, 0,
 };
 
-static const of_unichar_t lowercasePage31[0x100] = {
+static const OFUnichar lowercasePage31[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7936, 7937, 7938, 7939, 7940, 7941, 7942, 7943,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7952, 7953, 7954, 7955, 7956, 7957, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1278,11 +1278,11 @@
 	8160, 8161, 8058, 8059, 8165, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	8056, 8057, 8060, 8061, 8179, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage33[0x100] = {
+static const OFUnichar lowercasePage33[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 969, 0,
@@ -1313,11 +1313,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage36[0x100] = {
+static const OFUnichar lowercasePage36[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1348,11 +1348,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage44[0x100] = {
+static const OFUnichar lowercasePage44[0x100] = {
 	11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319,
 	11320, 11321, 11322, 11323, 11324, 11325, 11326, 11327,
 	11328, 11329, 11330, 11331, 11332, 11333, 11334, 11335,
 	11336, 11337, 11338, 11339, 11340, 11341, 11342, 11343,
 	11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351,
@@ -1383,11 +1383,11 @@
 	0, 0, 0, 11500, 0, 11502, 0, 0,
 	0, 0, 11507, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage166[0x100] = {
+static const OFUnichar lowercasePage166[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1418,11 +1418,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage167[0x100] = {
+static const OFUnichar lowercasePage167[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 42787, 0, 42789, 0, 42791, 0,
@@ -1453,11 +1453,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 42998, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage255[0x100] = {
+static const OFUnichar lowercasePage255[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 65345, 65346, 65347, 65348, 65349, 65350, 65351,
@@ -1488,11 +1488,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage260[0x100] = {
+static const OFUnichar lowercasePage260[0x100] = {
 	66600, 66601, 66602, 66603, 66604, 66605, 66606, 66607,
 	66608, 66609, 66610, 66611, 66612, 66613, 66614, 66615,
 	66616, 66617, 66618, 66619, 66620, 66621, 66622, 66623,
 	66624, 66625, 66626, 66627, 66628, 66629, 66630, 66631,
 	66632, 66633, 66634, 66635, 66636, 66637, 66638, 66639,
@@ -1523,11 +1523,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage268[0x100] = {
+static const OFUnichar lowercasePage268[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1558,11 +1558,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage280[0x100] = {
+static const OFUnichar lowercasePage280[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1593,11 +1593,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage366[0x100] = {
+static const OFUnichar lowercasePage366[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1628,11 +1628,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercasePage489[0x100] = {
+static const OFUnichar lowercasePage489[0x100] = {
 	125218, 125219, 125220, 125221, 125222, 125223, 125224, 125225,
 	125226, 125227, 125228, 125229, 125230, 125231, 125232, 125233,
 	125234, 125235, 125236, 125237, 125238, 125239, 125240, 125241,
 	125242, 125243, 125244, 125245, 125246, 125247, 125248, 125249,
 	125250, 125251, 0, 0, 0, 0, 0, 0,
@@ -1663,11 +1663,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t titlecasePage1[0x100] = {
+static const OFUnichar titlecasePage1[0x100] = {
 	0, 256, 0, 258, 0, 260, 0, 262,
 	0, 264, 0, 266, 0, 268, 0, 270,
 	0, 272, 0, 274, 0, 276, 0, 278,
 	0, 280, 0, 282, 0, 284, 0, 286,
 	0, 288, 0, 290, 0, 292, 0, 294,
@@ -1698,11 +1698,11 @@
 	0, 488, 0, 490, 0, 492, 0, 494,
 	0, 498, 498, 498, 0, 500, 0, 0,
 	0, 504, 0, 506, 0, 508, 0, 510,
 };
 
-static const of_unichar_t titlecasePage16[0x100] = {
+static const OFUnichar titlecasePage16[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1733,11 +1733,11 @@
 	4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335,
 	4336, 4337, 4338, 4339, 4340, 4341, 4342, 4343,
 	4344, 4345, 4346, 0, 0, 4349, 4350, 4351,
 };
 
-static const of_unichar_t casefoldingPage0[0x100] = {
+static const OFUnichar caseFoldingPage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1768,11 +1768,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t casefoldingPage1[0x100] = {
+static const OFUnichar caseFoldingPage1[0x100] = {
 	257, 0, 259, 0, 261, 0, 263, 0,
 	265, 0, 267, 0, 269, 0, 271, 0,
 	273, 0, 275, 0, 277, 0, 279, 0,
 	281, 0, 283, 0, 285, 0, 287, 0,
 	289, 0, 291, 0, 293, 0, 295, 0,
@@ -1803,11 +1803,11 @@
 	489, 0, 491, 0, 493, 0, 495, 0,
 	0, 499, 499, 0, 501, 0, 405, 447,
 	505, 0, 507, 0, 509, 0, 511, 0,
 };
 
-static const of_unichar_t casefoldingPage3[0x100] = {
+static const OFUnichar caseFoldingPage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1838,11 +1838,11 @@
 	1001, 0, 1003, 0, 1005, 0, 1007, 0,
 	954, 961, 0, 0, 952, 949, 0, 1016,
 	0, 1010, 1019, 0, 0, 891, 892, 893,
 };
 
-static const of_unichar_t casefoldingPage19[0x100] = {
+static const OFUnichar caseFoldingPage19[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1873,11 +1873,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	5104, 5105, 5106, 5107, 5108, 5109, 0, 0,
 };
 
-static const of_unichar_t casefoldingPage28[0x100] = {
+static const OFUnichar caseFoldingPage28[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1908,11 +1908,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t casefoldingPage30[0x100] = {
+static const OFUnichar caseFoldingPage30[0x100] = {
 	7681, 0, 7683, 0, 7685, 0, 7687, 0,
 	7689, 0, 7691, 0, 7693, 0, 7695, 0,
 	7697, 0, 7699, 0, 7701, 0, 7703, 0,
 	7705, 0, 7707, 0, 7709, 0, 7711, 0,
 	7713, 0, 7715, 0, 7717, 0, 7719, 0,
@@ -1943,11 +1943,11 @@
 	7913, 0, 7915, 0, 7917, 0, 7919, 0,
 	7921, 0, 7923, 0, 7925, 0, 7927, 0,
 	7929, 0, 7931, 0, 7933, 0, 7935, 0,
 };
 
-static const of_unichar_t casefoldingPage31[0x100] = {
+static const OFUnichar caseFoldingPage31[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7936, 7937, 7938, 7939, 7940, 7941, 7942, 7943,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7952, 7953, 7954, 7955, 7956, 7957, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1978,11 +1978,11 @@
 	8160, 8161, 8058, 8059, 8165, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	8056, 8057, 8060, 8061, 8179, 0, 0, 0,
 };
 
-static const of_unichar_t casefoldingPage171[0x100] = {
+static const OFUnichar caseFoldingPage171[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -12362,11 +12362,11 @@
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 };
 
-const of_unichar_t *const of_unicode_uppercase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeUppercaseTable[0x1EA] = {
 	uppercasePage0, uppercasePage1, uppercasePage2, uppercasePage3,
 	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	uppercasePage16, emptyPage, emptyPage, uppercasePage19,
@@ -12488,11 +12488,11 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, uppercasePage489
 };
 
-const of_unichar_t *const of_unicode_lowercase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeLowercaseTable[0x1EA] = {
 	lowercasePage0, lowercasePage1, lowercasePage2, lowercasePage3,
 	lowercasePage4, lowercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	lowercasePage16, emptyPage, emptyPage, lowercasePage19,
@@ -12614,11 +12614,11 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage489
 };
 
-const of_unichar_t *const of_unicode_titlecase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeTitlecaseTable[0x1EA] = {
 	uppercasePage0, titlecasePage1, uppercasePage2, uppercasePage3,
 	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	titlecasePage16, emptyPage, emptyPage, uppercasePage19,
@@ -12740,22 +12740,22 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, uppercasePage489
 };
 
-const of_unichar_t *const of_unicode_casefolding_table[0x1EA] = {
-	casefoldingPage0, casefoldingPage1, lowercasePage2,
-	casefoldingPage3, lowercasePage4, lowercasePage5,
+const OFUnichar *const OFUnicodeCaseFoldingTable[0x1EA] = {
+	caseFoldingPage0, caseFoldingPage1, lowercasePage2,
+	caseFoldingPage3, lowercasePage4, lowercasePage5,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage16, emptyPage,
-	emptyPage, casefoldingPage19, emptyPage,
+	emptyPage, caseFoldingPage19, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
-	emptyPage, casefoldingPage28, emptyPage,
-	casefoldingPage30, casefoldingPage31, emptyPage,
+	emptyPage, caseFoldingPage28, emptyPage,
+	caseFoldingPage30, caseFoldingPage31, emptyPage,
 	lowercasePage33, emptyPage, emptyPage,
 	lowercasePage36, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, lowercasePage44,
 	emptyPage, emptyPage, emptyPage,
@@ -12798,11 +12798,11 @@
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage166, lowercasePage167,
 	emptyPage, emptyPage, emptyPage,
-	casefoldingPage171, emptyPage, emptyPage,
+	caseFoldingPage171, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
@@ -12907,11 +12907,11 @@
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	lowercasePage489
 };
 
-const char *const *of_unicode_decomposition_table[0x2FB] = {
+const char *const *OFUnicodeDecompositionTable[0x2FB] = {
 	decompositionPage0, decompositionPage1, decompositionPage2,
 	decompositionPage3, decompositionPage4, emptyDecompositionPage,
 	decompositionPage6, emptyDecompositionPage, emptyDecompositionPage,
 	decompositionPage9, decompositionPage10, decompositionPage11,
 	decompositionPage12, decompositionPage13, emptyDecompositionPage,
@@ -13165,11 +13165,11 @@
 	emptyDecompositionPage, emptyDecompositionPage, emptyDecompositionPage,
 	emptyDecompositionPage, decompositionPage760, decompositionPage761,
 	decompositionPage762
 };
 
-const char *const *of_unicode_decomposition_compat_table[0x2FB] = {
+const char *const *OFUnicodeDecompositionCompatTable[0x2FB] = {
 	decompCompatPage0, decompCompatPage1, decompCompatPage2,
 	decompCompatPage3, decompositionPage4, decompCompatPage5,
 	decompCompatPage6, emptyDecompositionPage, emptyDecompositionPage,
 	decompositionPage9, decompositionPage10, decompositionPage11,
 	decompCompatPage12, decompCompatPage13, decompCompatPage14,