It's not used right now, Syriac specific groups will be accomodated as additional joining types.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/gdi32/uniscribe/shaping.c | 356 ++++++++++++++++----------------- tools/make_unicode | 8 +- 2 files changed, 175 insertions(+), 189 deletions(-)
diff --git a/dlls/gdi32/uniscribe/shaping.c b/dlls/gdi32/uniscribe/shaping.c index 9779eb606d2..7beb763cf1c 100644 --- a/dlls/gdi32/uniscribe/shaping.c +++ b/dlls/gdi32/uniscribe/shaping.c @@ -4,7 +4,7 @@
#include "windef.h"
-const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2161] = +const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2099] = { /* level 1 offsets */ 0x0100, 0x010b, 0x010b, 0x011b, 0x0123, 0x012c, 0x013b, 0x014b, @@ -47,66 +47,66 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2161] = 0x0328, 0x0328, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0338, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0327, 0x0328, 0x0348, - 0x0356, 0x0315, 0x0315, 0x0315, 0x0366, 0x0376, 0x0385, 0x0395, - 0x0328, 0x03a5, 0x03b5, 0x03c4, 0x03d3, 0x03e3, 0x03f2, 0x0402, - 0x0412, 0x041a, 0x042a, 0x0316, 0x043a, 0x044a, 0x0328, 0x045a, - 0x046a, 0x047a, 0x048a, 0x0315, 0x0315, 0x0342, 0x049a, 0x04a0, - 0x04aa, 0x04af, 0x04bb, 0x0315, 0x04c9, 0x04d5, 0x0315, 0x04e5, - 0x04f1, 0x0501, 0x0315, 0x0315, 0x0315, 0x0511, 0x0521, 0x0530, - 0x0345, 0x0540, 0x0328, 0x03a2, 0x0315, 0x0315, 0x0550, 0x055f, - 0x056e, 0x057c, 0x0315, 0x058b, 0x0315, 0x0315, 0x0580, 0x059a, - 0x0315, 0x057c, 0x0317, 0x05a9, 0x0315, 0x0315, 0x0580, 0x05b8, - 0x058b, 0x0315, 0x05c4, 0x05a9, 0x0315, 0x0315, 0x0580, 0x05d3, - 0x0315, 0x057c, 0x05e1, 0x058b, 0x0315, 0x0315, 0x0319, 0x059a, - 0x0579, 0x057c, 0x0315, 0x058a, 0x0315, 0x0315, 0x0315, 0x057f, - 0x0315, 0x0315, 0x0315, 0x05f0, 0x0315, 0x0315, 0x058d, 0x0600, - 0x0579, 0x057c, 0x0315, 0x058b, 0x0315, 0x0315, 0x0319, 0x060e, - 0x0315, 0x057c, 0x0315, 0x03a3, 0x0315, 0x0315, 0x05ae, 0x059a, - 0x0315, 0x057c, 0x0315, 0x058b, 0x0315, 0x0315, 0x0315, 0x0582, - 0x061c, 0x0315, 0x0315, 0x0315, 0x056b, 0x0625, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0634, 0x05e3, 0x0315, 0x0315, - 0x0315, 0x0576, 0x0315, 0x0641, 0x0315, 0x0315, 0x0315, 0x0347, - 0x0651, 0x065e, 0x0328, 0x032b, 0x0586, 0x0315, 0x0315, 0x0315, - 0x058e, 0x066d, 0x0315, 0x05b1, 0x049a, 0x067c, 0x068a, 0x0318, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x058e, 0x0315, + 0x0356, 0x0315, 0x0315, 0x0315, 0x0366, 0x0376, 0x0385, 0x038d, + 0x0328, 0x039d, 0x03ad, 0x03b5, 0x03bd, 0x03c7, 0x03c7, 0x03d7, + 0x03e7, 0x03ef, 0x03ff, 0x0316, 0x040f, 0x041e, 0x0328, 0x042e, + 0x043c, 0x0448, 0x0457, 0x0315, 0x0315, 0x0342, 0x0467, 0x046d, + 0x03c7, 0x0477, 0x0483, 0x0315, 0x0491, 0x049d, 0x0315, 0x04ad, + 0x04b9, 0x04c9, 0x0315, 0x0315, 0x0315, 0x04d9, 0x04e8, 0x04f2, + 0x0345, 0x0502, 0x0328, 0x039a, 0x0315, 0x0315, 0x0512, 0x0521, + 0x0530, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0542, 0x055c, + 0x0315, 0x053e, 0x0317, 0x056b, 0x0315, 0x0315, 0x0542, 0x057a, + 0x054d, 0x0315, 0x0586, 0x056b, 0x0315, 0x0315, 0x0542, 0x0595, + 0x0315, 0x053e, 0x05a3, 0x054d, 0x0315, 0x0315, 0x0319, 0x055c, + 0x053b, 0x053e, 0x0315, 0x054c, 0x0315, 0x0315, 0x0315, 0x0541, + 0x0315, 0x0315, 0x0315, 0x05b2, 0x0315, 0x0315, 0x054f, 0x05c2, + 0x053b, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0319, 0x05d0, + 0x0315, 0x053e, 0x0315, 0x039b, 0x0315, 0x0315, 0x0570, 0x055c, + 0x0315, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0315, 0x0544, + 0x05de, 0x0315, 0x0315, 0x0315, 0x052d, 0x05e7, 0x0315, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0315, 0x05f6, 0x05a5, 0x0315, 0x0315, + 0x0315, 0x0538, 0x0315, 0x0603, 0x0315, 0x0315, 0x0315, 0x0347, + 0x0613, 0x0620, 0x0328, 0x032b, 0x0548, 0x0315, 0x0315, 0x0315, + 0x0550, 0x062f, 0x0315, 0x0573, 0x0467, 0x063e, 0x064c, 0x0318, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0550, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0698, 0x0315, 0x0698, 0x0315, 0x057c, 0x0315, 0x057c, - 0x0315, 0x0315, 0x0315, 0x06a4, 0x031f, 0x06ae, 0x0315, 0x0315, - 0x06bc, 0x0315, 0x04aa, 0x04aa, 0x04aa, 0x04aa, 0x04aa, 0x06cc, - 0x06d7, 0x04aa, 0x06de, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x06ee, 0x06fc, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0708, 0x0315, - 0x0315, 0x0315, 0x0714, 0x0722, 0x072f, 0x0315, 0x0315, 0x0315, - 0x0328, 0x049a, 0x0315, 0x0315, 0x0315, 0x03a1, 0x0315, 0x0315, - 0x073f, 0x058a, 0x0315, 0x074c, 0x03a1, 0x03a3, 0x0315, 0x075c, - 0x0315, 0x0315, 0x0315, 0x076a, 0x03a3, 0x0315, 0x0315, 0x058f, - 0x0779, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0789, 0x0798, 0x07a1, 0x0315, 0x0315, 0x0315, + 0x0315, 0x065a, 0x0315, 0x065a, 0x0315, 0x053e, 0x0315, 0x053e, + 0x0315, 0x0315, 0x0315, 0x0666, 0x031f, 0x0670, 0x0315, 0x0315, + 0x067e, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x068e, + 0x0699, 0x03c7, 0x06a0, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, + 0x06b0, 0x06be, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x06ca, 0x0315, + 0x0315, 0x0315, 0x06d6, 0x06e4, 0x06f1, 0x0315, 0x0315, 0x0315, + 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, 0x0399, 0x0315, 0x0315, + 0x0701, 0x054c, 0x0315, 0x070e, 0x0399, 0x039b, 0x0315, 0x071e, + 0x0315, 0x0315, 0x0315, 0x072c, 0x039b, 0x0315, 0x0315, 0x0551, + 0x073b, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, + 0x0315, 0x0315, 0x074b, 0x075a, 0x0763, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0328, 0x0328, 0x0328, 0x078f, 0x07ab, 0x0315, 0x05ca, - 0x0315, 0x0315, 0x0315, 0x07b9, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0328, 0x0328, 0x049a, 0x0315, 0x0315, 0x0315, + 0x0315, 0x0328, 0x0328, 0x0328, 0x0751, 0x076d, 0x0315, 0x058c, + 0x0315, 0x0315, 0x0315, 0x077b, 0x0315, 0x0315, 0x0315, 0x0315, + 0x0315, 0x0315, 0x0328, 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0316, 0x03a3, 0x0315, 0x0315, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0316, 0x039b, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0315, 0x0315, 0x0591, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x07c9, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x07d9, 0x0315, - 0x058d, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x03a3, 0x07e7, - 0x0315, 0x07f3, 0x0315, 0x04aa, 0x04aa, 0x04aa, 0x0803, 0x0315, - 0x0315, 0x0315, 0x0315, 0x057a, 0x0315, 0x0328, 0x05aa, 0x0315, - 0x0315, 0x080d, 0x0315, 0x035f, 0x03a3, 0x0315, 0x0315, 0x03a2, - 0x0315, 0x0315, 0x081b, 0x0315, 0x0315, 0x0587, 0x0315, 0x0315, - 0x05e2, 0x0826, 0x0833, 0x0315, 0x0315, 0x0580, 0x0315, 0x0315, - 0x0315, 0x0843, 0x058b, 0x0315, 0x05ad, 0x0586, 0x0315, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0315, 0x0315, 0x0553, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x078b, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x079b, 0x0315, + 0x054f, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x039b, 0x07a9, + 0x0315, 0x07b5, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x07c5, 0x0315, + 0x0315, 0x0315, 0x0315, 0x053c, 0x0315, 0x0328, 0x056c, 0x0315, + 0x0315, 0x07cf, 0x0315, 0x035f, 0x039b, 0x0315, 0x0315, 0x039a, + 0x0315, 0x0315, 0x07dd, 0x0315, 0x0315, 0x0549, 0x0315, 0x0315, + 0x05a4, 0x07e8, 0x07f5, 0x0315, 0x0315, 0x0542, 0x0315, 0x0315, + 0x0315, 0x0805, 0x054d, 0x0315, 0x056f, 0x0548, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0853, 0x0315, 0x0317, 0x0315, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0815, 0x0315, 0x0317, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0328, 0x0315, 0x0328, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0861, + 0x0315, 0x0315, 0x0315, 0x0315, 0x0823, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -120,46 +120,39 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2161] = 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0103, 0x0000, 0x0202, 0x0202, 0x0302, 0x0202, 0x0103, - 0x0202, 0x0403, 0x0502, 0x0403, 0x0403, 0x0603, 0x0603, 0x0603, - 0x0702, 0x0802, 0x0802, 0x0903, 0x0903, 0x0a03, 0x0a03, 0x0b03, - 0x0b03, 0x0c03, 0x0c03, 0x0d03, 0x0d03, 0x0e03, 0x0e03, 0x0e03, - 0x0003, 0x0f03, 0x1003, 0x1103, 0x1203, 0x1303, 0x1403, 0x1503, - 0x0302, 0x0103, 0x0103, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0403, 0x1003, - 0x0006, 0x0202, 0x0202, 0x0202, 0x0000, 0x0202, 0x0302, 0x0302, - 0x0103, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, - 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0702, - 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0802, - 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, - 0x0903, 0x0903, 0x0903, 0x0a03, 0x0a03, 0x0b03, 0x0c03, 0x0f03, - 0x0f03, 0x0f03, 0x0f03, 0x0f03, 0x0f03, 0x1003, 0x1003, 0x0d03, - 0x1603, 0x0d03, 0x1103, 0x1103, 0x1103, 0x0d03, 0x0d03, 0x0d03, - 0x0d03, 0x0d03, 0x1203, 0x1203, 0x1203, 0x1203, 0x1403, 0x1403, - 0x1403, 0x1403, 0x1703, 0x1803, 0x0603, 0x0502, 0x1503, 0x1503, - 0x0502, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, - 0x0302, 0x0e03, 0x0102, 0x0e03, 0x0302, 0x0103, 0x0103, 0x0102, - 0x0102, 0x0000, 0x0502, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0702, 0x0802, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0903, - 0x0a03, 0x0c03, 0x0000, 0x0000, 0x1803, 0x1902, 0x0006, 0x1a03, - 0x1b03, 0x1b03, 0x1c02, 0x1c02, 0x1d02, 0x1e02, 0x1f02, 0x2003, - 0x2103, 0x2103, 0x2203, 0x2202, 0x2303, 0x2403, 0x2503, 0x2603, - 0x2703, 0x2803, 0x2903, 0x2a03, 0x2b03, 0x2c02, 0x2d03, 0x1c02, - 0x2e03, 0x2f02, 0x1a03, 0x1b03, 0x1c02, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x3002, 0x3103, 0x3203, 0x0403, 0x0403, 0x0403, - 0x0403, 0x0403, 0x0403, 0x0403, 0x0603, 0x0603, 0x0702, 0x0702, - 0x0802, 0x0903, 0x0c03, 0x0c03, 0x0c03, 0x0f03, 0x0f03, 0x0d03, - 0x0d03, 0x0d03, 0x1303, 0x1303, 0x1403, 0x1403, 0x1403, 0x1203, - 0x0802, 0x0802, 0x0903, 0x0603, 0x0603, 0x0903, 0x0802, 0x0603, - 0x0202, 0x0202, 0x0e03, 0x0e03, 0x0103, 0x0302, 0x0302, 0x3303, - 0x3303, 0x0603, 0x0903, 0x0903, 0x1103, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0003, 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, 0x0003, + 0x0002, 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0003, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, + 0x0006, 0x0002, 0x0002, 0x0002, 0x0000, 0x0002, 0x0002, 0x0002, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0002, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0003, 0x0002, + 0x0003, 0x0002, 0x0003, 0x0003, 0x0002, 0x0002, 0x0000, 0x0002, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0000, + 0x0000, 0x0003, 0x0002, 0x0006, 0x0003, 0x0003, 0x0003, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0002, 0x0003, 0x0002, 0x0003, 0x0002, 0x0003, 0x0003, + 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, + 0x0003, 0x0003, 0x0003, 0x0002, 0x0003, 0x0002, 0x0002, 0x0003, + 0x0003, 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, @@ -169,117 +162,116 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2161] = 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0003, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x3403, 0x3400, 0x3403, 0x3403, - 0x3403, 0x3403, 0x3400, 0x3402, 0x3403, 0x3402, 0x3402, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0403, 0x0403, 0x0603, 0x0b03, - 0x0f03, 0x1003, 0x1203, 0x1303, 0x0103, 0x0103, 0x0802, 0x0302, - 0x3502, 0x0000, 0x0702, 0x0a03, 0x0d03, 0x3602, 0x0802, 0x0c03, - 0x1103, 0x0000, 0x0403, 0x0403, 0x0403, 0x0802, 0x0103, 0x3703, - 0x3703, 0x3703, 0x0403, 0x0403, 0x0603, 0x0d03, 0x0c03, 0x3703, - 0x0603, 0x0603, 0x1203, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, + 0x0002, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, - 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0003, 0x0000, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0003, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0003, 0x0003, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000 };
const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = diff --git a/tools/make_unicode b/tools/make_unicode index ace19592a52..27ce80432a8 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1603,10 +1603,6 @@ sub dump_bracket($) sub dump_shaping($) { my $filename = shift; - my %groups; - my $next_group = 0; - - $groups{"No_Joining_Group"} = $next_group++;
my $INPUT = open_data_file( $UNIDATA, "ArabicShaping.txt" ); while (<$INPUT>) @@ -1617,9 +1613,7 @@ sub dump_shaping($) if (/^\s*([0-9a-fA-F]+)\s*;.*;\s*([RLDCUT])\s*;\s*(\w+)/) { my $type = $2; - my $group = $3; - $groups{$group} = $next_group++ unless defined $groups{$group}; - $joining_table[hex $1] = $joining_types{$type} | ($groups{$group} << 8); + $joining_table[hex $1] = $joining_types{$type}; next; } die "malformed line $_";