diff options
Diffstat (limited to 'ext/mbstring')
200 files changed, 2322 insertions, 2322 deletions
diff --git a/ext/mbstring/libmbfl/filters/cp932_table.h b/ext/mbstring/libmbfl/filters/cp932_table.h index d8cbb7f0a8..90ea068624 100644 --- a/ext/mbstring/libmbfl/filters/cp932_table.h +++ b/ext/mbstring/libmbfl/filters/cp932_table.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/emoji2uni.h b/ext/mbstring/libmbfl/filters/emoji2uni.h index 37f44c5964..adce0b75d4 100644 --- a/ext/mbstring/libmbfl/filters/emoji2uni.h +++ b/ext/mbstring/libmbfl/filters/emoji2uni.h @@ -2,296 +2,296 @@ static const int mb_tbl_code2uni_docomo1_min = 0x28c2; static const int mb_tbl_code2uni_docomo1_max = 0x29db; static const unsigned short mb_tbl_code2uni_docomo1[] = { // 0x28c2 - 0x29db - 0x2600, 0x2601, 0x2614, 0x26c4, - 0x26a1, 0xf300, 0xf301, 0xf302, - 0x2648, 0x2649, 0x264a, 0x264b, - 0x264c, 0x264d, 0x264e, 0x264f, - 0x2650, 0x2651, 0x2652, 0x2653, - 0xf3bd, 0x26be, 0x26f3, 0xf3be, - 0x26bd, 0xf3bf, 0xf3c0, 0xf3c1, - 0xf4df, 0xf683, 0x24c2, 0xf684, - 0xf697, 0xf699, 0xf68c, 0xf6a2, - 0x2708, 0xf3e0, 0xf3e2, 0xf3e3, - 0xf3e5, 0xf3e6, 0xf3e7, 0xf3e8, - 0xf3ea, 0x26fd, 0xf17f, 0xf6a5, - 0xf6bb, 0xf374, 0x2615, 0xf378, - 0xf37a, 0xf354, 0xf460, 0x2702, - 0xf3a4, 0xf3a5, 0x2197, 0xf3a0, - 0xf3a7, 0xf3a8, 0xf3a9, 0xf3aa, - 0xf3ab, 0xf6ac, 0xf6ad, 0xf4f7, - 0xf45c, 0xf4d6, 0xf380, 0xf381, - 0xf382, 0x260e, 0xf4f1, 0xf4dd, - 0xf4fa, 0xf3ae, 0xf4bf, 0x2665, - 0x2660, 0x2666, 0x2663, 0xf440, - 0xf442, 0x270a, 0x270c, 0x270b, - 0x2198, 0x2196, 0xf463, 0xf45f, - 0xf453, 0x267f, 0xf311, 0xf314, - 0xf313, 0xf319, 0xf315, 0xf436, - 0xf431, 0x26f5, 0xf384, 0x2199, - 0xEE16, 0xEE17, 0xEE18, 0xEE19, - 0xEE1A, 0xEE1B, 0xf3ac, 0xf45d, - 0x2712, 0xEE1C, 0xEE1D, 0xf464, - 0xf4ba, 0xf303, 0xEE1E, 0xEE1F, - 0xEE20, 0xf51c, 0xf51b, 0xf51a, - 0x23f0, 0xEE21, 0xEE22, 0xEE23, - 0xEE24, 0xEE25, 0xEE26, 0xEE27, - 0xEE28, 0xEE29, 0xEE2A, 0xEE2B, - 0xEE2C, 0xEE2D, 0xEE2E, 0xEE2F, - 0xEE30, 0xEE31, 0xEE32, 0xEE33, - 0xf4f2, 0xf4e9, 0xf4e0, 0xEE10, - 0xEE11, 0x2709, 0xEE12, 0xEE13, - 0xf4b4, 0xf193, 0xf194, 0xf511, - 0x21a9, 0xf191, 0xf50d, 0xf195, - 0xf6a9, 0x27bf, 0x0023, 0xE82D, - 0x0031, 0x0032, 0x0033, 0x0034, - 0x0035, 0x0036, 0x0037, 0x0038, - 0x0039, 0x0030, 0x2764, 0xf493, - 0xf494, 0xf495, 0xf603, 0xf620, - 0xf61e, 0xf616, 0xf635, 0x2934, - 0xf3b5, 0x2668, 0xf4a0, 0xf48b, - 0x2728, 0xf4a1, 0xf4a2, 0xf44a, - 0xf4a3, 0xf3b6, 0x2935, 0xf4a4, - 0x2757, 0x2049, 0x203c, 0xf4a5, - 0xf4a6, 0xf4a7, 0xf4a8, 0x3030, - 0x27b0, 0xf197, 0xEE14, 0xEE15, - 0xf455, 0xf45b, 0xf484, 0xf456, - 0xf3c2, 0xf514, 0xf6aa, 0xf4b0, - 0xf4bb, 0xf48c, 0xf527, 0x270f, - 0xf451, 0xf48d, 0x23f3, 0xf6b2, - 0xf375, 0x231a, 0xf614, 0xf60c, - 0xf605, 0xf613, 0xf621, 0xf612, - 0xf60d, 0xf44d, 0xf61c, 0xf609, - 0xf606, 0xf623, 0xf60f, 0xf62d, - 0xf622, 0xf196, 0xf4ce, 0x00a9, - 0x2122, 0xf3c3, 0x3299, 0x267b, - 0x00ae, 0x26a0, 0xf232, 0xf233, - 0xf234, 0xf235, 0x2194, 0x2195, - 0xf3eb, 0xf30a, 0xf5fb, 0xf340, - 0xf352, 0xf337, 0xf34c, 0xf34e, - 0xf331, 0xf341, 0xf338, 0xf359, - 0xf370, 0xf376, 0xf35c, 0xf35e, - 0xf40c, 0xf424, 0xf427, 0xf41f, - 0xf60b, 0xf601, 0xf434, 0xf437, + 0x2600, 0x2601, 0x2614, 0x26c4, + 0x26a1, 0xf300, 0xf301, 0xf302, + 0x2648, 0x2649, 0x264a, 0x264b, + 0x264c, 0x264d, 0x264e, 0x264f, + 0x2650, 0x2651, 0x2652, 0x2653, + 0xf3bd, 0x26be, 0x26f3, 0xf3be, + 0x26bd, 0xf3bf, 0xf3c0, 0xf3c1, + 0xf4df, 0xf683, 0x24c2, 0xf684, + 0xf697, 0xf699, 0xf68c, 0xf6a2, + 0x2708, 0xf3e0, 0xf3e2, 0xf3e3, + 0xf3e5, 0xf3e6, 0xf3e7, 0xf3e8, + 0xf3ea, 0x26fd, 0xf17f, 0xf6a5, + 0xf6bb, 0xf374, 0x2615, 0xf378, + 0xf37a, 0xf354, 0xf460, 0x2702, + 0xf3a4, 0xf3a5, 0x2197, 0xf3a0, + 0xf3a7, 0xf3a8, 0xf3a9, 0xf3aa, + 0xf3ab, 0xf6ac, 0xf6ad, 0xf4f7, + 0xf45c, 0xf4d6, 0xf380, 0xf381, + 0xf382, 0x260e, 0xf4f1, 0xf4dd, + 0xf4fa, 0xf3ae, 0xf4bf, 0x2665, + 0x2660, 0x2666, 0x2663, 0xf440, + 0xf442, 0x270a, 0x270c, 0x270b, + 0x2198, 0x2196, 0xf463, 0xf45f, + 0xf453, 0x267f, 0xf311, 0xf314, + 0xf313, 0xf319, 0xf315, 0xf436, + 0xf431, 0x26f5, 0xf384, 0x2199, + 0xEE16, 0xEE17, 0xEE18, 0xEE19, + 0xEE1A, 0xEE1B, 0xf3ac, 0xf45d, + 0x2712, 0xEE1C, 0xEE1D, 0xf464, + 0xf4ba, 0xf303, 0xEE1E, 0xEE1F, + 0xEE20, 0xf51c, 0xf51b, 0xf51a, + 0x23f0, 0xEE21, 0xEE22, 0xEE23, + 0xEE24, 0xEE25, 0xEE26, 0xEE27, + 0xEE28, 0xEE29, 0xEE2A, 0xEE2B, + 0xEE2C, 0xEE2D, 0xEE2E, 0xEE2F, + 0xEE30, 0xEE31, 0xEE32, 0xEE33, + 0xf4f2, 0xf4e9, 0xf4e0, 0xEE10, + 0xEE11, 0x2709, 0xEE12, 0xEE13, + 0xf4b4, 0xf193, 0xf194, 0xf511, + 0x21a9, 0xf191, 0xf50d, 0xf195, + 0xf6a9, 0x27bf, 0x0023, 0xE82D, + 0x0031, 0x0032, 0x0033, 0x0034, + 0x0035, 0x0036, 0x0037, 0x0038, + 0x0039, 0x0030, 0x2764, 0xf493, + 0xf494, 0xf495, 0xf603, 0xf620, + 0xf61e, 0xf616, 0xf635, 0x2934, + 0xf3b5, 0x2668, 0xf4a0, 0xf48b, + 0x2728, 0xf4a1, 0xf4a2, 0xf44a, + 0xf4a3, 0xf3b6, 0x2935, 0xf4a4, + 0x2757, 0x2049, 0x203c, 0xf4a5, + 0xf4a6, 0xf4a7, 0xf4a8, 0x3030, + 0x27b0, 0xf197, 0xEE14, 0xEE15, + 0xf455, 0xf45b, 0xf484, 0xf456, + 0xf3c2, 0xf514, 0xf6aa, 0xf4b0, + 0xf4bb, 0xf48c, 0xf527, 0x270f, + 0xf451, 0xf48d, 0x23f3, 0xf6b2, + 0xf375, 0x231a, 0xf614, 0xf60c, + 0xf605, 0xf613, 0xf621, 0xf612, + 0xf60d, 0xf44d, 0xf61c, 0xf609, + 0xf606, 0xf623, 0xf60f, 0xf62d, + 0xf622, 0xf196, 0xf4ce, 0x00a9, + 0x2122, 0xf3c3, 0x3299, 0x267b, + 0x00ae, 0x26a0, 0xf232, 0xf233, + 0xf234, 0xf235, 0x2194, 0x2195, + 0xf3eb, 0xf30a, 0xf5fb, 0xf340, + 0xf352, 0xf337, 0xf34c, 0xf34e, + 0xf331, 0xf341, 0xf338, 0xf359, + 0xf370, 0xf376, 0xf35c, 0xf35e, + 0xf40c, 0xf424, 0xf427, 0xf41f, + 0xf60b, 0xf601, 0xf434, 0xf437, 0xf377, 0xf631, }; static const int mb_tbl_code2uni_kddi1_min = 0x24b8; static const int mb_tbl_code2uni_kddi1_max = 0x25c6; static const unsigned short mb_tbl_code2uni_kddi1[] = { // 0x24b8 - 0x25c6 - 0xf342, 0xf4bc, 0x26f2, 0x26fa, - 0xf004, 0xf19a, 0xf3c6, 0xf422, - 0xf1ea, 0xf1f7, 0xf6a7, 0xf6c0, - 0xf38c, 0xf306, 0xf423, 0xf4b9, - 0xf46e, 0xf3e3, 0xf3e5, 0xf3eb, - 0xf3e8, 0xf6a2, 0xf51e, 0xf4f6, - 0xf192, 0xf239, 0xf202, 0xf194, - 0xf235, 0xf233, 0xf22f, 0xf23a, - 0xf446, 0xf447, 0xf52e, 0xf4f3, - 0xf4f4, 0xf4dd, 0xf454, 0xf33a, - 0xf490, 0xf335, 0xf376, 0xf37b, - 0x3297, 0xf48a, 0xf388, 0xf389, - 0xEE42, 0xf452, 0xf462, 0xf485, - 0xf487, 0xf488, 0xf458, 0xf459, - 0x2665, 0xf496, 0xf499, 0xf49a, - 0xf49b, 0xf49c, 0x2728, 0xf3bf, - 0x2b55, 0xf375, 0xf35e, 0xf366, - 0xf35f, 0xf361, 0xf358, 0xf35a, - 0xf35d, 0xf35b, 0xf362, 0xf363, - 0xf34e, 0xf34a, 0xf345, 0xf346, - 0xf371, 0xf372, 0xf60f, 0xf614, - 0xf624, 0xf623, 0xf616, 0xf62a, - 0xf60c, 0xf628, 0xf637, 0xf633, - 0xf612, 0xf632, 0xf630, 0xf3bc, - 0xf60a, 0xf61a, 0xf618, 0xf443, - 0xf444, 0xf64f, 0xf44f, 0xf44c, - 0xf44e, 0xf44b, 0xf645, 0xf646, - 0xf647, 0xf491, 0xf46f, 0xf3ba, - 0xf3b1, 0xf3ca, 0xf692, 0xf691, - 0xf693, 0xf3a2, 0xf38d, 0xf38e, - 0xf393, 0xf392, 0xf38f, 0xf302, - 0xf470, 0xf367, 0xf387, 0xf41a, - 0xf390, 0xf383, 0xf391, 0xf385, - 0xf303, 0xf308, 0xf3e9, 0xf305, - 0xf3a9, 0xf3ec, 0xf3ef, 0xf3f0, - 0xf3ed, 0xf1eb, 0xf1e9, 0xf1ee, - 0xf1ec, 0xf1e8, 0xf1f0, 0xf471, - 0xf472, 0xf473, 0xf474, 0xf475, - 0xf476, 0xf477, 0xf478, 0xf42c, - 0xf483, 0xf420, 0xf41b, 0xf418, - 0xf428, 0xf42e, 0xf40d, 0xf414, - 0xf417, 0xf42b, 0xf170, 0xf171, - 0xf17e, 0xf18e, 0xf463, 0xf45f, - 0xf6a9, 0x2934, 0x2935, 0x2049, - 0x203c, 0x27b0, 0xf348, 0xf34d, - 0xf347, 0xf34c, 0xf33d, 0xf344, - 0xf330, 0xf351, 0xf360, 0xf355, - 0xf357, 0xf38b, 0xf379, 0xf432, - 0xf3b9, 0xf3c4, 0xf3a3, 0xf3b3, - 0xf479, 0xf47a, 0xf43c, 0xf445, - 0xf43d, 0xf33c, 0xf368, 0xf369, - 0xf36a, 0xf36b, 0xf36c, 0xf36d, - 0xf648, 0xf64a, 0xf649, 0xf30b, - 0xf49d, 0xf524, 0xf36e, 0xf41d, - 0xf41e, 0xf36f, 0xf34f, 0xf4b8, - 0xf4ab, 0xf621, 0xf63e, 0xf30c, - 0xf63d, 0xf63a, 0xf4e9, 0xf639, - 0xf602, 0xf63b, 0xf640, 0xf629, - 0xf63f, 0xf622, 0xf63c, 0xf457, - 0xf5ff, 0xf689, 0xf3b4, 0xf0cf, - 0xf364, 0xf4e7, 0xf6b6, 0xf6a8, - 0xEE43, 0xf493, 0xf425, 0xf456, - 0xf48c, 0x267b, 0x2194, 0x2195, - 0xf30a, 0xf331, 0xf40c, 0xf638, - 0xf601, 0xEE44, 0xf33f, 0x270a, - 0x0023, 0xf64b, 0xf64c, 0xf64d, + 0xf342, 0xf4bc, 0x26f2, 0x26fa, + 0xf004, 0xf19a, 0xf3c6, 0xf422, + 0xf1ea, 0xf1f7, 0xf6a7, 0xf6c0, + 0xf38c, 0xf306, 0xf423, 0xf4b9, + 0xf46e, 0xf3e3, 0xf3e5, 0xf3eb, + 0xf3e8, 0xf6a2, 0xf51e, 0xf4f6, + 0xf192, 0xf239, 0xf202, 0xf194, + 0xf235, 0xf233, 0xf22f, 0xf23a, + 0xf446, 0xf447, 0xf52e, 0xf4f3, + 0xf4f4, 0xf4dd, 0xf454, 0xf33a, + 0xf490, 0xf335, 0xf376, 0xf37b, + 0x3297, 0xf48a, 0xf388, 0xf389, + 0xEE42, 0xf452, 0xf462, 0xf485, + 0xf487, 0xf488, 0xf458, 0xf459, + 0x2665, 0xf496, 0xf499, 0xf49a, + 0xf49b, 0xf49c, 0x2728, 0xf3bf, + 0x2b55, 0xf375, 0xf35e, 0xf366, + 0xf35f, 0xf361, 0xf358, 0xf35a, + 0xf35d, 0xf35b, 0xf362, 0xf363, + 0xf34e, 0xf34a, 0xf345, 0xf346, + 0xf371, 0xf372, 0xf60f, 0xf614, + 0xf624, 0xf623, 0xf616, 0xf62a, + 0xf60c, 0xf628, 0xf637, 0xf633, + 0xf612, 0xf632, 0xf630, 0xf3bc, + 0xf60a, 0xf61a, 0xf618, 0xf443, + 0xf444, 0xf64f, 0xf44f, 0xf44c, + 0xf44e, 0xf44b, 0xf645, 0xf646, + 0xf647, 0xf491, 0xf46f, 0xf3ba, + 0xf3b1, 0xf3ca, 0xf692, 0xf691, + 0xf693, 0xf3a2, 0xf38d, 0xf38e, + 0xf393, 0xf392, 0xf38f, 0xf302, + 0xf470, 0xf367, 0xf387, 0xf41a, + 0xf390, 0xf383, 0xf391, 0xf385, + 0xf303, 0xf308, 0xf3e9, 0xf305, + 0xf3a9, 0xf3ec, 0xf3ef, 0xf3f0, + 0xf3ed, 0xf1eb, 0xf1e9, 0xf1ee, + 0xf1ec, 0xf1e8, 0xf1f0, 0xf471, + 0xf472, 0xf473, 0xf474, 0xf475, + 0xf476, 0xf477, 0xf478, 0xf42c, + 0xf483, 0xf420, 0xf41b, 0xf418, + 0xf428, 0xf42e, 0xf40d, 0xf414, + 0xf417, 0xf42b, 0xf170, 0xf171, + 0xf17e, 0xf18e, 0xf463, 0xf45f, + 0xf6a9, 0x2934, 0x2935, 0x2049, + 0x203c, 0x27b0, 0xf348, 0xf34d, + 0xf347, 0xf34c, 0xf33d, 0xf344, + 0xf330, 0xf351, 0xf360, 0xf355, + 0xf357, 0xf38b, 0xf379, 0xf432, + 0xf3b9, 0xf3c4, 0xf3a3, 0xf3b3, + 0xf479, 0xf47a, 0xf43c, 0xf445, + 0xf43d, 0xf33c, 0xf368, 0xf369, + 0xf36a, 0xf36b, 0xf36c, 0xf36d, + 0xf648, 0xf64a, 0xf649, 0xf30b, + 0xf49d, 0xf524, 0xf36e, 0xf41d, + 0xf41e, 0xf36f, 0xf34f, 0xf4b8, + 0xf4ab, 0xf621, 0xf63e, 0xf30c, + 0xf63d, 0xf63a, 0xf4e9, 0xf639, + 0xf602, 0xf63b, 0xf640, 0xf629, + 0xf63f, 0xf622, 0xf63c, 0xf457, + 0xf5ff, 0xf689, 0xf3b4, 0xf0cf, + 0xf364, 0xf4e7, 0xf6b6, 0xf6a8, + 0xEE43, 0xf493, 0xf425, 0xf456, + 0xf48c, 0x267b, 0x2194, 0x2195, + 0xf30a, 0xf331, 0xf40c, 0xf638, + 0xf601, 0xEE44, 0xf33f, 0x270a, + 0x0023, 0xf64b, 0xf64c, 0xf64d, 0xf64e, 0xEE45, 0xEE46, 0xEE47, 0xEE48, 0xEE49, 0xEE4A}; static const int mb_tbl_code2uni_kddi2_min = 0x26ec; static const int mb_tbl_code2uni_kddi2_max = 0x2863; static const unsigned short mb_tbl_code2uni_kddi2[] = { // 0x26ec - 0x2863 - 0xf320, 0xf300, 0xf6a5, 0xf3c3, - 0x2747, 0xf3a1, 0xf3b0, 0xf38a, - 0xf433, 0xf603, 0xf620, 0xf62d, - 0xf62b, 0xf4a4, 0xf4a1, 0xf494, - 0xf495, 0x2734, 0xf4a3, 0xf525, - 0x23f3, 0xf6ac, 0xf6ad, 0x267f, - 0xf530, 0x26a0, 0x2757, 0x2753, - 0x26d4, 0x26c4, 0xf319, 0x26a1, - 0x2600, 0xf31b, 0x2744, 0x2b50, - 0x2614, 0x2601, 0x26c5, 0x2648, - 0x2649, 0x264a, 0x264b, 0x264c, - 0x264d, 0x264e, 0x264f, 0x2650, - 0x2651, 0x2652, 0x2653, 0x26ce, - 0xf45c, 0xf4d4, 0xf3ab, 0xf4d6, - 0xf4ce, 0x270f, 0xf4d0, 0xf3e7, - 0xf3ea, 0xf6bb, 0xf17f, 0xf68f, - 0xf4e1, 0x2693, 0xf3e6, 0xf3e0, - 0xf374, 0xf3e2, 0xf6b2, 0xf68c, - 0xf685, 0xf697, 0xf69a, 0x2708, - 0x26f5, 0xf683, 0x26bd, 0xf3be, - 0xf3c2, 0xf3c1, 0x26be, 0xf3c8, - 0x2668, 0xf3ee, 0xf3ac, 0xf309, - 0xf5fc, 0xf377, 0xf378, 0xf37a, - 0xf356, 0xf3af, 0xf3ae, 0xf4b0, - 0xf3b2, 0xf384, 0xf338, 0xf47b, - 0xf1ef, 0xf349, 0xf341, 0xf381, - 0xf370, 0xf373, 0xf352, 0xf421, - 0xf353, 0xf359, 0xf354, 0xf430, - 0xf434, 0xf435, 0xf438, 0xf431, - 0xf427, 0xf41c, 0xf437, 0xf429, - 0xf424, 0xf436, 0xf334, 0xf33b, - 0xf337, 0xf4a2, 0xf4a7, 0xf61c, - 0xf198, 0xf4aa, 0xf498, 0xf48b, - 0xf47e, 0xf365, 0xf43e, 0xf47f, - 0xf4ae, 0x3299, 0xf4af, 0xf44a, - 0xf4a8, 0xf4a9, 0x261d, 0xf250, - 0xf480, 0xf44d, 0xf469, 0x263a, - 0xf468, 0xf4ac, 0xf453, 0xf448, - 0xf449, 0xf46a, 0xf4fa, 0xf3a4, - 0xf45b, 0xf3b6, 0xf3b8, 0xf3bb, - 0xf3a7, 0xf484, 0xf52b, 0xf486, - 0xf4bf, 0xf45a, 0xf47d, 0xf199, - 0xf489, 0xf50a, 0xf514, 0xf340, - 0xf48d, 0xf4f7, 0x2702, 0xf3a5, - 0xf50d, 0xf511, 0xf460, 0xf4ea, - 0xf512, 0xf4db, 0xf4de, 0xf4e6, - 0xf4e0, 0x2709, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0xf51f, - 0xE82D, 0x25c0, 0x25b6, 0x23ea, - 0x23e9, 0x25ab, 0x25aa, 0x2139, - 0x25fd, 0x25fe, 0xf538, 0xf539, - 0x25fb, 0x25fc, 0x26aa, 0x26ab, - 0x2795, 0x2796, 0x2733, 0x2b06, - 0x2b07, 0xf6ab, 0xf53d, 0xf53c, - 0x23ec, 0x23eb, 0xf536, 0xf537, - 0x2b1c, 0x2b1b, 0xf534, 0xf535, - 0x2196, 0x2198, 0x2122, 0x2716, - 0x274c, 0x274e, 0x27a1, 0x2b05, - 0x2797, 0x2197, 0x2199, 0x2714, - 0x00a9, 0x00ae, 0xf53a, 0xf53b, - 0x21aa, 0x21a9, 0x2705, 0xf4dc, - 0xf4cd, 0xf4c3, 0xf4be, 0xf4c5, - 0xf4cb, 0xf4d7, 0xf4d8, 0xf4d9, - 0xf4d5, 0xf4c4, 0xf4c6, 0xf4d3, - 0xf4c7, 0xf4cc, 0xf4d2, 0xf4da, - 0xf4cf, 0x26fd, 0xf5fe, 0xf1fa, - 0xf4ca, 0xf4c8, 0xf4c9, 0xEE40, - 0xf193, 0xf4b2, 0x231a, 0x231b, - 0xf4b3, 0xf4b4, 0xf4f9, 0xf52a, - 0xf4fc, 0xf529, 0xf4bd, 0xf526, - 0xf50b, 0xf4b5, 0xE83C, 0xf527, - 0xf4f1, 0xf50c, 0xf517, 0xf4f0, - 0x2003, 0x2002, 0x2005, 0xf4c1, - 0xf4c2, 0xf4e8, 0xf4e4, 0xf4e5, - 0x23f0, 0x2764, 0x260e, 0x2615, - 0xf301, 0x26f3, 0xf3c0, 0xf4df, - 0xf3a8, 0xf3ad, 0xf3aa, 0xf380, - 0xf382, 0x2660, 0x2666, 0x2663, - 0xf440, 0xf442, 0x270c, 0x270b, - 0xf311, 0xf314, 0xf313, 0xf191, - 0x0030, 0xf197, 0xf635, 0xf49e, - 0xf4a5, 0xf4a6, 0xEE41, 0xf30f, - 0xf35c, 0xEB89, 0xf510, 0xf520, - 0xf521, 0xf522, 0xf523, 0xf251, - 0x2611, 0x2712, 0xf518, 0xf50e, - 0xf519, 0xf516, 0xf4f2, 0xf3e1, - 0xf4eb, 0xf4d1, 0xf50f, 0xf503, - 0xf195, 0xf455, 0xf45e, 0xf4bb, - 0xf4fb, 0xf339, 0x26ea, 0xf687, - 0xf5fb, 0xf3b5, 0xf47c, 0xf42f, - 0xf43b, 0xf42d, 0xf609, 0xf60d, - 0xf631, 0xf613, 0xf419, 0xf680, - 0xf451, 0xf48f, 0xf528, 0xf386, + 0xf320, 0xf300, 0xf6a5, 0xf3c3, + 0x2747, 0xf3a1, 0xf3b0, 0xf38a, + 0xf433, 0xf603, 0xf620, 0xf62d, + 0xf62b, 0xf4a4, 0xf4a1, 0xf494, + 0xf495, 0x2734, 0xf4a3, 0xf525, + 0x23f3, 0xf6ac, 0xf6ad, 0x267f, + 0xf530, 0x26a0, 0x2757, 0x2753, + 0x26d4, 0x26c4, 0xf319, 0x26a1, + 0x2600, 0xf31b, 0x2744, 0x2b50, + 0x2614, 0x2601, 0x26c5, 0x2648, + 0x2649, 0x264a, 0x264b, 0x264c, + 0x264d, 0x264e, 0x264f, 0x2650, + 0x2651, 0x2652, 0x2653, 0x26ce, + 0xf45c, 0xf4d4, 0xf3ab, 0xf4d6, + 0xf4ce, 0x270f, 0xf4d0, 0xf3e7, + 0xf3ea, 0xf6bb, 0xf17f, 0xf68f, + 0xf4e1, 0x2693, 0xf3e6, 0xf3e0, + 0xf374, 0xf3e2, 0xf6b2, 0xf68c, + 0xf685, 0xf697, 0xf69a, 0x2708, + 0x26f5, 0xf683, 0x26bd, 0xf3be, + 0xf3c2, 0xf3c1, 0x26be, 0xf3c8, + 0x2668, 0xf3ee, 0xf3ac, 0xf309, + 0xf5fc, 0xf377, 0xf378, 0xf37a, + 0xf356, 0xf3af, 0xf3ae, 0xf4b0, + 0xf3b2, 0xf384, 0xf338, 0xf47b, + 0xf1ef, 0xf349, 0xf341, 0xf381, + 0xf370, 0xf373, 0xf352, 0xf421, + 0xf353, 0xf359, 0xf354, 0xf430, + 0xf434, 0xf435, 0xf438, 0xf431, + 0xf427, 0xf41c, 0xf437, 0xf429, + 0xf424, 0xf436, 0xf334, 0xf33b, + 0xf337, 0xf4a2, 0xf4a7, 0xf61c, + 0xf198, 0xf4aa, 0xf498, 0xf48b, + 0xf47e, 0xf365, 0xf43e, 0xf47f, + 0xf4ae, 0x3299, 0xf4af, 0xf44a, + 0xf4a8, 0xf4a9, 0x261d, 0xf250, + 0xf480, 0xf44d, 0xf469, 0x263a, + 0xf468, 0xf4ac, 0xf453, 0xf448, + 0xf449, 0xf46a, 0xf4fa, 0xf3a4, + 0xf45b, 0xf3b6, 0xf3b8, 0xf3bb, + 0xf3a7, 0xf484, 0xf52b, 0xf486, + 0xf4bf, 0xf45a, 0xf47d, 0xf199, + 0xf489, 0xf50a, 0xf514, 0xf340, + 0xf48d, 0xf4f7, 0x2702, 0xf3a5, + 0xf50d, 0xf511, 0xf460, 0xf4ea, + 0xf512, 0xf4db, 0xf4de, 0xf4e6, + 0xf4e0, 0x2709, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, + 0x0037, 0x0038, 0x0039, 0xf51f, + 0xE82D, 0x25c0, 0x25b6, 0x23ea, + 0x23e9, 0x25ab, 0x25aa, 0x2139, + 0x25fd, 0x25fe, 0xf538, 0xf539, + 0x25fb, 0x25fc, 0x26aa, 0x26ab, + 0x2795, 0x2796, 0x2733, 0x2b06, + 0x2b07, 0xf6ab, 0xf53d, 0xf53c, + 0x23ec, 0x23eb, 0xf536, 0xf537, + 0x2b1c, 0x2b1b, 0xf534, 0xf535, + 0x2196, 0x2198, 0x2122, 0x2716, + 0x274c, 0x274e, 0x27a1, 0x2b05, + 0x2797, 0x2197, 0x2199, 0x2714, + 0x00a9, 0x00ae, 0xf53a, 0xf53b, + 0x21aa, 0x21a9, 0x2705, 0xf4dc, + 0xf4cd, 0xf4c3, 0xf4be, 0xf4c5, + 0xf4cb, 0xf4d7, 0xf4d8, 0xf4d9, + 0xf4d5, 0xf4c4, 0xf4c6, 0xf4d3, + 0xf4c7, 0xf4cc, 0xf4d2, 0xf4da, + 0xf4cf, 0x26fd, 0xf5fe, 0xf1fa, + 0xf4ca, 0xf4c8, 0xf4c9, 0xEE40, + 0xf193, 0xf4b2, 0x231a, 0x231b, + 0xf4b3, 0xf4b4, 0xf4f9, 0xf52a, + 0xf4fc, 0xf529, 0xf4bd, 0xf526, + 0xf50b, 0xf4b5, 0xE83C, 0xf527, + 0xf4f1, 0xf50c, 0xf517, 0xf4f0, + 0x2003, 0x2002, 0x2005, 0xf4c1, + 0xf4c2, 0xf4e8, 0xf4e4, 0xf4e5, + 0x23f0, 0x2764, 0x260e, 0x2615, + 0xf301, 0x26f3, 0xf3c0, 0xf4df, + 0xf3a8, 0xf3ad, 0xf3aa, 0xf380, + 0xf382, 0x2660, 0x2666, 0x2663, + 0xf440, 0xf442, 0x270c, 0x270b, + 0xf311, 0xf314, 0xf313, 0xf191, + 0x0030, 0xf197, 0xf635, 0xf49e, + 0xf4a5, 0xf4a6, 0xEE41, 0xf30f, + 0xf35c, 0xEB89, 0xf510, 0xf520, + 0xf521, 0xf522, 0xf523, 0xf251, + 0x2611, 0x2712, 0xf518, 0xf50e, + 0xf519, 0xf516, 0xf4f2, 0xf3e1, + 0xf4eb, 0xf4d1, 0xf50f, 0xf503, + 0xf195, 0xf455, 0xf45e, 0xf4bb, + 0xf4fb, 0xf339, 0x26ea, 0xf687, + 0xf5fb, 0xf3b5, 0xf47c, 0xf42f, + 0xf43b, 0xf42d, 0xf609, 0xf60d, + 0xf631, 0xf613, 0xf419, 0xf680, + 0xf451, 0xf48f, 0xf528, 0xf386, }; static const int mb_tbl_code2uni_sb1_min = 0x27a9; static const int mb_tbl_code2uni_sb1_max = 0x2861; static const unsigned short mb_tbl_code2uni_sb1[] = { // 0x27a9 - 0x2861 - 0xf4eb, 0xf4ee, 0xf4e9, 0xf4f2, - 0xf61c, 0xf60d, 0xf631, 0xf613, - 0xf435, 0xf419, 0xf437, 0xf47d, - 0xf680, 0xf451, 0xf4a1, 0xf340, - 0xf48f, 0xf381, 0xf52b, 0xf50d, - 0xf3c3, 0xf528, 0xf386, 0xf341, - 0xf342, 0xf47f, 0xf47b, 0xf480, - 0xf525, 0xf4bc, 0xf4ba, 0xf354, - 0x26f2, 0x26fa, 0x2668, 0xf3a1, - 0xf3ab, 0xf4bf, 0xf4c0, 0xf4fb, - 0xf4fc, 0xf4fa, 0xf47e, 0x303d, - 0xf004, 0xf19a, 0xf4b0, 0xf3af, - 0xf3c6, 0xf3c1, 0xf3b0, 0xf40e, - 0xf6a4, 0xf6b2, 0xf6a7, 0xf6b9, - 0xf6ba, 0xf6bc, 0xf489, 0xf4a4, - 0x26a1, 0xf460, 0xf6c0, 0xf6bd, - 0xf50a, 0xf4e2, 0xf38c, 0xf512, - 0xf513, 0xf306, 0xf373, 0xf4d6, - 0xf4b1, 0xf4b9, 0xf4e1, 0xf4aa, - 0xf3e6, 0xf6a5, 0xf17f, 0xf68f, - 0xf6bb, 0xf46e, 0xf3e3, 0xf3e7, - 0xf3e5, 0xf3ea, 0xf3eb, 0xf3e8, - 0xf68c, 0xf695, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0xf6b6, - 0xf6a2, 0xf201, 0xf49f, 0x2734, - 0x2733, 0xf51e, 0xf6ad, 0xf530, - 0x267f, 0xf4f6, 0x2665, 0x2666, - 0x2660, 0x2663, 0x0023, 0x27bf, - 0xf195, 0xf199, 0xf192, 0xf236, - 0xf21a, 0xf237, 0xf238, 0xf534, - 0xf532, 0xf533, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0x0030, - 0xf250, 0xf239, 0xf202, 0xf194, - 0xf235, 0xf233, 0xf22f, 0xf23a, - 0xf446, 0xf447, 0xf448, 0xf449, - 0x2b06, 0x2b07, 0x27a1, 0x2b05, - 0x2197, 0x2196, 0x2198, 0x2199, - 0x25b6, 0x25c0, 0x23e9, 0x23ea, - 0xf52f, 0x2648, 0x2649, 0x264a, - 0x264b, 0x264c, 0x264d, 0x264e, - 0x264f, 0x2650, 0x2651, 0x2652, - 0x2653, 0x26ce, 0xf51d, 0xf197, - 0x00a9, 0x00ae, 0xf4f3, 0xf4f4, + 0xf4eb, 0xf4ee, 0xf4e9, 0xf4f2, + 0xf61c, 0xf60d, 0xf631, 0xf613, + 0xf435, 0xf419, 0xf437, 0xf47d, + 0xf680, 0xf451, 0xf4a1, 0xf340, + 0xf48f, 0xf381, 0xf52b, 0xf50d, + 0xf3c3, 0xf528, 0xf386, 0xf341, + 0xf342, 0xf47f, 0xf47b, 0xf480, + 0xf525, 0xf4bc, 0xf4ba, 0xf354, + 0x26f2, 0x26fa, 0x2668, 0xf3a1, + 0xf3ab, 0xf4bf, 0xf4c0, 0xf4fb, + 0xf4fc, 0xf4fa, 0xf47e, 0x303d, + 0xf004, 0xf19a, 0xf4b0, 0xf3af, + 0xf3c6, 0xf3c1, 0xf3b0, 0xf40e, + 0xf6a4, 0xf6b2, 0xf6a7, 0xf6b9, + 0xf6ba, 0xf6bc, 0xf489, 0xf4a4, + 0x26a1, 0xf460, 0xf6c0, 0xf6bd, + 0xf50a, 0xf4e2, 0xf38c, 0xf512, + 0xf513, 0xf306, 0xf373, 0xf4d6, + 0xf4b1, 0xf4b9, 0xf4e1, 0xf4aa, + 0xf3e6, 0xf6a5, 0xf17f, 0xf68f, + 0xf6bb, 0xf46e, 0xf3e3, 0xf3e7, + 0xf3e5, 0xf3ea, 0xf3eb, 0xf3e8, + 0xf68c, 0xf695, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0xf6b6, + 0xf6a2, 0xf201, 0xf49f, 0x2734, + 0x2733, 0xf51e, 0xf6ad, 0xf530, + 0x267f, 0xf4f6, 0x2665, 0x2666, + 0x2660, 0x2663, 0x0023, 0x27bf, + 0xf195, 0xf199, 0xf192, 0xf236, + 0xf21a, 0xf237, 0xf238, 0xf534, + 0xf532, 0xf533, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, + 0x0037, 0x0038, 0x0039, 0x0030, + 0xf250, 0xf239, 0xf202, 0xf194, + 0xf235, 0xf233, 0xf22f, 0xf23a, + 0xf446, 0xf447, 0xf448, 0xf449, + 0x2b06, 0x2b07, 0x27a1, 0x2b05, + 0x2197, 0x2196, 0x2198, 0x2199, + 0x25b6, 0x25c0, 0x23e9, 0x23ea, + 0xf52f, 0x2648, 0x2649, 0x264a, + 0x264b, 0x264c, 0x264d, 0x264e, + 0x264f, 0x2650, 0x2651, 0x2652, + 0x2653, 0x26ce, 0xf51d, 0xf197, + 0x00a9, 0x00ae, 0xf4f3, 0xf4f4, 0x26a0, 0xf481, 0xEE77, 0xEE78, 0xEE79, 0xEE7A, 0xEE7B, 0xEE7C, 0xEE7D}; @@ -300,91 +300,91 @@ static const int mb_tbl_code2uni_sb2_min = 0x2921; static const int mb_tbl_code2uni_sb2_max = 0x29cc; static const unsigned short mb_tbl_code2uni_sb2[] = { // 0x2921 - 0x29cc - 0xf466, 0xf467, 0xf48b, 0xf468, - 0xf469, 0xf455, 0xf45f, 0xf4f7, - 0x260e, 0xf4f1, 0xf4e0, 0xf4bb, - 0xf44a, 0xf44d, 0x261d, 0x270a, - 0x270c, 0x270b, 0xf3bf, 0x26f3, - 0xf3be, 0x26be, 0xf3c4, 0x26bd, - 0xf41f, 0xf434, 0xf697, 0x26f5, - 0x2708, 0xf683, 0xf685, 0x2753, - 0x2757, 0x2764, 0xf494, 0xf550, - 0xf551, 0xf552, 0xf553, 0xf554, - 0xf555, 0xf556, 0xf557, 0xf558, - 0xf559, 0xf55a, 0xf55b, 0xf338, - 0xf531, 0xf339, 0xf384, 0xf48d, - 0xf48e, 0xf3e0, 0x26ea, 0xf3e2, - 0xf689, 0x26fd, 0xf5fb, 0xf3a4, - 0xf3a5, 0xf3b5, 0xf511, 0xf3b7, - 0xf3b8, 0xf3ba, 0xf374, 0xf378, - 0x2615, 0xf370, 0xf37a, 0x26c4, - 0x2601, 0x2600, 0x2614, 0xf319, - 0xf304, 0xf47c, 0xf431, 0xf42f, - 0xf43b, 0xf436, 0xf42d, 0xf433, - 0xf427, 0xf60a, 0xf603, 0xf61e, - 0xf620, 0xf4a9, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0xf4dd, - 0xf454, 0xf33a, 0xf337, 0xf33b, - 0xf490, 0xf334, 0xf335, 0xf6be, - 0xf3a7, 0xf376, 0xf37b, 0x3297, - 0xf6ac, 0xf48a, 0xf388, 0xf4a3, - 0xf389, 0x2702, 0xf380, 0x3299, - 0xf4bd, 0xf4e3, 0xf452, 0xf457, - 0xf461, 0xf462, 0xf484, 0xf485, - 0xf486, 0xf487, 0xf488, 0xf458, - 0xf459, 0xf45c, 0xf3ac, 0xf514, - 0xf3b6, 0xf493, 0xf497, 0xf498, - 0xf499, 0xf49a, 0xf49b, 0xf49c, - 0x2728, 0x2b50, 0xf4a8, 0xf4a6, - 0x2b55, 0x274c, 0xf4a2, 0xf31f, - 0x2754, 0x2755, 0xf375, 0xf35e, - 0xf366, 0xf35f, 0xf361, 0xf358, - 0xf35a, 0xf35d, 0xf35c, 0xf35b, - 0xf359, 0xf362, 0xf363, 0xf34e, - 0xf34a, 0xf353, 0xf349, 0xf345, - 0xf346, 0xf382, 0xf371, 0xf372, + 0xf466, 0xf467, 0xf48b, 0xf468, + 0xf469, 0xf455, 0xf45f, 0xf4f7, + 0x260e, 0xf4f1, 0xf4e0, 0xf4bb, + 0xf44a, 0xf44d, 0x261d, 0x270a, + 0x270c, 0x270b, 0xf3bf, 0x26f3, + 0xf3be, 0x26be, 0xf3c4, 0x26bd, + 0xf41f, 0xf434, 0xf697, 0x26f5, + 0x2708, 0xf683, 0xf685, 0x2753, + 0x2757, 0x2764, 0xf494, 0xf550, + 0xf551, 0xf552, 0xf553, 0xf554, + 0xf555, 0xf556, 0xf557, 0xf558, + 0xf559, 0xf55a, 0xf55b, 0xf338, + 0xf531, 0xf339, 0xf384, 0xf48d, + 0xf48e, 0xf3e0, 0x26ea, 0xf3e2, + 0xf689, 0x26fd, 0xf5fb, 0xf3a4, + 0xf3a5, 0xf3b5, 0xf511, 0xf3b7, + 0xf3b8, 0xf3ba, 0xf374, 0xf378, + 0x2615, 0xf370, 0xf37a, 0x26c4, + 0x2601, 0x2600, 0x2614, 0xf319, + 0xf304, 0xf47c, 0xf431, 0xf42f, + 0xf43b, 0xf436, 0xf42d, 0xf433, + 0xf427, 0xf60a, 0xf603, 0xf61e, + 0xf620, 0xf4a9, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0xf4dd, + 0xf454, 0xf33a, 0xf337, 0xf33b, + 0xf490, 0xf334, 0xf335, 0xf6be, + 0xf3a7, 0xf376, 0xf37b, 0x3297, + 0xf6ac, 0xf48a, 0xf388, 0xf4a3, + 0xf389, 0x2702, 0xf380, 0x3299, + 0xf4bd, 0xf4e3, 0xf452, 0xf457, + 0xf461, 0xf462, 0xf484, 0xf485, + 0xf486, 0xf487, 0xf488, 0xf458, + 0xf459, 0xf45c, 0xf3ac, 0xf514, + 0xf3b6, 0xf493, 0xf497, 0xf498, + 0xf499, 0xf49a, 0xf49b, 0xf49c, + 0x2728, 0x2b50, 0xf4a8, 0xf4a6, + 0x2b55, 0x274c, 0xf4a2, 0xf31f, + 0x2754, 0x2755, 0xf375, 0xf35e, + 0xf366, 0xf35f, 0xf361, 0xf358, + 0xf35a, 0xf35d, 0xf35c, 0xf35b, + 0xf359, 0xf362, 0xf363, 0xf34e, + 0xf34a, 0xf353, 0xf349, 0xf345, + 0xf346, 0xf382, 0xf371, 0xf372, }; static const int mb_tbl_code2uni_sb3_min = 0x2a99; static const int mb_tbl_code2uni_sb3_max = 0x2b35; static const unsigned short mb_tbl_code2uni_sb3[] = { // 0x2a99 - 0x2b35 - 0xf625, 0xf60f, 0xf614, 0xf601, - 0xf609, 0xf623, 0xf616, 0xf62a, - 0xf61d, 0xf60c, 0xf628, 0xf637, - 0xf633, 0xf612, 0xf630, 0xf632, - 0xf62d, 0xf602, 0xf622, 0x263a, - 0xf604, 0xf621, 0xf61a, 0xf618, - 0xf440, 0xf443, 0xf442, 0xf444, - 0xf64f, 0xf44b, 0xf44f, 0xf44c, - 0xf44e, 0xf450, 0xf645, 0xf646, - 0xf491, 0xf647, 0xf64c, 0xf46b, - 0xf46f, 0xf3c0, 0xf3c8, 0xf3b1, - 0xf3ca, 0xf699, 0xf69a, 0xf692, - 0xf691, 0xf693, 0xf3a2, 0xf687, - 0xf684, 0xf38d, 0xf49d, 0xf38e, - 0xf393, 0xf392, 0xf38f, 0xf302, - 0xf492, 0xf30a, 0xf367, 0xf387, - 0xf41a, 0xf390, 0xf300, 0xf33e, - 0xf383, 0xf391, 0xf343, 0xf385, - 0xf305, 0xf307, 0xf303, 0xf308, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0xf3e9, - 0xf3a8, 0xf3a9, 0xf3ec, 0xf3ef, - 0xf3f0, 0xf3a6, 0xf3ed, 0xf5fc, - 0xE4C5, 0xf1ef, 0xf1fa, 0xf1eb, - 0xf1e9, 0xf1ee, 0xf1ec, 0xf1ea, - 0xf1f7, 0xf1e8, 0xf1f0, 0xf471, - 0xf472, 0xf473, 0xf474, 0xf475, - 0xf476, 0xf477, 0xf478, 0xf5fd, - 0xf482, 0xf483, 0xf42c, 0xf426, - 0xf420, 0xf424, 0xf439, 0xf41b, - 0xf418, 0xf428, 0xf412, 0xf411, - 0xf43a, 0xf42e, 0xf430, 0xf40d, - 0xf414, 0xf417, 0xf42b, 0xf438, - 0xf170, 0xf171, 0xf18e, 0xf17e, + 0xf625, 0xf60f, 0xf614, 0xf601, + 0xf609, 0xf623, 0xf616, 0xf62a, + 0xf61d, 0xf60c, 0xf628, 0xf637, + 0xf633, 0xf612, 0xf630, 0xf632, + 0xf62d, 0xf602, 0xf622, 0x263a, + 0xf604, 0xf621, 0xf61a, 0xf618, + 0xf440, 0xf443, 0xf442, 0xf444, + 0xf64f, 0xf44b, 0xf44f, 0xf44c, + 0xf44e, 0xf450, 0xf645, 0xf646, + 0xf491, 0xf647, 0xf64c, 0xf46b, + 0xf46f, 0xf3c0, 0xf3c8, 0xf3b1, + 0xf3ca, 0xf699, 0xf69a, 0xf692, + 0xf691, 0xf693, 0xf3a2, 0xf687, + 0xf684, 0xf38d, 0xf49d, 0xf38e, + 0xf393, 0xf392, 0xf38f, 0xf302, + 0xf492, 0xf30a, 0xf367, 0xf387, + 0xf41a, 0xf390, 0xf300, 0xf33e, + 0xf383, 0xf391, 0xf343, 0xf385, + 0xf305, 0xf307, 0xf303, 0xf308, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0xf3e9, + 0xf3a8, 0xf3a9, 0xf3ec, 0xf3ef, + 0xf3f0, 0xf3a6, 0xf3ed, 0xf5fc, + 0xE4C5, 0xf1ef, 0xf1fa, 0xf1eb, + 0xf1e9, 0xf1ee, 0xf1ec, 0xf1ea, + 0xf1f7, 0xf1e8, 0xf1f0, 0xf471, + 0xf472, 0xf473, 0xf474, 0xf475, + 0xf476, 0xf477, 0xf478, 0xf5fd, + 0xf482, 0xf483, 0xf42c, 0xf426, + 0xf420, 0xf424, 0xf439, 0xf41b, + 0xf418, 0xf428, 0xf412, 0xf411, + 0xf43a, 0xf42e, 0xf430, 0xf40d, + 0xf414, 0xf417, 0xf42b, 0xf438, + 0xf170, 0xf171, 0xf18e, 0xf17e, 0xf463, 0x2122, 0xEE70, 0xEE71, 0xEE72, 0xEE73, 0xEE74, 0xEE75, 0xEE76}; @@ -395,15 +395,15 @@ static const int mb_tbl_uni_docomo2code1_min = 0x0023; static const int mb_tbl_uni_docomo2code1_max = 0x00ae; static const unsigned short mb_tbl_uni_docomo2code1_key[] = { // 0x0023 - 0x00ae - 0x0023, 0x0030, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0x00a9, + 0x0023, 0x0030, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, + 0x0037, 0x0038, 0x0039, 0x00a9, 0x00ae, }; static const unsigned short mb_tbl_uni_docomo2code1_value[] = { // 0x0023 - 0x00ae - 0x2964, 0x296f, 0x2966, 0x2967, - 0x2968, 0x2969, 0x296a, 0x296b, - 0x296c, 0x296d, 0x296e, 0x29b5, + 0x2964, 0x296f, 0x2966, 0x2967, + 0x2968, 0x2969, 0x296a, 0x296b, + 0x296c, 0x296d, 0x296e, 0x29b5, 0x29ba, }; static const int mb_tbl_uni_docomo2code1_len = sizeof(mb_tbl_uni_docomo2code1_key)/sizeof(unsigned short); @@ -412,38 +412,38 @@ static const int mb_tbl_uni_docomo2code2_min = 0x203c; static const int mb_tbl_uni_docomo2code2_max = 0x3299; static const unsigned short mb_tbl_uni_docomo2code2_key[] = { // 0x203c - 0x3299 - 0x203c, 0x2049, 0x2122, 0x2194, - 0x2195, 0x2196, 0x2197, 0x2198, - 0x2199, 0x21a9, 0x231a, 0x23f0, - 0x23f3, 0x24c2, 0x2600, 0x2601, - 0x260e, 0x2614, 0x2615, 0x2648, - 0x2649, 0x264a, 0x264b, 0x264c, - 0x264d, 0x264e, 0x264f, 0x2650, - 0x2651, 0x2652, 0x2653, 0x2660, - 0x2663, 0x2665, 0x2666, 0x2668, - 0x267b, 0x267f, 0x26a0, 0x26a1, - 0x26bd, 0x26be, 0x26c4, 0x26f3, - 0x26f5, 0x26fd, 0x2702, 0x2708, - 0x2709, 0x270a, 0x270b, 0x270c, - 0x270f, 0x2712, 0x2728, 0x2757, + 0x203c, 0x2049, 0x2122, 0x2194, + 0x2195, 0x2196, 0x2197, 0x2198, + 0x2199, 0x21a9, 0x231a, 0x23f0, + 0x23f3, 0x24c2, 0x2600, 0x2601, + 0x260e, 0x2614, 0x2615, 0x2648, + 0x2649, 0x264a, 0x264b, 0x264c, + 0x264d, 0x264e, 0x264f, 0x2650, + 0x2651, 0x2652, 0x2653, 0x2660, + 0x2663, 0x2665, 0x2666, 0x2668, + 0x267b, 0x267f, 0x26a0, 0x26a1, + 0x26bd, 0x26be, 0x26c4, 0x26f3, + 0x26f5, 0x26fd, 0x2702, 0x2708, + 0x2709, 0x270a, 0x270b, 0x270c, + 0x270f, 0x2712, 0x2728, 0x2757, 0x2764, 0x27b0, 0x27bf, 0x2934, 0x2935, 0x3030, 0x3299, }; static const unsigned short mb_tbl_uni_docomo2code2_value[] = { // 0x203c - 0x3299 - 0x2988, 0x2987, 0x29b6, 0x29c0, - 0x29c1, 0x291b, 0x28fc, 0x291a, - 0x2929, 0x295e, 0x29a3, 0x293e, - 0x29a0, 0x28e0, 0x28c2, 0x28c3, - 0x290b, 0x28c4, 0x28f4, 0x28ca, - 0x28cb, 0x28cc, 0x28cd, 0x28ce, - 0x28cf, 0x28d0, 0x28d1, 0x28d2, - 0x28d3, 0x28d4, 0x28d5, 0x2912, - 0x2914, 0x2911, 0x2913, 0x297b, - 0x29b9, 0x291f, 0x29bb, 0x28c6, - 0x28da, 0x28d7, 0x28c5, 0x28d8, - 0x2927, 0x28ef, 0x28f9, 0x28e6, - 0x2957, 0x2917, 0x2919, 0x2918, - 0x299d, 0x2932, 0x297e, 0x2986, + 0x2988, 0x2987, 0x29b6, 0x29c0, + 0x29c1, 0x291b, 0x28fc, 0x291a, + 0x2929, 0x295e, 0x29a3, 0x293e, + 0x29a0, 0x28e0, 0x28c2, 0x28c3, + 0x290b, 0x28c4, 0x28f4, 0x28ca, + 0x28cb, 0x28cc, 0x28cd, 0x28ce, + 0x28cf, 0x28d0, 0x28d1, 0x28d2, + 0x28d3, 0x28d4, 0x28d5, 0x2912, + 0x2914, 0x2911, 0x2913, 0x297b, + 0x29b9, 0x291f, 0x29bb, 0x28c6, + 0x28da, 0x28d7, 0x28c5, 0x28d8, + 0x2927, 0x28ef, 0x28f9, 0x28e6, + 0x2957, 0x2917, 0x2919, 0x2918, + 0x299d, 0x2932, 0x297e, 0x2986, 0x2970, 0x298e, 0x2963, 0x2979, 0x2984, 0x298d, 0x29b8, }; @@ -453,93 +453,93 @@ static const int mb_tbl_uni_docomo2code3_min = 0x1f17f; static const int mb_tbl_uni_docomo2code3_max = 0x1f6bb; static const unsigned short mb_tbl_uni_docomo2code3_key[] = { // 0x1f17f - 0x1f6bb - 0xf17f, 0xf191, 0xf193, 0xf194, - 0xf195, 0xf196, 0xf197, 0xf232, - 0xf233, 0xf234, 0xf235, 0xf300, - 0xf301, 0xf302, 0xf303, 0xf30a, - 0xf311, 0xf313, 0xf314, 0xf315, - 0xf319, 0xf331, 0xf337, 0xf338, - 0xf340, 0xf341, 0xf34c, 0xf34e, - 0xf352, 0xf354, 0xf359, 0xf35c, - 0xf35e, 0xf370, 0xf374, 0xf375, - 0xf376, 0xf377, 0xf378, 0xf37a, - 0xf380, 0xf381, 0xf382, 0xf384, - 0xf3a0, 0xf3a4, 0xf3a5, 0xf3a7, - 0xf3a8, 0xf3a9, 0xf3aa, 0xf3ab, - 0xf3ac, 0xf3ae, 0xf3b5, 0xf3b6, - 0xf3bd, 0xf3be, 0xf3bf, 0xf3c0, - 0xf3c1, 0xf3c2, 0xf3c3, 0xf3e0, - 0xf3e2, 0xf3e3, 0xf3e5, 0xf3e6, - 0xf3e7, 0xf3e8, 0xf3ea, 0xf3eb, - 0xf40c, 0xf41f, 0xf424, 0xf427, - 0xf431, 0xf434, 0xf436, 0xf437, - 0xf440, 0xf442, 0xf44a, 0xf44d, - 0xf451, 0xf453, 0xf455, 0xf456, - 0xf45b, 0xf45c, 0xf45d, 0xf45f, - 0xf460, 0xf463, 0xf464, 0xf484, - 0xf48b, 0xf48c, 0xf48d, 0xf493, - 0xf494, 0xf495, 0xf4a0, 0xf4a1, - 0xf4a2, 0xf4a3, 0xf4a4, 0xf4a5, - 0xf4a6, 0xf4a7, 0xf4a8, 0xf4b0, - 0xf4b4, 0xf4ba, 0xf4bb, 0xf4bf, - 0xf4ce, 0xf4d6, 0xf4dd, 0xf4df, - 0xf4e0, 0xf4e9, 0xf4f1, 0xf4f2, - 0xf4f7, 0xf4fa, 0xf50d, 0xf511, - 0xf514, 0xf51a, 0xf51b, 0xf51c, - 0xf527, 0xf5fb, 0xf601, 0xf603, - 0xf605, 0xf606, 0xf609, 0xf60b, - 0xf60c, 0xf60d, 0xf60f, 0xf612, - 0xf613, 0xf614, 0xf616, 0xf61c, - 0xf61e, 0xf620, 0xf621, 0xf622, - 0xf623, 0xf62d, 0xf631, 0xf635, - 0xf683, 0xf684, 0xf68c, 0xf697, - 0xf699, 0xf6a2, 0xf6a5, 0xf6a9, - 0xf6aa, 0xf6ac, 0xf6ad, 0xf6b2, + 0xf17f, 0xf191, 0xf193, 0xf194, + 0xf195, 0xf196, 0xf197, 0xf232, + 0xf233, 0xf234, 0xf235, 0xf300, + 0xf301, 0xf302, 0xf303, 0xf30a, + 0xf311, 0xf313, 0xf314, 0xf315, + 0xf319, 0xf331, 0xf337, 0xf338, + 0xf340, 0xf341, 0xf34c, 0xf34e, + 0xf352, 0xf354, 0xf359, 0xf35c, + 0xf35e, 0xf370, 0xf374, 0xf375, + 0xf376, 0xf377, 0xf378, 0xf37a, + 0xf380, 0xf381, 0xf382, 0xf384, + 0xf3a0, 0xf3a4, 0xf3a5, 0xf3a7, + 0xf3a8, 0xf3a9, 0xf3aa, 0xf3ab, + 0xf3ac, 0xf3ae, 0xf3b5, 0xf3b6, + 0xf3bd, 0xf3be, 0xf3bf, 0xf3c0, + 0xf3c1, 0xf3c2, 0xf3c3, 0xf3e0, + 0xf3e2, 0xf3e3, 0xf3e5, 0xf3e6, + 0xf3e7, 0xf3e8, 0xf3ea, 0xf3eb, + 0xf40c, 0xf41f, 0xf424, 0xf427, + 0xf431, 0xf434, 0xf436, 0xf437, + 0xf440, 0xf442, 0xf44a, 0xf44d, + 0xf451, 0xf453, 0xf455, 0xf456, + 0xf45b, 0xf45c, 0xf45d, 0xf45f, + 0xf460, 0xf463, 0xf464, 0xf484, + 0xf48b, 0xf48c, 0xf48d, 0xf493, + 0xf494, 0xf495, 0xf4a0, 0xf4a1, + 0xf4a2, 0xf4a3, 0xf4a4, 0xf4a5, + 0xf4a6, 0xf4a7, 0xf4a8, 0xf4b0, + 0xf4b4, 0xf4ba, 0xf4bb, 0xf4bf, + 0xf4ce, 0xf4d6, 0xf4dd, 0xf4df, + 0xf4e0, 0xf4e9, 0xf4f1, 0xf4f2, + 0xf4f7, 0xf4fa, 0xf50d, 0xf511, + 0xf514, 0xf51a, 0xf51b, 0xf51c, + 0xf527, 0xf5fb, 0xf601, 0xf603, + 0xf605, 0xf606, 0xf609, 0xf60b, + 0xf60c, 0xf60d, 0xf60f, 0xf612, + 0xf613, 0xf614, 0xf616, 0xf61c, + 0xf61e, 0xf620, 0xf621, 0xf622, + 0xf623, 0xf62d, 0xf631, 0xf635, + 0xf683, 0xf684, 0xf68c, 0xf697, + 0xf699, 0xf6a2, 0xf6a5, 0xf6a9, + 0xf6aa, 0xf6ac, 0xf6ad, 0xf6b2, 0xf6bb, }; static const unsigned short mb_tbl_uni_docomo2code3_value[] = { // 0x1f17f - 0x1f6bb - 0x28f0, 0x295f, 0x295b, 0x295c, - 0x2961, 0x29b3, 0x298f, 0x29bc, - 0x29bd, 0x29be, 0x29bf, 0x28c7, - 0x28c8, 0x28c9, 0x2937, 0x29c3, - 0x2920, 0x2922, 0x2921, 0x2924, - 0x2923, 0x29ca, 0x29c7, 0x29cc, - 0x29c5, 0x29cb, 0x29c8, 0x29c9, - 0x29c6, 0x28f7, 0x29cd, 0x29d0, - 0x29d1, 0x29ce, 0x28f3, 0x29a2, - 0x29cf, 0x29da, 0x28f5, 0x28f6, - 0x2908, 0x2909, 0x290a, 0x2928, - 0x28fd, 0x28fa, 0x28fb, 0x28fe, - 0x28ff, 0x2900, 0x2901, 0x2902, - 0x2930, 0x290f, 0x297a, 0x2983, - 0x28d6, 0x28d9, 0x28db, 0x28dc, - 0x28dd, 0x2996, 0x29b7, 0x28e7, - 0x28e8, 0x28e9, 0x28ea, 0x28eb, - 0x28ec, 0x28ed, 0x28ee, 0x29c2, - 0x29d2, 0x29d5, 0x29d3, 0x29d4, - 0x2926, 0x29d8, 0x2925, 0x29d9, - 0x2915, 0x2916, 0x2981, 0x29ab, - 0x299e, 0x291e, 0x2992, 0x2995, - 0x2993, 0x2906, 0x2931, 0x291d, - 0x28f8, 0x291c, 0x2935, 0x2994, - 0x297d, 0x299b, 0x299f, 0x2971, - 0x2972, 0x2973, 0x297c, 0x297f, - 0x2980, 0x2982, 0x2985, 0x2989, - 0x298a, 0x298b, 0x298c, 0x2999, - 0x295a, 0x2936, 0x299a, 0x2910, - 0x29b4, 0x2907, 0x290d, 0x28de, - 0x2954, 0x2953, 0x290c, 0x2952, - 0x2905, 0x290e, 0x2960, 0x295d, - 0x2997, 0x293d, 0x293c, 0x293b, - 0x299c, 0x29c4, 0x29d7, 0x2974, - 0x29a6, 0x29ae, 0x29ad, 0x29d6, - 0x29a5, 0x29aa, 0x29b0, 0x29a9, - 0x29a7, 0x29a4, 0x2977, 0x29ac, - 0x2976, 0x2975, 0x29a8, 0x29b2, - 0x29af, 0x29b1, 0x29db, 0x2978, - 0x28df, 0x28e1, 0x28e4, 0x28e2, - 0x28e3, 0x28e5, 0x28f1, 0x2962, - 0x2998, 0x2903, 0x2904, 0x29a1, + 0x28f0, 0x295f, 0x295b, 0x295c, + 0x2961, 0x29b3, 0x298f, 0x29bc, + 0x29bd, 0x29be, 0x29bf, 0x28c7, + 0x28c8, 0x28c9, 0x2937, 0x29c3, + 0x2920, 0x2922, 0x2921, 0x2924, + 0x2923, 0x29ca, 0x29c7, 0x29cc, + 0x29c5, 0x29cb, 0x29c8, 0x29c9, + 0x29c6, 0x28f7, 0x29cd, 0x29d0, + 0x29d1, 0x29ce, 0x28f3, 0x29a2, + 0x29cf, 0x29da, 0x28f5, 0x28f6, + 0x2908, 0x2909, 0x290a, 0x2928, + 0x28fd, 0x28fa, 0x28fb, 0x28fe, + 0x28ff, 0x2900, 0x2901, 0x2902, + 0x2930, 0x290f, 0x297a, 0x2983, + 0x28d6, 0x28d9, 0x28db, 0x28dc, + 0x28dd, 0x2996, 0x29b7, 0x28e7, + 0x28e8, 0x28e9, 0x28ea, 0x28eb, + 0x28ec, 0x28ed, 0x28ee, 0x29c2, + 0x29d2, 0x29d5, 0x29d3, 0x29d4, + 0x2926, 0x29d8, 0x2925, 0x29d9, + 0x2915, 0x2916, 0x2981, 0x29ab, + 0x299e, 0x291e, 0x2992, 0x2995, + 0x2993, 0x2906, 0x2931, 0x291d, + 0x28f8, 0x291c, 0x2935, 0x2994, + 0x297d, 0x299b, 0x299f, 0x2971, + 0x2972, 0x2973, 0x297c, 0x297f, + 0x2980, 0x2982, 0x2985, 0x2989, + 0x298a, 0x298b, 0x298c, 0x2999, + 0x295a, 0x2936, 0x299a, 0x2910, + 0x29b4, 0x2907, 0x290d, 0x28de, + 0x2954, 0x2953, 0x290c, 0x2952, + 0x2905, 0x290e, 0x2960, 0x295d, + 0x2997, 0x293d, 0x293c, 0x293b, + 0x299c, 0x29c4, 0x29d7, 0x2974, + 0x29a6, 0x29ae, 0x29ad, 0x29d6, + 0x29a5, 0x29aa, 0x29b0, 0x29a9, + 0x29a7, 0x29a4, 0x2977, 0x29ac, + 0x2976, 0x2975, 0x29a8, 0x29b2, + 0x29af, 0x29b1, 0x29db, 0x2978, + 0x28df, 0x28e1, 0x28e4, 0x28e2, + 0x28e3, 0x28e5, 0x28f1, 0x2962, + 0x2998, 0x2903, 0x2904, 0x29a1, 0x28f2, }; static const int mb_tbl_uni_docomo2code3_len = sizeof(mb_tbl_uni_docomo2code3_key)/sizeof(unsigned short); @@ -548,15 +548,15 @@ static const int mb_tbl_uni_kddi2code1_min = 0x0023; static const int mb_tbl_uni_kddi2code1_max = 0x00ae; static const unsigned short mb_tbl_uni_kddi2code1_key[] = { // 0x0023 - 0x00ae - 0x0023, 0x0030, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0x00a9, + 0x0023, 0x0030, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, + 0x0037, 0x0038, 0x0039, 0x00a9, 0x00ae, }; static const unsigned short mb_tbl_uni_kddi2code1_value[] = { // 0x0023 - 0x00ae - 0x25bc, 0x2830, 0x27a6, 0x27a7, - 0x27a8, 0x27a9, 0x27aa, 0x27ab, - 0x27ac, 0x27ad, 0x27ae, 0x27dc, + 0x25bc, 0x2830, 0x27a6, 0x27a7, + 0x27a8, 0x27a9, 0x27aa, 0x27ab, + 0x27ac, 0x27ad, 0x27ae, 0x27dc, 0x27dd, }; static const int mb_tbl_uni_kddi2code1_len = sizeof(mb_tbl_uni_kddi2code1_key)/sizeof(unsigned short); @@ -565,65 +565,65 @@ static const int mb_tbl_uni_kddi2code2_min = 0x2002; static const int mb_tbl_uni_kddi2code2_max = 0x3299; static const unsigned short mb_tbl_uni_kddi2code2_key[] = { // 0x2002 - 0x3299 - 0x2002, 0x2003, 0x2005, 0x203c, - 0x2049, 0x2122, 0x2139, 0x2194, - 0x2195, 0x2196, 0x2197, 0x2198, - 0x2199, 0x21a9, 0x21aa, 0x231a, - 0x231b, 0x23e9, 0x23ea, 0x23eb, - 0x23ec, 0x23f0, 0x23f3, 0x25aa, - 0x25ab, 0x25b6, 0x25c0, 0x25fb, - 0x25fc, 0x25fd, 0x25fe, 0x2600, - 0x2601, 0x260e, 0x2611, 0x2614, - 0x2615, 0x261d, 0x263a, 0x2648, - 0x2649, 0x264a, 0x264b, 0x264c, - 0x264d, 0x264e, 0x264f, 0x2650, - 0x2651, 0x2652, 0x2653, 0x2660, - 0x2663, 0x2665, 0x2666, 0x2668, - 0x267b, 0x267f, 0x2693, 0x26a0, - 0x26a1, 0x26aa, 0x26ab, 0x26bd, - 0x26be, 0x26c4, 0x26c5, 0x26ce, - 0x26d4, 0x26ea, 0x26f2, 0x26f3, - 0x26f5, 0x26fa, 0x26fd, 0x2702, - 0x2705, 0x2708, 0x2709, 0x270a, - 0x270b, 0x270c, 0x270f, 0x2712, - 0x2714, 0x2716, 0x2728, 0x2733, - 0x2734, 0x2744, 0x2747, 0x274c, - 0x274e, 0x2753, 0x2757, 0x2764, - 0x2795, 0x2796, 0x2797, 0x27a1, - 0x27b0, 0x2934, 0x2935, 0x2b05, - 0x2b06, 0x2b07, 0x2b1b, 0x2b1c, - 0x2b50, 0x2b55, 0x3297, 0x3299, + 0x2002, 0x2003, 0x2005, 0x203c, + 0x2049, 0x2122, 0x2139, 0x2194, + 0x2195, 0x2196, 0x2197, 0x2198, + 0x2199, 0x21a9, 0x21aa, 0x231a, + 0x231b, 0x23e9, 0x23ea, 0x23eb, + 0x23ec, 0x23f0, 0x23f3, 0x25aa, + 0x25ab, 0x25b6, 0x25c0, 0x25fb, + 0x25fc, 0x25fd, 0x25fe, 0x2600, + 0x2601, 0x260e, 0x2611, 0x2614, + 0x2615, 0x261d, 0x263a, 0x2648, + 0x2649, 0x264a, 0x264b, 0x264c, + 0x264d, 0x264e, 0x264f, 0x2650, + 0x2651, 0x2652, 0x2653, 0x2660, + 0x2663, 0x2665, 0x2666, 0x2668, + 0x267b, 0x267f, 0x2693, 0x26a0, + 0x26a1, 0x26aa, 0x26ab, 0x26bd, + 0x26be, 0x26c4, 0x26c5, 0x26ce, + 0x26d4, 0x26ea, 0x26f2, 0x26f3, + 0x26f5, 0x26fa, 0x26fd, 0x2702, + 0x2705, 0x2708, 0x2709, 0x270a, + 0x270b, 0x270c, 0x270f, 0x2712, + 0x2714, 0x2716, 0x2728, 0x2733, + 0x2734, 0x2744, 0x2747, 0x274c, + 0x274e, 0x2753, 0x2757, 0x2764, + 0x2795, 0x2796, 0x2797, 0x27a1, + 0x27b0, 0x2934, 0x2935, 0x2b05, + 0x2b06, 0x2b07, 0x2b1b, 0x2b1c, + 0x2b50, 0x2b55, 0x3297, 0x3299, }; static const unsigned short mb_tbl_uni_kddi2code2_value[] = { // 0x2002 - 0x3299 - 0x2811, 0x2810, 0x2812, 0x2568, - 0x2567, 0x27d2, 0x27b7, 0x25b2, - 0x25b3, 0x27d0, 0x27d9, 0x27d1, - 0x27da, 0x27e1, 0x27e0, 0x27fe, - 0x27ff, 0x27b4, 0x27b3, 0x27c9, - 0x27c8, 0x2818, 0x2700, 0x27b6, - 0x27b5, 0x27b2, 0x27b1, 0x27bc, - 0x27bd, 0x27b8, 0x27b9, 0x270c, - 0x2711, 0x281a, 0x2840, 0x2710, - 0x281b, 0x277a, 0x277f, 0x2713, - 0x2714, 0x2715, 0x2716, 0x2717, - 0x2718, 0x2719, 0x271a, 0x271b, - 0x271c, 0x271d, 0x271e, 0x2825, - 0x2827, 0x24f0, 0x2826, 0x2740, - 0x25b1, 0x2703, 0x272d, 0x2705, - 0x270b, 0x27be, 0x27bf, 0x273a, - 0x273e, 0x2709, 0x2712, 0x271f, - 0x2708, 0x2852, 0x24ba, 0x281d, - 0x2738, 0x24bb, 0x27f5, 0x279a, - 0x27e2, 0x2737, 0x27a5, 0x25bb, - 0x282b, 0x282a, 0x2725, 0x2841, - 0x27db, 0x27d3, 0x24f6, 0x27c2, - 0x26fd, 0x270e, 0x26f0, 0x27d4, - 0x27d5, 0x2707, 0x2706, 0x2819, - 0x27c0, 0x27c1, 0x27d8, 0x27d6, - 0x2569, 0x2565, 0x2566, 0x27d7, - 0x27c3, 0x27c4, 0x27cd, 0x27cc, - 0x270f, 0x24f8, 0x24e4, 0x2775, + 0x2811, 0x2810, 0x2812, 0x2568, + 0x2567, 0x27d2, 0x27b7, 0x25b2, + 0x25b3, 0x27d0, 0x27d9, 0x27d1, + 0x27da, 0x27e1, 0x27e0, 0x27fe, + 0x27ff, 0x27b4, 0x27b3, 0x27c9, + 0x27c8, 0x2818, 0x2700, 0x27b6, + 0x27b5, 0x27b2, 0x27b1, 0x27bc, + 0x27bd, 0x27b8, 0x27b9, 0x270c, + 0x2711, 0x281a, 0x2840, 0x2710, + 0x281b, 0x277a, 0x277f, 0x2713, + 0x2714, 0x2715, 0x2716, 0x2717, + 0x2718, 0x2719, 0x271a, 0x271b, + 0x271c, 0x271d, 0x271e, 0x2825, + 0x2827, 0x24f0, 0x2826, 0x2740, + 0x25b1, 0x2703, 0x272d, 0x2705, + 0x270b, 0x27be, 0x27bf, 0x273a, + 0x273e, 0x2709, 0x2712, 0x271f, + 0x2708, 0x2852, 0x24ba, 0x281d, + 0x2738, 0x24bb, 0x27f5, 0x279a, + 0x27e2, 0x2737, 0x27a5, 0x25bb, + 0x282b, 0x282a, 0x2725, 0x2841, + 0x27db, 0x27d3, 0x24f6, 0x27c2, + 0x26fd, 0x270e, 0x26f0, 0x27d4, + 0x27d5, 0x2707, 0x2706, 0x2819, + 0x27c0, 0x27c1, 0x27d8, 0x27d6, + 0x2569, 0x2565, 0x2566, 0x27d7, + 0x27c3, 0x27c4, 0x27cd, 0x27cc, + 0x270f, 0x24f8, 0x24e4, 0x2775, }; static const int mb_tbl_uni_kddi2code2_len = sizeof(mb_tbl_uni_kddi2code2_key)/sizeof(unsigned short); @@ -632,263 +632,263 @@ static const int mb_tbl_uni_kddi2code3_min = 0x1f004; static const int mb_tbl_uni_kddi2code3_max = 0x1f6c0; static const unsigned short mb_tbl_uni_kddi2code3_key[] = { // 0x1f004 - 0x1f6c0 - 0xf004, 0xf0cf, 0xf170, 0xf171, - 0xf17e, 0xf17f, 0xf18e, 0xf191, - 0xf192, 0xf193, 0xf194, 0xf195, - 0xf197, 0xf198, 0xf199, 0xf19a, - 0xf1e8, 0xf1e9, 0xf1ea, 0xf1eb, - 0xf1ec, 0xf1ee, 0xf1ef, 0xf1f0, - 0xf1f7, 0xf1fa, 0xf202, 0xf22f, - 0xf233, 0xf235, 0xf239, 0xf23a, - 0xf250, 0xf251, 0xf300, 0xf301, - 0xf302, 0xf303, 0xf305, 0xf306, - 0xf308, 0xf309, 0xf30a, 0xf30b, - 0xf30c, 0xf30f, 0xf311, 0xf313, - 0xf314, 0xf319, 0xf31b, 0xf320, - 0xf330, 0xf331, 0xf334, 0xf335, - 0xf337, 0xf338, 0xf339, 0xf33a, - 0xf33b, 0xf33c, 0xf33d, 0xf33f, - 0xf340, 0xf341, 0xf342, 0xf344, - 0xf345, 0xf346, 0xf347, 0xf348, - 0xf349, 0xf34a, 0xf34c, 0xf34d, - 0xf34e, 0xf34f, 0xf351, 0xf352, - 0xf353, 0xf354, 0xf355, 0xf356, - 0xf357, 0xf358, 0xf359, 0xf35a, - 0xf35b, 0xf35c, 0xf35d, 0xf35e, - 0xf35f, 0xf360, 0xf361, 0xf362, - 0xf363, 0xf364, 0xf365, 0xf366, - 0xf367, 0xf368, 0xf369, 0xf36a, - 0xf36b, 0xf36c, 0xf36d, 0xf36e, - 0xf36f, 0xf370, 0xf371, 0xf372, - 0xf373, 0xf374, 0xf375, 0xf376, - 0xf377, 0xf378, 0xf379, 0xf37a, - 0xf37b, 0xf380, 0xf381, 0xf382, - 0xf383, 0xf384, 0xf385, 0xf386, - 0xf387, 0xf388, 0xf389, 0xf38a, - 0xf38b, 0xf38c, 0xf38d, 0xf38e, - 0xf38f, 0xf390, 0xf391, 0xf392, - 0xf393, 0xf3a1, 0xf3a2, 0xf3a3, - 0xf3a4, 0xf3a5, 0xf3a7, 0xf3a8, - 0xf3a9, 0xf3aa, 0xf3ab, 0xf3ac, - 0xf3ad, 0xf3ae, 0xf3af, 0xf3b0, - 0xf3b1, 0xf3b2, 0xf3b3, 0xf3b4, - 0xf3b5, 0xf3b6, 0xf3b8, 0xf3b9, - 0xf3ba, 0xf3bb, 0xf3bc, 0xf3be, - 0xf3bf, 0xf3c0, 0xf3c1, 0xf3c2, - 0xf3c3, 0xf3c4, 0xf3c6, 0xf3c8, - 0xf3ca, 0xf3e0, 0xf3e1, 0xf3e2, - 0xf3e3, 0xf3e5, 0xf3e6, 0xf3e7, - 0xf3e8, 0xf3e9, 0xf3ea, 0xf3eb, - 0xf3ec, 0xf3ed, 0xf3ee, 0xf3ef, - 0xf3f0, 0xf40c, 0xf40d, 0xf414, - 0xf417, 0xf418, 0xf419, 0xf41a, - 0xf41b, 0xf41c, 0xf41d, 0xf41e, - 0xf420, 0xf421, 0xf422, 0xf423, - 0xf424, 0xf425, 0xf427, 0xf428, - 0xf429, 0xf42b, 0xf42c, 0xf42d, - 0xf42e, 0xf42f, 0xf430, 0xf431, - 0xf432, 0xf433, 0xf434, 0xf435, - 0xf436, 0xf437, 0xf438, 0xf43b, - 0xf43c, 0xf43d, 0xf43e, 0xf440, - 0xf442, 0xf443, 0xf444, 0xf445, - 0xf446, 0xf447, 0xf448, 0xf449, - 0xf44a, 0xf44b, 0xf44c, 0xf44d, - 0xf44e, 0xf44f, 0xf451, 0xf452, - 0xf453, 0xf454, 0xf455, 0xf456, - 0xf457, 0xf458, 0xf459, 0xf45a, - 0xf45b, 0xf45c, 0xf45e, 0xf45f, - 0xf460, 0xf462, 0xf463, 0xf468, - 0xf469, 0xf46a, 0xf46e, 0xf46f, - 0xf470, 0xf471, 0xf472, 0xf473, - 0xf474, 0xf475, 0xf476, 0xf477, - 0xf478, 0xf479, 0xf47a, 0xf47b, - 0xf47c, 0xf47d, 0xf47e, 0xf47f, - 0xf480, 0xf483, 0xf484, 0xf485, - 0xf486, 0xf487, 0xf488, 0xf489, - 0xf48a, 0xf48b, 0xf48c, 0xf48d, - 0xf48f, 0xf490, 0xf491, 0xf493, - 0xf494, 0xf495, 0xf496, 0xf498, - 0xf499, 0xf49a, 0xf49b, 0xf49c, - 0xf49d, 0xf49e, 0xf4a1, 0xf4a2, - 0xf4a3, 0xf4a4, 0xf4a5, 0xf4a6, - 0xf4a7, 0xf4a8, 0xf4a9, 0xf4aa, - 0xf4ab, 0xf4ac, 0xf4ae, 0xf4af, - 0xf4b0, 0xf4b2, 0xf4b3, 0xf4b4, - 0xf4b5, 0xf4b8, 0xf4b9, 0xf4bb, - 0xf4bc, 0xf4bd, 0xf4be, 0xf4bf, - 0xf4c1, 0xf4c2, 0xf4c3, 0xf4c4, - 0xf4c5, 0xf4c6, 0xf4c7, 0xf4c8, - 0xf4c9, 0xf4ca, 0xf4cb, 0xf4cc, - 0xf4cd, 0xf4ce, 0xf4cf, 0xf4d0, - 0xf4d1, 0xf4d2, 0xf4d3, 0xf4d4, - 0xf4d5, 0xf4d6, 0xf4d7, 0xf4d8, - 0xf4d9, 0xf4da, 0xf4db, 0xf4dc, - 0xf4dd, 0xf4de, 0xf4df, 0xf4e0, - 0xf4e1, 0xf4e4, 0xf4e5, 0xf4e6, - 0xf4e7, 0xf4e8, 0xf4e9, 0xf4ea, - 0xf4eb, 0xf4f0, 0xf4f1, 0xf4f2, - 0xf4f3, 0xf4f4, 0xf4f6, 0xf4f7, - 0xf4f9, 0xf4fa, 0xf4fb, 0xf4fc, - 0xf503, 0xf50a, 0xf50b, 0xf50c, - 0xf50d, 0xf50e, 0xf50f, 0xf510, - 0xf511, 0xf512, 0xf514, 0xf516, - 0xf517, 0xf518, 0xf519, 0xf51e, - 0xf51f, 0xf520, 0xf521, 0xf522, - 0xf523, 0xf524, 0xf525, 0xf526, - 0xf527, 0xf528, 0xf529, 0xf52a, - 0xf52b, 0xf52e, 0xf530, 0xf534, - 0xf535, 0xf536, 0xf537, 0xf538, - 0xf539, 0xf53a, 0xf53b, 0xf53c, - 0xf53d, 0xf5fb, 0xf5fc, 0xf5fe, - 0xf5ff, 0xf601, 0xf602, 0xf603, - 0xf609, 0xf60a, 0xf60c, 0xf60d, - 0xf60f, 0xf612, 0xf613, 0xf614, - 0xf616, 0xf618, 0xf61a, 0xf61c, - 0xf620, 0xf621, 0xf622, 0xf623, - 0xf624, 0xf628, 0xf629, 0xf62a, - 0xf62b, 0xf62d, 0xf630, 0xf631, - 0xf632, 0xf633, 0xf635, 0xf637, - 0xf638, 0xf639, 0xf63a, 0xf63b, - 0xf63c, 0xf63d, 0xf63e, 0xf63f, - 0xf640, 0xf645, 0xf646, 0xf647, - 0xf648, 0xf649, 0xf64a, 0xf64b, - 0xf64c, 0xf64d, 0xf64e, 0xf64f, - 0xf680, 0xf683, 0xf685, 0xf687, - 0xf689, 0xf68c, 0xf68f, 0xf691, - 0xf692, 0xf693, 0xf697, 0xf69a, - 0xf6a2, 0xf6a5, 0xf6a7, 0xf6a8, - 0xf6a9, 0xf6ab, 0xf6ac, 0xf6ad, - 0xf6b2, 0xf6b6, 0xf6bb, 0xf6c0, + 0xf004, 0xf0cf, 0xf170, 0xf171, + 0xf17e, 0xf17f, 0xf18e, 0xf191, + 0xf192, 0xf193, 0xf194, 0xf195, + 0xf197, 0xf198, 0xf199, 0xf19a, + 0xf1e8, 0xf1e9, 0xf1ea, 0xf1eb, + 0xf1ec, 0xf1ee, 0xf1ef, 0xf1f0, + 0xf1f7, 0xf1fa, 0xf202, 0xf22f, + 0xf233, 0xf235, 0xf239, 0xf23a, + 0xf250, 0xf251, 0xf300, 0xf301, + 0xf302, 0xf303, 0xf305, 0xf306, + 0xf308, 0xf309, 0xf30a, 0xf30b, + 0xf30c, 0xf30f, 0xf311, 0xf313, + 0xf314, 0xf319, 0xf31b, 0xf320, + 0xf330, 0xf331, 0xf334, 0xf335, + 0xf337, 0xf338, 0xf339, 0xf33a, + 0xf33b, 0xf33c, 0xf33d, 0xf33f, + 0xf340, 0xf341, 0xf342, 0xf344, + 0xf345, 0xf346, 0xf347, 0xf348, + 0xf349, 0xf34a, 0xf34c, 0xf34d, + 0xf34e, 0xf34f, 0xf351, 0xf352, + 0xf353, 0xf354, 0xf355, 0xf356, + 0xf357, 0xf358, 0xf359, 0xf35a, + 0xf35b, 0xf35c, 0xf35d, 0xf35e, + 0xf35f, 0xf360, 0xf361, 0xf362, + 0xf363, 0xf364, 0xf365, 0xf366, + 0xf367, 0xf368, 0xf369, 0xf36a, + 0xf36b, 0xf36c, 0xf36d, 0xf36e, + 0xf36f, 0xf370, 0xf371, 0xf372, + 0xf373, 0xf374, 0xf375, 0xf376, + 0xf377, 0xf378, 0xf379, 0xf37a, + 0xf37b, 0xf380, 0xf381, 0xf382, + 0xf383, 0xf384, 0xf385, 0xf386, + 0xf387, 0xf388, 0xf389, 0xf38a, + 0xf38b, 0xf38c, 0xf38d, 0xf38e, + 0xf38f, 0xf390, 0xf391, 0xf392, + 0xf393, 0xf3a1, 0xf3a2, 0xf3a3, + 0xf3a4, 0xf3a5, 0xf3a7, 0xf3a8, + 0xf3a9, 0xf3aa, 0xf3ab, 0xf3ac, + 0xf3ad, 0xf3ae, 0xf3af, 0xf3b0, + 0xf3b1, 0xf3b2, 0xf3b3, 0xf3b4, + 0xf3b5, 0xf3b6, 0xf3b8, 0xf3b9, + 0xf3ba, 0xf3bb, 0xf3bc, 0xf3be, + 0xf3bf, 0xf3c0, 0xf3c1, 0xf3c2, + 0xf3c3, 0xf3c4, 0xf3c6, 0xf3c8, + 0xf3ca, 0xf3e0, 0xf3e1, 0xf3e2, + 0xf3e3, 0xf3e5, 0xf3e6, 0xf3e7, + 0xf3e8, 0xf3e9, 0xf3ea, 0xf3eb, + 0xf3ec, 0xf3ed, 0xf3ee, 0xf3ef, + 0xf3f0, 0xf40c, 0xf40d, 0xf414, + 0xf417, 0xf418, 0xf419, 0xf41a, + 0xf41b, 0xf41c, 0xf41d, 0xf41e, + 0xf420, 0xf421, 0xf422, 0xf423, + 0xf424, 0xf425, 0xf427, 0xf428, + 0xf429, 0xf42b, 0xf42c, 0xf42d, + 0xf42e, 0xf42f, 0xf430, 0xf431, + 0xf432, 0xf433, 0xf434, 0xf435, + 0xf436, 0xf437, 0xf438, 0xf43b, + 0xf43c, 0xf43d, 0xf43e, 0xf440, + 0xf442, 0xf443, 0xf444, 0xf445, + 0xf446, 0xf447, 0xf448, 0xf449, + 0xf44a, 0xf44b, 0xf44c, 0xf44d, + 0xf44e, 0xf44f, 0xf451, 0xf452, + 0xf453, 0xf454, 0xf455, 0xf456, + 0xf457, 0xf458, 0xf459, 0xf45a, + 0xf45b, 0xf45c, 0xf45e, 0xf45f, + 0xf460, 0xf462, 0xf463, 0xf468, + 0xf469, 0xf46a, 0xf46e, 0xf46f, + 0xf470, 0xf471, 0xf472, 0xf473, + 0xf474, 0xf475, 0xf476, 0xf477, + 0xf478, 0xf479, 0xf47a, 0xf47b, + 0xf47c, 0xf47d, 0xf47e, 0xf47f, + 0xf480, 0xf483, 0xf484, 0xf485, + 0xf486, 0xf487, 0xf488, 0xf489, + 0xf48a, 0xf48b, 0xf48c, 0xf48d, + 0xf48f, 0xf490, 0xf491, 0xf493, + 0xf494, 0xf495, 0xf496, 0xf498, + 0xf499, 0xf49a, 0xf49b, 0xf49c, + 0xf49d, 0xf49e, 0xf4a1, 0xf4a2, + 0xf4a3, 0xf4a4, 0xf4a5, 0xf4a6, + 0xf4a7, 0xf4a8, 0xf4a9, 0xf4aa, + 0xf4ab, 0xf4ac, 0xf4ae, 0xf4af, + 0xf4b0, 0xf4b2, 0xf4b3, 0xf4b4, + 0xf4b5, 0xf4b8, 0xf4b9, 0xf4bb, + 0xf4bc, 0xf4bd, 0xf4be, 0xf4bf, + 0xf4c1, 0xf4c2, 0xf4c3, 0xf4c4, + 0xf4c5, 0xf4c6, 0xf4c7, 0xf4c8, + 0xf4c9, 0xf4ca, 0xf4cb, 0xf4cc, + 0xf4cd, 0xf4ce, 0xf4cf, 0xf4d0, + 0xf4d1, 0xf4d2, 0xf4d3, 0xf4d4, + 0xf4d5, 0xf4d6, 0xf4d7, 0xf4d8, + 0xf4d9, 0xf4da, 0xf4db, 0xf4dc, + 0xf4dd, 0xf4de, 0xf4df, 0xf4e0, + 0xf4e1, 0xf4e4, 0xf4e5, 0xf4e6, + 0xf4e7, 0xf4e8, 0xf4e9, 0xf4ea, + 0xf4eb, 0xf4f0, 0xf4f1, 0xf4f2, + 0xf4f3, 0xf4f4, 0xf4f6, 0xf4f7, + 0xf4f9, 0xf4fa, 0xf4fb, 0xf4fc, + 0xf503, 0xf50a, 0xf50b, 0xf50c, + 0xf50d, 0xf50e, 0xf50f, 0xf510, + 0xf511, 0xf512, 0xf514, 0xf516, + 0xf517, 0xf518, 0xf519, 0xf51e, + 0xf51f, 0xf520, 0xf521, 0xf522, + 0xf523, 0xf524, 0xf525, 0xf526, + 0xf527, 0xf528, 0xf529, 0xf52a, + 0xf52b, 0xf52e, 0xf530, 0xf534, + 0xf535, 0xf536, 0xf537, 0xf538, + 0xf539, 0xf53a, 0xf53b, 0xf53c, + 0xf53d, 0xf5fb, 0xf5fc, 0xf5fe, + 0xf5ff, 0xf601, 0xf602, 0xf603, + 0xf609, 0xf60a, 0xf60c, 0xf60d, + 0xf60f, 0xf612, 0xf613, 0xf614, + 0xf616, 0xf618, 0xf61a, 0xf61c, + 0xf620, 0xf621, 0xf622, 0xf623, + 0xf624, 0xf628, 0xf629, 0xf62a, + 0xf62b, 0xf62d, 0xf630, 0xf631, + 0xf632, 0xf633, 0xf635, 0xf637, + 0xf638, 0xf639, 0xf63a, 0xf63b, + 0xf63c, 0xf63d, 0xf63e, 0xf63f, + 0xf640, 0xf645, 0xf646, 0xf647, + 0xf648, 0xf649, 0xf64a, 0xf64b, + 0xf64c, 0xf64d, 0xf64e, 0xf64f, + 0xf680, 0xf683, 0xf685, 0xf687, + 0xf689, 0xf68c, 0xf68f, 0xf691, + 0xf692, 0xf693, 0xf697, 0xf69a, + 0xf6a2, 0xf6a5, 0xf6a7, 0xf6a8, + 0xf6a9, 0xf6ab, 0xf6ac, 0xf6ad, + 0xf6b2, 0xf6b6, 0xf6bb, 0xf6c0, }; static const unsigned short mb_tbl_uni_kddi2code3_value[] = { // 0x1f004 - 0x1f6c0 - 0x24bc, 0x25a7, 0x255e, 0x255f, - 0x2560, 0x272a, 0x2561, 0x282f, - 0x24d0, 0x27fc, 0x24d3, 0x284c, - 0x2831, 0x276c, 0x2793, 0x24bd, - 0x2549, 0x2546, 0x24c0, 0x2545, - 0x2548, 0x2547, 0x2750, 0x254a, - 0x24c1, 0x27f7, 0x24d2, 0x24d6, - 0x24d5, 0x24d4, 0x24d1, 0x24d7, - 0x277b, 0x283f, 0x26ed, 0x281c, - 0x2533, 0x253c, 0x253f, 0x24c5, - 0x253d, 0x2743, 0x25b4, 0x258b, - 0x2597, 0x2837, 0x282c, 0x282e, - 0x282d, 0x270a, 0x270d, 0x26ec, - 0x2570, 0x25b5, 0x2766, 0x24e1, - 0x2768, 0x274e, 0x2851, 0x24df, - 0x2767, 0x2581, 0x256e, 0x25ba, - 0x2797, 0x2752, 0x24b8, 0x256f, - 0x2506, 0x2507, 0x256c, 0x256a, - 0x2751, 0x2505, 0x256d, 0x256b, - 0x2504, 0x2592, 0x2571, 0x2756, - 0x2758, 0x275a, 0x2573, 0x2748, - 0x2574, 0x24fe, 0x2759, 0x24ff, - 0x2501, 0x2838, 0x2500, 0x24fa, - 0x24fc, 0x2572, 0x24fd, 0x2502, - 0x2503, 0x25a8, 0x2771, 0x24fb, - 0x2535, 0x2582, 0x2583, 0x2584, - 0x2585, 0x2586, 0x2587, 0x258e, - 0x2591, 0x2754, 0x2508, 0x2509, - 0x2755, 0x2730, 0x24f9, 0x24e2, - 0x2745, 0x2746, 0x2576, 0x2747, - 0x24e3, 0x2823, 0x2753, 0x2824, - 0x2539, 0x274d, 0x253b, 0x2863, - 0x2536, 0x24e6, 0x24e7, 0x26f3, - 0x2575, 0x24c4, 0x252e, 0x252f, - 0x2532, 0x2538, 0x253a, 0x2531, - 0x2530, 0x26f1, 0x252d, 0x257a, - 0x2787, 0x279b, 0x278c, 0x2820, - 0x2540, 0x2822, 0x2722, 0x2742, - 0x2821, 0x274a, 0x2749, 0x26f2, - 0x2528, 0x274c, 0x257b, 0x25a6, - 0x2855, 0x2789, 0x278a, 0x2578, - 0x2527, 0x278b, 0x2517, 0x273b, - 0x24f7, 0x281e, 0x273d, 0x273c, - 0x26ef, 0x2579, 0x24be, 0x273f, - 0x2529, 0x272f, 0x2847, 0x2731, - 0x24c9, 0x24ca, 0x272e, 0x2727, - 0x24cc, 0x253e, 0x2728, 0x24cb, - 0x2541, 0x2544, 0x2741, 0x2542, - 0x2543, 0x25b6, 0x255a, 0x255b, - 0x255c, 0x2557, 0x285e, 0x2537, - 0x2556, 0x2761, 0x258f, 0x2590, - 0x2555, 0x2757, 0x24bf, 0x24c6, - 0x2764, 0x25ae, 0x2760, 0x2558, - 0x2763, 0x255d, 0x2553, 0x2859, - 0x2559, 0x2857, 0x275b, 0x275f, - 0x2577, 0x26f4, 0x275c, 0x275d, - 0x2765, 0x2762, 0x275e, 0x2858, - 0x257e, 0x2580, 0x2772, 0x2828, - 0x2829, 0x251b, 0x251c, 0x257f, - 0x24d8, 0x24d9, 0x2783, 0x2784, - 0x2777, 0x2521, 0x251f, 0x277d, - 0x2520, 0x251e, 0x2860, 0x24e9, - 0x2782, 0x24de, 0x284d, 0x25af, - 0x25a3, 0x24ee, 0x24ef, 0x2791, - 0x2788, 0x2720, 0x284e, 0x2563, - 0x279e, 0x24ea, 0x2562, 0x2780, - 0x277e, 0x2785, 0x24c8, 0x2526, - 0x2534, 0x254b, 0x254c, 0x254d, - 0x254e, 0x254f, 0x2550, 0x2551, - 0x2552, 0x257c, 0x257d, 0x274f, - 0x2856, 0x2792, 0x2770, 0x2773, - 0x277c, 0x2554, 0x278d, 0x24eb, - 0x278f, 0x24ec, 0x24ed, 0x2794, - 0x24e5, 0x276f, 0x25b0, 0x2798, - 0x2861, 0x24e0, 0x2525, 0x25ad, - 0x26fb, 0x26fc, 0x24f1, 0x276e, - 0x24f2, 0x24f3, 0x24f4, 0x24f5, - 0x258c, 0x2833, 0x26fa, 0x2769, - 0x26fe, 0x26f9, 0x2834, 0x2835, - 0x276a, 0x2778, 0x2779, 0x276d, - 0x2594, 0x2781, 0x2774, 0x2776, - 0x274b, 0x27fd, 0x2800, 0x2801, - 0x2809, 0x2593, 0x24c7, 0x284f, - 0x24b9, 0x2806, 0x27e6, 0x2790, - 0x2813, 0x2814, 0x27e5, 0x27ed, - 0x27e7, 0x27ee, 0x27f0, 0x27f9, - 0x27fa, 0x27f8, 0x27e8, 0x27f1, - 0x27e4, 0x2724, 0x27f4, 0x2726, - 0x2849, 0x27f2, 0x27ef, 0x2721, - 0x27ec, 0x2723, 0x27e9, 0x27ea, - 0x27eb, 0x27f3, 0x27a1, 0x27e3, - 0x24dd, 0x27a2, 0x281f, 0x27a4, - 0x272c, 0x2816, 0x2817, 0x27a3, - 0x25a9, 0x2815, 0x259a, 0x279f, - 0x2848, 0x280f, 0x280c, 0x2846, - 0x24db, 0x24dc, 0x24cf, 0x2799, - 0x2802, 0x2786, 0x2850, 0x2804, - 0x284b, 0x2795, 0x2808, 0x280d, - 0x279c, 0x2843, 0x284a, 0x283a, - 0x279d, 0x27a0, 0x2796, 0x2845, - 0x280e, 0x2842, 0x2844, 0x24ce, - 0x27af, 0x283b, 0x283c, 0x283d, - 0x283e, 0x258d, 0x26ff, 0x2807, - 0x280b, 0x2862, 0x2805, 0x2803, - 0x278e, 0x24da, 0x2704, 0x27ce, - 0x27cf, 0x27ca, 0x27cb, 0x27ba, - 0x27bb, 0x27de, 0x27df, 0x27c7, - 0x27c6, 0x2854, 0x2744, 0x27f6, - 0x25a4, 0x25b8, 0x259c, 0x26f5, - 0x285a, 0x2518, 0x2510, 0x285b, - 0x250a, 0x2514, 0x285d, 0x250b, - 0x250e, 0x251a, 0x2519, 0x276b, - 0x26f6, 0x2595, 0x25a1, 0x250d, - 0x250c, 0x2511, 0x259f, 0x250f, - 0x26f8, 0x26f7, 0x2516, 0x285c, - 0x2515, 0x2513, 0x2832, 0x2512, - 0x25b7, 0x259b, 0x2599, 0x259d, - 0x25a2, 0x2598, 0x2596, 0x25a0, - 0x259e, 0x2522, 0x2523, 0x2524, - 0x2588, 0x258a, 0x2589, 0x25bd, - 0x25be, 0x25bf, 0x25c0, 0x251d, - 0x285f, 0x2739, 0x2734, 0x2853, - 0x25a5, 0x2733, 0x272b, 0x252b, - 0x252a, 0x252c, 0x2735, 0x2736, - 0x24cd, 0x26ee, 0x24c2, 0x25ab, - 0x2564, 0x27c5, 0x2701, 0x2702, - 0x2732, 0x25aa, 0x2729, 0x24c3, + 0x24bc, 0x25a7, 0x255e, 0x255f, + 0x2560, 0x272a, 0x2561, 0x282f, + 0x24d0, 0x27fc, 0x24d3, 0x284c, + 0x2831, 0x276c, 0x2793, 0x24bd, + 0x2549, 0x2546, 0x24c0, 0x2545, + 0x2548, 0x2547, 0x2750, 0x254a, + 0x24c1, 0x27f7, 0x24d2, 0x24d6, + 0x24d5, 0x24d4, 0x24d1, 0x24d7, + 0x277b, 0x283f, 0x26ed, 0x281c, + 0x2533, 0x253c, 0x253f, 0x24c5, + 0x253d, 0x2743, 0x25b4, 0x258b, + 0x2597, 0x2837, 0x282c, 0x282e, + 0x282d, 0x270a, 0x270d, 0x26ec, + 0x2570, 0x25b5, 0x2766, 0x24e1, + 0x2768, 0x274e, 0x2851, 0x24df, + 0x2767, 0x2581, 0x256e, 0x25ba, + 0x2797, 0x2752, 0x24b8, 0x256f, + 0x2506, 0x2507, 0x256c, 0x256a, + 0x2751, 0x2505, 0x256d, 0x256b, + 0x2504, 0x2592, 0x2571, 0x2756, + 0x2758, 0x275a, 0x2573, 0x2748, + 0x2574, 0x24fe, 0x2759, 0x24ff, + 0x2501, 0x2838, 0x2500, 0x24fa, + 0x24fc, 0x2572, 0x24fd, 0x2502, + 0x2503, 0x25a8, 0x2771, 0x24fb, + 0x2535, 0x2582, 0x2583, 0x2584, + 0x2585, 0x2586, 0x2587, 0x258e, + 0x2591, 0x2754, 0x2508, 0x2509, + 0x2755, 0x2730, 0x24f9, 0x24e2, + 0x2745, 0x2746, 0x2576, 0x2747, + 0x24e3, 0x2823, 0x2753, 0x2824, + 0x2539, 0x274d, 0x253b, 0x2863, + 0x2536, 0x24e6, 0x24e7, 0x26f3, + 0x2575, 0x24c4, 0x252e, 0x252f, + 0x2532, 0x2538, 0x253a, 0x2531, + 0x2530, 0x26f1, 0x252d, 0x257a, + 0x2787, 0x279b, 0x278c, 0x2820, + 0x2540, 0x2822, 0x2722, 0x2742, + 0x2821, 0x274a, 0x2749, 0x26f2, + 0x2528, 0x274c, 0x257b, 0x25a6, + 0x2855, 0x2789, 0x278a, 0x2578, + 0x2527, 0x278b, 0x2517, 0x273b, + 0x24f7, 0x281e, 0x273d, 0x273c, + 0x26ef, 0x2579, 0x24be, 0x273f, + 0x2529, 0x272f, 0x2847, 0x2731, + 0x24c9, 0x24ca, 0x272e, 0x2727, + 0x24cc, 0x253e, 0x2728, 0x24cb, + 0x2541, 0x2544, 0x2741, 0x2542, + 0x2543, 0x25b6, 0x255a, 0x255b, + 0x255c, 0x2557, 0x285e, 0x2537, + 0x2556, 0x2761, 0x258f, 0x2590, + 0x2555, 0x2757, 0x24bf, 0x24c6, + 0x2764, 0x25ae, 0x2760, 0x2558, + 0x2763, 0x255d, 0x2553, 0x2859, + 0x2559, 0x2857, 0x275b, 0x275f, + 0x2577, 0x26f4, 0x275c, 0x275d, + 0x2765, 0x2762, 0x275e, 0x2858, + 0x257e, 0x2580, 0x2772, 0x2828, + 0x2829, 0x251b, 0x251c, 0x257f, + 0x24d8, 0x24d9, 0x2783, 0x2784, + 0x2777, 0x2521, 0x251f, 0x277d, + 0x2520, 0x251e, 0x2860, 0x24e9, + 0x2782, 0x24de, 0x284d, 0x25af, + 0x25a3, 0x24ee, 0x24ef, 0x2791, + 0x2788, 0x2720, 0x284e, 0x2563, + 0x279e, 0x24ea, 0x2562, 0x2780, + 0x277e, 0x2785, 0x24c8, 0x2526, + 0x2534, 0x254b, 0x254c, 0x254d, + 0x254e, 0x254f, 0x2550, 0x2551, + 0x2552, 0x257c, 0x257d, 0x274f, + 0x2856, 0x2792, 0x2770, 0x2773, + 0x277c, 0x2554, 0x278d, 0x24eb, + 0x278f, 0x24ec, 0x24ed, 0x2794, + 0x24e5, 0x276f, 0x25b0, 0x2798, + 0x2861, 0x24e0, 0x2525, 0x25ad, + 0x26fb, 0x26fc, 0x24f1, 0x276e, + 0x24f2, 0x24f3, 0x24f4, 0x24f5, + 0x258c, 0x2833, 0x26fa, 0x2769, + 0x26fe, 0x26f9, 0x2834, 0x2835, + 0x276a, 0x2778, 0x2779, 0x276d, + 0x2594, 0x2781, 0x2774, 0x2776, + 0x274b, 0x27fd, 0x2800, 0x2801, + 0x2809, 0x2593, 0x24c7, 0x284f, + 0x24b9, 0x2806, 0x27e6, 0x2790, + 0x2813, 0x2814, 0x27e5, 0x27ed, + 0x27e7, 0x27ee, 0x27f0, 0x27f9, + 0x27fa, 0x27f8, 0x27e8, 0x27f1, + 0x27e4, 0x2724, 0x27f4, 0x2726, + 0x2849, 0x27f2, 0x27ef, 0x2721, + 0x27ec, 0x2723, 0x27e9, 0x27ea, + 0x27eb, 0x27f3, 0x27a1, 0x27e3, + 0x24dd, 0x27a2, 0x281f, 0x27a4, + 0x272c, 0x2816, 0x2817, 0x27a3, + 0x25a9, 0x2815, 0x259a, 0x279f, + 0x2848, 0x280f, 0x280c, 0x2846, + 0x24db, 0x24dc, 0x24cf, 0x2799, + 0x2802, 0x2786, 0x2850, 0x2804, + 0x284b, 0x2795, 0x2808, 0x280d, + 0x279c, 0x2843, 0x284a, 0x283a, + 0x279d, 0x27a0, 0x2796, 0x2845, + 0x280e, 0x2842, 0x2844, 0x24ce, + 0x27af, 0x283b, 0x283c, 0x283d, + 0x283e, 0x258d, 0x26ff, 0x2807, + 0x280b, 0x2862, 0x2805, 0x2803, + 0x278e, 0x24da, 0x2704, 0x27ce, + 0x27cf, 0x27ca, 0x27cb, 0x27ba, + 0x27bb, 0x27de, 0x27df, 0x27c7, + 0x27c6, 0x2854, 0x2744, 0x27f6, + 0x25a4, 0x25b8, 0x259c, 0x26f5, + 0x285a, 0x2518, 0x2510, 0x285b, + 0x250a, 0x2514, 0x285d, 0x250b, + 0x250e, 0x251a, 0x2519, 0x276b, + 0x26f6, 0x2595, 0x25a1, 0x250d, + 0x250c, 0x2511, 0x259f, 0x250f, + 0x26f8, 0x26f7, 0x2516, 0x285c, + 0x2515, 0x2513, 0x2832, 0x2512, + 0x25b7, 0x259b, 0x2599, 0x259d, + 0x25a2, 0x2598, 0x2596, 0x25a0, + 0x259e, 0x2522, 0x2523, 0x2524, + 0x2588, 0x258a, 0x2589, 0x25bd, + 0x25be, 0x25bf, 0x25c0, 0x251d, + 0x285f, 0x2739, 0x2734, 0x2853, + 0x25a5, 0x2733, 0x272b, 0x252b, + 0x252a, 0x252c, 0x2735, 0x2736, + 0x24cd, 0x26ee, 0x24c2, 0x25ab, + 0x2564, 0x27c5, 0x2701, 0x2702, + 0x2732, 0x25aa, 0x2729, 0x24c3, }; static const int mb_tbl_uni_kddi2code3_len = sizeof(mb_tbl_uni_kddi2code3_key)/sizeof(unsigned short); @@ -897,15 +897,15 @@ static const int mb_tbl_uni_sb2code1_min = 0x0023; static const int mb_tbl_uni_sb2code1_max = 0x00ae; static const unsigned short mb_tbl_uni_sb2code1_key[] = { // 0x0023 - 0x00ae - 0x0023, 0x0030, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0x00a9, + 0x0023, 0x0030, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, + 0x0037, 0x0038, 0x0039, 0x00a9, 0x00ae, }; static const unsigned short mb_tbl_uni_sb2code1_value[] = { // 0x0023 - 0x00ae - 0x2817, 0x282c, 0x2823, 0x2824, - 0x2825, 0x2826, 0x2827, 0x2828, - 0x2829, 0x282a, 0x282b, 0x2855, + 0x2817, 0x282c, 0x2823, 0x2824, + 0x2825, 0x2826, 0x2827, 0x2828, + 0x2829, 0x282a, 0x282b, 0x2855, 0x2856, }; static const int mb_tbl_uni_sb2code1_len = sizeof(mb_tbl_uni_sb2code1_key)/sizeof(unsigned short); @@ -914,41 +914,41 @@ static const int mb_tbl_uni_sb2code2_min = 0x2122; static const int mb_tbl_uni_sb2code2_max = 0x3299; static const unsigned short mb_tbl_uni_sb2code2_key[] = { // 0x2122 - 0x3299 - 0x2122, 0x2196, 0x2197, 0x2198, - 0x2199, 0x23e9, 0x23ea, 0x25b6, - 0x25c0, 0x2600, 0x2601, 0x260e, - 0x2614, 0x2615, 0x261d, 0x263a, - 0x2648, 0x2649, 0x264a, 0x264b, - 0x264c, 0x264d, 0x264e, 0x264f, - 0x2650, 0x2651, 0x2652, 0x2653, - 0x2660, 0x2663, 0x2665, 0x2666, - 0x2668, 0x267f, 0x26a0, 0x26a1, - 0x26bd, 0x26be, 0x26c4, 0x26ce, - 0x26ea, 0x26f2, 0x26f3, 0x26f5, - 0x26fa, 0x26fd, 0x2702, 0x2708, - 0x270a, 0x270b, 0x270c, 0x2728, - 0x2733, 0x2734, 0x274c, 0x2753, - 0x2754, 0x2755, 0x2757, 0x2764, + 0x2122, 0x2196, 0x2197, 0x2198, + 0x2199, 0x23e9, 0x23ea, 0x25b6, + 0x25c0, 0x2600, 0x2601, 0x260e, + 0x2614, 0x2615, 0x261d, 0x263a, + 0x2648, 0x2649, 0x264a, 0x264b, + 0x264c, 0x264d, 0x264e, 0x264f, + 0x2650, 0x2651, 0x2652, 0x2653, + 0x2660, 0x2663, 0x2665, 0x2666, + 0x2668, 0x267f, 0x26a0, 0x26a1, + 0x26bd, 0x26be, 0x26c4, 0x26ce, + 0x26ea, 0x26f2, 0x26f3, 0x26f5, + 0x26fa, 0x26fd, 0x2702, 0x2708, + 0x270a, 0x270b, 0x270c, 0x2728, + 0x2733, 0x2734, 0x274c, 0x2753, + 0x2754, 0x2755, 0x2757, 0x2764, 0x27a1, 0x27bf, 0x2b05, 0x2b06, - 0x2b07, 0x2b50, 0x2b55, 0x303d, + 0x2b07, 0x2b50, 0x2b55, 0x303d, 0x3297, 0x3299, }; static const unsigned short mb_tbl_uni_sb2code2_value[] = { // 0x2122 - 0x3299 - 0x2b2e, 0x283e, 0x283d, 0x283f, - 0x2840, 0x2843, 0x2844, 0x2841, - 0x2842, 0x296a, 0x2969, 0x2929, - 0x296b, 0x2965, 0x292f, 0x2aac, - 0x2846, 0x2847, 0x2848, 0x2849, - 0x284a, 0x284b, 0x284c, 0x284d, - 0x284e, 0x284f, 0x2850, 0x2851, - 0x2815, 0x2816, 0x2813, 0x2814, - 0x27cb, 0x2811, 0x2859, 0x27e5, - 0x2938, 0x2936, 0x2968, 0x2852, - 0x2957, 0x27c9, 0x2934, 0x293c, - 0x27ca, 0x295a, 0x2992, 0x293d, - 0x2930, 0x2932, 0x2931, 0x29ad, - 0x280d, 0x280c, 0x29b2, 0x2940, - 0x29b5, 0x29b6, 0x2941, 0x2942, + 0x2b2e, 0x283e, 0x283d, 0x283f, + 0x2840, 0x2843, 0x2844, 0x2841, + 0x2842, 0x296a, 0x2969, 0x2929, + 0x296b, 0x2965, 0x292f, 0x2aac, + 0x2846, 0x2847, 0x2848, 0x2849, + 0x284a, 0x284b, 0x284c, 0x284d, + 0x284e, 0x284f, 0x2850, 0x2851, + 0x2815, 0x2816, 0x2813, 0x2814, + 0x27cb, 0x2811, 0x2859, 0x27e5, + 0x2938, 0x2936, 0x2968, 0x2852, + 0x2957, 0x27c9, 0x2934, 0x293c, + 0x27ca, 0x295a, 0x2992, 0x293d, + 0x2930, 0x2932, 0x2931, 0x29ad, + 0x280d, 0x280c, 0x29b2, 0x2940, + 0x29b5, 0x29b6, 0x2941, 0x2942, 0x283b, 0x2818, 0x283c, 0x2839, 0x283a, 0x29ae, 0x29b1, 0x27d4, 0x298c, 0x2994, }; @@ -959,201 +959,201 @@ static const int mb_tbl_uni_sb2code3_min = 0x1f004; static const int mb_tbl_uni_sb2code3_max = 0x1f6c0; static const unsigned short mb_tbl_uni_sb2code3_key[] = { // 0x1f004 - 0x1f6c0 - 0xf004, 0xf170, 0xf171, 0xf17e, - 0xf17f, 0xf18e, 0xf192, 0xf194, - 0xf195, 0xf197, 0xf199, 0xf19a, - 0xf1e8, 0xf1e9, 0xf1ea, 0xf1eb, - 0xf1ec, 0xf1ee, 0xf1ef, 0xf1f0, - 0xf1f7, 0xf1fa, 0xf201, 0xf202, - 0xf21a, 0xf22f, 0xf233, 0xf235, - 0xf236, 0xf237, 0xf238, 0xf239, - 0xf23a, 0xf250, 0xf300, 0xf302, - 0xf303, 0xf304, 0xf305, 0xf306, - 0xf307, 0xf308, 0xf30a, 0xf319, - 0xf31f, 0xf334, 0xf335, 0xf337, - 0xf338, 0xf339, 0xf33a, 0xf33b, - 0xf33e, 0xf340, 0xf341, 0xf342, - 0xf343, 0xf345, 0xf346, 0xf349, - 0xf34a, 0xf34e, 0xf353, 0xf354, - 0xf358, 0xf359, 0xf35a, 0xf35b, - 0xf35c, 0xf35d, 0xf35e, 0xf35f, - 0xf361, 0xf362, 0xf363, 0xf366, - 0xf367, 0xf370, 0xf371, 0xf372, - 0xf373, 0xf374, 0xf375, 0xf376, - 0xf378, 0xf37a, 0xf37b, 0xf380, - 0xf381, 0xf382, 0xf383, 0xf384, - 0xf385, 0xf386, 0xf387, 0xf388, - 0xf389, 0xf38c, 0xf38d, 0xf38e, - 0xf38f, 0xf390, 0xf391, 0xf392, - 0xf393, 0xf3a1, 0xf3a2, 0xf3a4, - 0xf3a5, 0xf3a6, 0xf3a7, 0xf3a8, - 0xf3a9, 0xf3ab, 0xf3ac, 0xf3af, - 0xf3b0, 0xf3b1, 0xf3b5, 0xf3b6, - 0xf3b7, 0xf3b8, 0xf3ba, 0xf3be, - 0xf3bf, 0xf3c0, 0xf3c1, 0xf3c3, - 0xf3c4, 0xf3c6, 0xf3c8, 0xf3ca, - 0xf3e0, 0xf3e2, 0xf3e3, 0xf3e5, - 0xf3e6, 0xf3e7, 0xf3e8, 0xf3e9, - 0xf3ea, 0xf3eb, 0xf3ec, 0xf3ed, - 0xf3ef, 0xf3f0, 0xf40d, 0xf40e, - 0xf411, 0xf412, 0xf414, 0xf417, - 0xf418, 0xf419, 0xf41a, 0xf41b, - 0xf41f, 0xf420, 0xf424, 0xf426, - 0xf427, 0xf428, 0xf42b, 0xf42c, - 0xf42d, 0xf42e, 0xf42f, 0xf430, - 0xf431, 0xf433, 0xf434, 0xf435, - 0xf436, 0xf437, 0xf438, 0xf439, - 0xf43a, 0xf43b, 0xf440, 0xf442, - 0xf443, 0xf444, 0xf446, 0xf447, - 0xf448, 0xf449, 0xf44a, 0xf44b, - 0xf44c, 0xf44d, 0xf44e, 0xf44f, - 0xf450, 0xf451, 0xf452, 0xf454, - 0xf455, 0xf457, 0xf458, 0xf459, - 0xf45c, 0xf45f, 0xf460, 0xf461, - 0xf462, 0xf463, 0xf466, 0xf467, - 0xf468, 0xf469, 0xf46b, 0xf46e, - 0xf46f, 0xf471, 0xf472, 0xf473, - 0xf474, 0xf475, 0xf476, 0xf477, - 0xf478, 0xf47b, 0xf47c, 0xf47d, - 0xf47e, 0xf47f, 0xf480, 0xf481, - 0xf482, 0xf483, 0xf484, 0xf485, - 0xf486, 0xf487, 0xf488, 0xf489, - 0xf48a, 0xf48b, 0xf48d, 0xf48e, - 0xf48f, 0xf490, 0xf491, 0xf492, - 0xf493, 0xf494, 0xf497, 0xf498, - 0xf499, 0xf49a, 0xf49b, 0xf49c, - 0xf49d, 0xf49f, 0xf4a1, 0xf4a2, - 0xf4a3, 0xf4a4, 0xf4a6, 0xf4a8, - 0xf4a9, 0xf4aa, 0xf4b0, 0xf4b1, - 0xf4b9, 0xf4ba, 0xf4bb, 0xf4bc, - 0xf4bd, 0xf4bf, 0xf4c0, 0xf4d6, - 0xf4dd, 0xf4e0, 0xf4e1, 0xf4e2, - 0xf4e3, 0xf4e9, 0xf4eb, 0xf4ee, - 0xf4f1, 0xf4f2, 0xf4f3, 0xf4f4, - 0xf4f6, 0xf4f7, 0xf4fa, 0xf4fb, - 0xf4fc, 0xf50a, 0xf50d, 0xf511, - 0xf512, 0xf513, 0xf514, 0xf51d, - 0xf51e, 0xf525, 0xf528, 0xf52b, - 0xf52f, 0xf530, 0xf531, 0xf532, - 0xf533, 0xf534, 0xf550, 0xf551, - 0xf552, 0xf553, 0xf554, 0xf555, - 0xf556, 0xf557, 0xf558, 0xf559, - 0xf55a, 0xf55b, 0xf5fb, 0xf5fc, - 0xf5fd, 0xf601, 0xf602, 0xf603, - 0xf604, 0xf609, 0xf60a, 0xf60c, - 0xf60d, 0xf60f, 0xf612, 0xf613, - 0xf614, 0xf616, 0xf618, 0xf61a, - 0xf61c, 0xf61d, 0xf61e, 0xf620, - 0xf621, 0xf622, 0xf623, 0xf625, - 0xf628, 0xf62a, 0xf62d, 0xf630, - 0xf631, 0xf632, 0xf633, 0xf637, - 0xf645, 0xf646, 0xf647, 0xf64c, - 0xf64f, 0xf680, 0xf683, 0xf684, - 0xf685, 0xf687, 0xf689, 0xf68c, - 0xf68f, 0xf691, 0xf692, 0xf693, - 0xf695, 0xf697, 0xf699, 0xf69a, - 0xf6a2, 0xf6a4, 0xf6a5, 0xf6a7, - 0xf6ac, 0xf6ad, 0xf6b2, 0xf6b6, - 0xf6b9, 0xf6ba, 0xf6bb, 0xf6bc, + 0xf004, 0xf170, 0xf171, 0xf17e, + 0xf17f, 0xf18e, 0xf192, 0xf194, + 0xf195, 0xf197, 0xf199, 0xf19a, + 0xf1e8, 0xf1e9, 0xf1ea, 0xf1eb, + 0xf1ec, 0xf1ee, 0xf1ef, 0xf1f0, + 0xf1f7, 0xf1fa, 0xf201, 0xf202, + 0xf21a, 0xf22f, 0xf233, 0xf235, + 0xf236, 0xf237, 0xf238, 0xf239, + 0xf23a, 0xf250, 0xf300, 0xf302, + 0xf303, 0xf304, 0xf305, 0xf306, + 0xf307, 0xf308, 0xf30a, 0xf319, + 0xf31f, 0xf334, 0xf335, 0xf337, + 0xf338, 0xf339, 0xf33a, 0xf33b, + 0xf33e, 0xf340, 0xf341, 0xf342, + 0xf343, 0xf345, 0xf346, 0xf349, + 0xf34a, 0xf34e, 0xf353, 0xf354, + 0xf358, 0xf359, 0xf35a, 0xf35b, + 0xf35c, 0xf35d, 0xf35e, 0xf35f, + 0xf361, 0xf362, 0xf363, 0xf366, + 0xf367, 0xf370, 0xf371, 0xf372, + 0xf373, 0xf374, 0xf375, 0xf376, + 0xf378, 0xf37a, 0xf37b, 0xf380, + 0xf381, 0xf382, 0xf383, 0xf384, + 0xf385, 0xf386, 0xf387, 0xf388, + 0xf389, 0xf38c, 0xf38d, 0xf38e, + 0xf38f, 0xf390, 0xf391, 0xf392, + 0xf393, 0xf3a1, 0xf3a2, 0xf3a4, + 0xf3a5, 0xf3a6, 0xf3a7, 0xf3a8, + 0xf3a9, 0xf3ab, 0xf3ac, 0xf3af, + 0xf3b0, 0xf3b1, 0xf3b5, 0xf3b6, + 0xf3b7, 0xf3b8, 0xf3ba, 0xf3be, + 0xf3bf, 0xf3c0, 0xf3c1, 0xf3c3, + 0xf3c4, 0xf3c6, 0xf3c8, 0xf3ca, + 0xf3e0, 0xf3e2, 0xf3e3, 0xf3e5, + 0xf3e6, 0xf3e7, 0xf3e8, 0xf3e9, + 0xf3ea, 0xf3eb, 0xf3ec, 0xf3ed, + 0xf3ef, 0xf3f0, 0xf40d, 0xf40e, + 0xf411, 0xf412, 0xf414, 0xf417, + 0xf418, 0xf419, 0xf41a, 0xf41b, + 0xf41f, 0xf420, 0xf424, 0xf426, + 0xf427, 0xf428, 0xf42b, 0xf42c, + 0xf42d, 0xf42e, 0xf42f, 0xf430, + 0xf431, 0xf433, 0xf434, 0xf435, + 0xf436, 0xf437, 0xf438, 0xf439, + 0xf43a, 0xf43b, 0xf440, 0xf442, + 0xf443, 0xf444, 0xf446, 0xf447, + 0xf448, 0xf449, 0xf44a, 0xf44b, + 0xf44c, 0xf44d, 0xf44e, 0xf44f, + 0xf450, 0xf451, 0xf452, 0xf454, + 0xf455, 0xf457, 0xf458, 0xf459, + 0xf45c, 0xf45f, 0xf460, 0xf461, + 0xf462, 0xf463, 0xf466, 0xf467, + 0xf468, 0xf469, 0xf46b, 0xf46e, + 0xf46f, 0xf471, 0xf472, 0xf473, + 0xf474, 0xf475, 0xf476, 0xf477, + 0xf478, 0xf47b, 0xf47c, 0xf47d, + 0xf47e, 0xf47f, 0xf480, 0xf481, + 0xf482, 0xf483, 0xf484, 0xf485, + 0xf486, 0xf487, 0xf488, 0xf489, + 0xf48a, 0xf48b, 0xf48d, 0xf48e, + 0xf48f, 0xf490, 0xf491, 0xf492, + 0xf493, 0xf494, 0xf497, 0xf498, + 0xf499, 0xf49a, 0xf49b, 0xf49c, + 0xf49d, 0xf49f, 0xf4a1, 0xf4a2, + 0xf4a3, 0xf4a4, 0xf4a6, 0xf4a8, + 0xf4a9, 0xf4aa, 0xf4b0, 0xf4b1, + 0xf4b9, 0xf4ba, 0xf4bb, 0xf4bc, + 0xf4bd, 0xf4bf, 0xf4c0, 0xf4d6, + 0xf4dd, 0xf4e0, 0xf4e1, 0xf4e2, + 0xf4e3, 0xf4e9, 0xf4eb, 0xf4ee, + 0xf4f1, 0xf4f2, 0xf4f3, 0xf4f4, + 0xf4f6, 0xf4f7, 0xf4fa, 0xf4fb, + 0xf4fc, 0xf50a, 0xf50d, 0xf511, + 0xf512, 0xf513, 0xf514, 0xf51d, + 0xf51e, 0xf525, 0xf528, 0xf52b, + 0xf52f, 0xf530, 0xf531, 0xf532, + 0xf533, 0xf534, 0xf550, 0xf551, + 0xf552, 0xf553, 0xf554, 0xf555, + 0xf556, 0xf557, 0xf558, 0xf559, + 0xf55a, 0xf55b, 0xf5fb, 0xf5fc, + 0xf5fd, 0xf601, 0xf602, 0xf603, + 0xf604, 0xf609, 0xf60a, 0xf60c, + 0xf60d, 0xf60f, 0xf612, 0xf613, + 0xf614, 0xf616, 0xf618, 0xf61a, + 0xf61c, 0xf61d, 0xf61e, 0xf620, + 0xf621, 0xf622, 0xf623, 0xf625, + 0xf628, 0xf62a, 0xf62d, 0xf630, + 0xf631, 0xf632, 0xf633, 0xf637, + 0xf645, 0xf646, 0xf647, 0xf64c, + 0xf64f, 0xf680, 0xf683, 0xf684, + 0xf685, 0xf687, 0xf689, 0xf68c, + 0xf68f, 0xf691, 0xf692, 0xf693, + 0xf695, 0xf697, 0xf699, 0xf69a, + 0xf6a2, 0xf6a4, 0xf6a5, 0xf6a7, + 0xf6ac, 0xf6ad, 0xf6b2, 0xf6b6, + 0xf6b9, 0xf6ba, 0xf6bb, 0xf6bc, 0xf6bd, 0xf6be, 0xf6c0, }; static const unsigned short mb_tbl_uni_sb2code3_value[] = { // 0x1f004 - 0x1f6c0 - 0x27d5, 0x2b29, 0x2b2a, 0x2b2c, - 0x27f7, 0x2b2b, 0x281b, 0x2830, - 0x2819, 0x2854, 0x281a, 0x27d6, - 0x2b0a, 0x2b05, 0x2b08, 0x2b04, - 0x2b07, 0x2b06, 0x2b02, 0x2b0b, - 0x2b09, 0x2b03, 0x280a, 0x282f, - 0x281d, 0x2833, 0x2832, 0x2831, - 0x281c, 0x281e, 0x281f, 0x282e, - 0x2834, 0x282d, 0x2adb, 0x2ad4, - 0x2ae3, 0x296d, 0x2ae1, 0x27ee, - 0x2ae2, 0x2ae4, 0x2ad6, 0x296c, - 0x29b4, 0x2986, 0x2987, 0x2983, - 0x2950, 0x2952, 0x2982, 0x2984, - 0x2adc, 0x27b8, 0x27c0, 0x27c1, - 0x2adf, 0x29c8, 0x29c9, 0x29c7, - 0x29c5, 0x29c4, 0x29c6, 0x27c8, - 0x29bc, 0x29c1, 0x29bd, 0x29c0, - 0x29bf, 0x29be, 0x29b8, 0x29ba, - 0x29bb, 0x29c2, 0x29c3, 0x29b9, - 0x2ad7, 0x2966, 0x29cb, 0x29cc, - 0x27ef, 0x2963, 0x29b7, 0x298a, - 0x2964, 0x2967, 0x298b, 0x2993, - 0x27ba, 0x29ca, 0x2add, 0x2953, - 0x2ae0, 0x27bf, 0x2ad8, 0x298f, - 0x2991, 0x27eb, 0x2ace, 0x2ad0, - 0x2ad3, 0x2ada, 0x2ade, 0x2ad2, - 0x2ad1, 0x27cc, 0x2acb, 0x295c, - 0x295d, 0x2afe, 0x2989, 0x2af9, - 0x2afa, 0x27cd, 0x29a3, 0x27d8, - 0x27db, 0x2ac4, 0x295e, 0x29a5, - 0x2960, 0x2961, 0x2962, 0x2935, - 0x2933, 0x2ac2, 0x27da, 0x27bd, - 0x2937, 0x27d9, 0x2ac3, 0x2ac5, - 0x2956, 0x2958, 0x27fb, 0x27fd, - 0x27f5, 0x27fc, 0x2800, 0x2af8, - 0x27fe, 0x27ff, 0x2afb, 0x2aff, - 0x2afc, 0x2afd, 0x2b24, 0x27dc, - 0x2b20, 0x2b1f, 0x2b25, 0x2b26, - 0x2b1d, 0x27b2, 0x2ad9, 0x2b1c, - 0x2939, 0x2b19, 0x2b1a, 0x2b18, - 0x2975, 0x2b1e, 0x2b27, 0x2b17, - 0x2973, 0x2b22, 0x2970, 0x2b23, - 0x296f, 0x2974, 0x293a, 0x27b1, - 0x2972, 0x27b3, 0x2b28, 0x2b1b, - 0x2b21, 0x2971, 0x2ab1, 0x2ab3, - 0x2ab2, 0x2ab4, 0x2835, 0x2836, - 0x2837, 0x2838, 0x292d, 0x2ab6, - 0x2ab8, 0x292e, 0x2ab9, 0x2ab7, - 0x2aba, 0x27b6, 0x2997, 0x2981, - 0x2926, 0x2998, 0x29a0, 0x29a1, - 0x29a2, 0x2927, 0x27e6, 0x2999, - 0x299a, 0x2b2d, 0x2921, 0x2922, - 0x2924, 0x2925, 0x2ac0, 0x27fa, - 0x2ac1, 0x2b0c, 0x2b0d, 0x2b0e, - 0x2b0f, 0x2b10, 0x2b11, 0x2b12, - 0x2b13, 0x27c3, 0x296e, 0x27b4, - 0x27d3, 0x27c2, 0x27c4, 0x285a, - 0x2b15, 0x2b16, 0x299b, 0x299c, - 0x299d, 0x299e, 0x299f, 0x27e3, - 0x298e, 0x2923, 0x2954, 0x2955, - 0x27b9, 0x2985, 0x2abd, 0x2ad5, - 0x29a6, 0x2943, 0x29a7, 0x29a8, - 0x29a9, 0x29aa, 0x29ab, 0x29ac, - 0x2acf, 0x280b, 0x27b7, 0x29b3, - 0x2990, 0x27e4, 0x29b0, 0x29af, - 0x297a, 0x27f4, 0x27d7, 0x27f1, - 0x27f2, 0x27c7, 0x292c, 0x27c6, - 0x2995, 0x27ce, 0x27cf, 0x27f0, - 0x2980, 0x292b, 0x27f3, 0x27ea, - 0x2996, 0x27ab, 0x27a9, 0x27aa, - 0x292a, 0x27ac, 0x2857, 0x2858, - 0x2812, 0x2928, 0x27d2, 0x27d0, - 0x27d1, 0x27e9, 0x27bc, 0x295f, - 0x27ec, 0x27ed, 0x29a4, 0x2853, - 0x280e, 0x27c5, 0x27be, 0x27bb, - 0x2845, 0x2810, 0x2951, 0x2821, - 0x2822, 0x2820, 0x2944, 0x2945, - 0x2946, 0x2947, 0x2948, 0x2949, - 0x294a, 0x294b, 0x294c, 0x294d, - 0x294e, 0x294f, 0x295b, 0x2b00, - 0x2b14, 0x2a9c, 0x2aaa, 0x2977, - 0x2aad, 0x2a9d, 0x2976, 0x2aa2, - 0x27ae, 0x2a9a, 0x2aa6, 0x27b0, - 0x2a9b, 0x2a9f, 0x2ab0, 0x2aaf, - 0x27ad, 0x2aa1, 0x2978, 0x2979, - 0x2aae, 0x2aab, 0x2a9e, 0x2a99, - 0x2aa3, 0x2aa0, 0x2aa9, 0x2aa7, - 0x27af, 0x2aa8, 0x2aa5, 0x2aa4, - 0x2abb, 0x2abc, 0x2abe, 0x2abf, - 0x2ab5, 0x27b5, 0x293e, 0x2acd, - 0x293f, 0x2acc, 0x2959, 0x2801, - 0x27f8, 0x2ac9, 0x2ac8, 0x2aca, - 0x2802, 0x293b, 0x2ac6, 0x2ac7, - 0x2809, 0x27dd, 0x27f6, 0x27df, - 0x298d, 0x280f, 0x27de, 0x2808, - 0x27e0, 0x27e1, 0x27f9, 0x27e2, + 0x27d5, 0x2b29, 0x2b2a, 0x2b2c, + 0x27f7, 0x2b2b, 0x281b, 0x2830, + 0x2819, 0x2854, 0x281a, 0x27d6, + 0x2b0a, 0x2b05, 0x2b08, 0x2b04, + 0x2b07, 0x2b06, 0x2b02, 0x2b0b, + 0x2b09, 0x2b03, 0x280a, 0x282f, + 0x281d, 0x2833, 0x2832, 0x2831, + 0x281c, 0x281e, 0x281f, 0x282e, + 0x2834, 0x282d, 0x2adb, 0x2ad4, + 0x2ae3, 0x296d, 0x2ae1, 0x27ee, + 0x2ae2, 0x2ae4, 0x2ad6, 0x296c, + 0x29b4, 0x2986, 0x2987, 0x2983, + 0x2950, 0x2952, 0x2982, 0x2984, + 0x2adc, 0x27b8, 0x27c0, 0x27c1, + 0x2adf, 0x29c8, 0x29c9, 0x29c7, + 0x29c5, 0x29c4, 0x29c6, 0x27c8, + 0x29bc, 0x29c1, 0x29bd, 0x29c0, + 0x29bf, 0x29be, 0x29b8, 0x29ba, + 0x29bb, 0x29c2, 0x29c3, 0x29b9, + 0x2ad7, 0x2966, 0x29cb, 0x29cc, + 0x27ef, 0x2963, 0x29b7, 0x298a, + 0x2964, 0x2967, 0x298b, 0x2993, + 0x27ba, 0x29ca, 0x2add, 0x2953, + 0x2ae0, 0x27bf, 0x2ad8, 0x298f, + 0x2991, 0x27eb, 0x2ace, 0x2ad0, + 0x2ad3, 0x2ada, 0x2ade, 0x2ad2, + 0x2ad1, 0x27cc, 0x2acb, 0x295c, + 0x295d, 0x2afe, 0x2989, 0x2af9, + 0x2afa, 0x27cd, 0x29a3, 0x27d8, + 0x27db, 0x2ac4, 0x295e, 0x29a5, + 0x2960, 0x2961, 0x2962, 0x2935, + 0x2933, 0x2ac2, 0x27da, 0x27bd, + 0x2937, 0x27d9, 0x2ac3, 0x2ac5, + 0x2956, 0x2958, 0x27fb, 0x27fd, + 0x27f5, 0x27fc, 0x2800, 0x2af8, + 0x27fe, 0x27ff, 0x2afb, 0x2aff, + 0x2afc, 0x2afd, 0x2b24, 0x27dc, + 0x2b20, 0x2b1f, 0x2b25, 0x2b26, + 0x2b1d, 0x27b2, 0x2ad9, 0x2b1c, + 0x2939, 0x2b19, 0x2b1a, 0x2b18, + 0x2975, 0x2b1e, 0x2b27, 0x2b17, + 0x2973, 0x2b22, 0x2970, 0x2b23, + 0x296f, 0x2974, 0x293a, 0x27b1, + 0x2972, 0x27b3, 0x2b28, 0x2b1b, + 0x2b21, 0x2971, 0x2ab1, 0x2ab3, + 0x2ab2, 0x2ab4, 0x2835, 0x2836, + 0x2837, 0x2838, 0x292d, 0x2ab6, + 0x2ab8, 0x292e, 0x2ab9, 0x2ab7, + 0x2aba, 0x27b6, 0x2997, 0x2981, + 0x2926, 0x2998, 0x29a0, 0x29a1, + 0x29a2, 0x2927, 0x27e6, 0x2999, + 0x299a, 0x2b2d, 0x2921, 0x2922, + 0x2924, 0x2925, 0x2ac0, 0x27fa, + 0x2ac1, 0x2b0c, 0x2b0d, 0x2b0e, + 0x2b0f, 0x2b10, 0x2b11, 0x2b12, + 0x2b13, 0x27c3, 0x296e, 0x27b4, + 0x27d3, 0x27c2, 0x27c4, 0x285a, + 0x2b15, 0x2b16, 0x299b, 0x299c, + 0x299d, 0x299e, 0x299f, 0x27e3, + 0x298e, 0x2923, 0x2954, 0x2955, + 0x27b9, 0x2985, 0x2abd, 0x2ad5, + 0x29a6, 0x2943, 0x29a7, 0x29a8, + 0x29a9, 0x29aa, 0x29ab, 0x29ac, + 0x2acf, 0x280b, 0x27b7, 0x29b3, + 0x2990, 0x27e4, 0x29b0, 0x29af, + 0x297a, 0x27f4, 0x27d7, 0x27f1, + 0x27f2, 0x27c7, 0x292c, 0x27c6, + 0x2995, 0x27ce, 0x27cf, 0x27f0, + 0x2980, 0x292b, 0x27f3, 0x27ea, + 0x2996, 0x27ab, 0x27a9, 0x27aa, + 0x292a, 0x27ac, 0x2857, 0x2858, + 0x2812, 0x2928, 0x27d2, 0x27d0, + 0x27d1, 0x27e9, 0x27bc, 0x295f, + 0x27ec, 0x27ed, 0x29a4, 0x2853, + 0x280e, 0x27c5, 0x27be, 0x27bb, + 0x2845, 0x2810, 0x2951, 0x2821, + 0x2822, 0x2820, 0x2944, 0x2945, + 0x2946, 0x2947, 0x2948, 0x2949, + 0x294a, 0x294b, 0x294c, 0x294d, + 0x294e, 0x294f, 0x295b, 0x2b00, + 0x2b14, 0x2a9c, 0x2aaa, 0x2977, + 0x2aad, 0x2a9d, 0x2976, 0x2aa2, + 0x27ae, 0x2a9a, 0x2aa6, 0x27b0, + 0x2a9b, 0x2a9f, 0x2ab0, 0x2aaf, + 0x27ad, 0x2aa1, 0x2978, 0x2979, + 0x2aae, 0x2aab, 0x2a9e, 0x2a99, + 0x2aa3, 0x2aa0, 0x2aa9, 0x2aa7, + 0x27af, 0x2aa8, 0x2aa5, 0x2aa4, + 0x2abb, 0x2abc, 0x2abe, 0x2abf, + 0x2ab5, 0x27b5, 0x293e, 0x2acd, + 0x293f, 0x2acc, 0x2959, 0x2801, + 0x27f8, 0x2ac9, 0x2ac8, 0x2aca, + 0x2802, 0x293b, 0x2ac6, 0x2ac7, + 0x2809, 0x27dd, 0x27f6, 0x27df, + 0x298d, 0x280f, 0x27de, 0x2808, + 0x27e0, 0x27e1, 0x27f9, 0x27e2, 0x27e8, 0x2988, 0x27e7, }; static const int mb_tbl_uni_sb2code3_len = sizeof(mb_tbl_uni_sb2code3_key)/sizeof(unsigned short); @@ -1164,27 +1164,27 @@ static const int mb_tbl_uni_docomo2code5_min = 0xfe82d; static const int mb_tbl_uni_docomo2code5_max = 0xfee33; static const unsigned short mb_tbl_uni_docomo2code5_key[] = { // 0xfe82d - 0xfee33 - 0xE82D, 0xEE10, 0xEE11, 0xEE12, - 0xEE13, 0xEE14, 0xEE15, 0xEE16, - 0xEE17, 0xEE18, 0xEE19, 0xEE1A, - 0xEE1B, 0xEE1C, 0xEE1D, 0xEE1E, - 0xEE1F, 0xEE20, 0xEE21, 0xEE22, - 0xEE23, 0xEE24, 0xEE25, 0xEE26, - 0xEE27, 0xEE28, 0xEE29, 0xEE2A, - 0xEE2B, 0xEE2C, 0xEE2D, 0xEE2E, - 0xEE2F, 0xEE30, 0xEE31, 0xEE32, + 0xE82D, 0xEE10, 0xEE11, 0xEE12, + 0xEE13, 0xEE14, 0xEE15, 0xEE16, + 0xEE17, 0xEE18, 0xEE19, 0xEE1A, + 0xEE1B, 0xEE1C, 0xEE1D, 0xEE1E, + 0xEE1F, 0xEE20, 0xEE21, 0xEE22, + 0xEE23, 0xEE24, 0xEE25, 0xEE26, + 0xEE27, 0xEE28, 0xEE29, 0xEE2A, + 0xEE2B, 0xEE2C, 0xEE2D, 0xEE2E, + 0xEE2F, 0xEE30, 0xEE31, 0xEE32, 0xEE33, }; static const unsigned short mb_tbl_uni_docomo2code5_val[] = { // 0xfe82d - 0xfee33 - 0x2965, 0x2955, 0x2956, 0x2958, - 0x2959, 0x2990, 0x2991, 0x292A, - 0x292B, 0x292C, 0x292D, 0x292E, - 0x292F, 0x2933, 0x2934, 0x2938, - 0x2939, 0x293A, 0x293F, 0x2940, - 0x2941, 0x2942, 0x2943, 0x2944, - 0x2945, 0x2946, 0x2947, 0x2948, - 0x2949, 0x294A, 0x294B, 0x294C, - 0x294D, 0x294E, 0x294F, 0x2950, + 0x2965, 0x2955, 0x2956, 0x2958, + 0x2959, 0x2990, 0x2991, 0x292A, + 0x292B, 0x292C, 0x292D, 0x292E, + 0x292F, 0x2933, 0x2934, 0x2938, + 0x2939, 0x293A, 0x293F, 0x2940, + 0x2941, 0x2942, 0x2943, 0x2944, + 0x2945, 0x2946, 0x2947, 0x2948, + 0x2949, 0x294A, 0x294B, 0x294C, + 0x294D, 0x294E, 0x294F, 0x2950, 0x2951, }; static const unsigned short mb_tbl_uni_docomo2code5_len = sizeof(mb_tbl_uni_docomo2code5_key)/sizeof(unsigned short); @@ -1194,15 +1194,15 @@ static const int mb_tbl_uni_kddi2code5_min = 0xfe82d; static const int mb_tbl_uni_kddi2code5_max = 0xfee4a; static const unsigned short mb_tbl_uni_kddi2code5_key[] = { // 0xfe82d - 0xfee4a - 0xE82D, 0xE83C, 0xEB89, 0xEE40, - 0xEE41, 0xEE42, 0xEE43, 0xEE44, - 0xEE45, 0xEE46, 0xEE47, 0xEE48, + 0xE82D, 0xE83C, 0xEB89, 0xEE40, + 0xEE41, 0xEE42, 0xEE43, 0xEE44, + 0xEE45, 0xEE46, 0xEE47, 0xEE48, 0xEE49, 0xEE4A, }; static const unsigned short mb_tbl_uni_kddi2code5_val[] = { // 0xfe82d - 0xfee4a - 0x27B0, 0x280A, 0x2839, 0x27FB, - 0x2836, 0x24E8, 0x25AC, 0x25B9, - 0x25C1, 0x25C2, 0x25C3, 0x25C4, + 0x27B0, 0x280A, 0x2839, 0x27FB, + 0x2836, 0x24E8, 0x25AC, 0x25B9, + 0x25C1, 0x25C2, 0x25C3, 0x25C4, 0x25C5, 0x25C6, }; static const unsigned short mb_tbl_uni_kddi2code5_len = sizeof(mb_tbl_uni_kddi2code5_key)/sizeof(unsigned short); @@ -1212,15 +1212,15 @@ static const int mb_tbl_uni_sb2code5_min = 0xfe4c5; static const int mb_tbl_uni_sb2code5_max = 0xfee7d; static const unsigned short mb_tbl_uni_sb2code5_key[] = { // 0xfe4c5 - 0xfee7d - 0xE4C5, 0xEE70, 0xEE71, 0xEE72, - 0xEE73, 0xEE74, 0xEE75, 0xEE76, - 0xEE77, 0xEE78, 0xEE79, 0xEE7A, + 0xE4C5, 0xEE70, 0xEE71, 0xEE72, + 0xEE73, 0xEE74, 0xEE75, 0xEE76, + 0xEE77, 0xEE78, 0xEE79, 0xEE7A, 0xEE7B, 0xEE7C, 0xEE7D, }; static const unsigned short mb_tbl_uni_sb2code5_val[] = { // 0xfe4c5 - 0xfee7d - 0x2B01, 0x2B2F, 0x2B30, 0x2B31, - 0x2B32, 0x2B33, 0x2B34, 0x2B35, - 0x285B, 0x285C, 0x285D, 0x285E, + 0x2B01, 0x2B2F, 0x2B30, 0x2B31, + 0x2B32, 0x2B33, 0x2B34, 0x2B35, + 0x285B, 0x285C, 0x285D, 0x285E, 0x285F, 0x2860, 0x2861, }; static const unsigned short mb_tbl_uni_sb2code5_len = sizeof(mb_tbl_uni_sb2code5_key)/sizeof(unsigned short); diff --git a/ext/mbstring/libmbfl/filters/html_entities.c b/ext/mbstring/libmbfl/filters/html_entities.c index 5551952b1c..919a5bb746 100644 --- a/ext/mbstring/libmbfl/filters/html_entities.c +++ b/ext/mbstring/libmbfl/filters/html_entities.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/html_entities.h b/ext/mbstring/libmbfl/filters/html_entities.h index a73b9d5bbd..6833fd8105 100644 --- a/ext/mbstring/libmbfl/filters/html_entities.h +++ b/ext/mbstring/libmbfl/filters/html_entities.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_HTML_ENTITIES_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index 7b793cd540..ab1727146a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -75,7 +75,7 @@ int mbfl_filt_conv_any_7bit(int c, mbfl_convert_filter *filter) { if (c >= 0 && c < 0x80) { CK((*filter->output_function)(c, filter->data)); - } + } return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.h b/ext/mbstring/libmbfl/filters/mbfilter_7bit.h index d9a285fb1b..d0dfe2c518 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c index 2d1fc8d7b0..ad2cf0c7f0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c @@ -19,7 +19,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * The author of this file: Hayk Chamyan <hamshen@gmail.com> - * + * */ /* diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h index fc84827564..1de95c615b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h @@ -19,7 +19,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * The author of this file: Hayk Chamyan <hamshen@gmail.com> - * + * */ #ifndef MBFL_MBFILTER_ARMSCII8_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c index 77871fb96d..e9eb496771 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h index c48ced6447..99b4815387 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -37,7 +37,7 @@ extern const mbfl_encoding mbfl_encoding_ascii; extern const struct mbfl_identify_vtbl vtbl_identify_ascii; extern const struct mbfl_convert_vtbl vtbl_ascii_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_ascii; - + int mbfl_filt_conv_ascii_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_ascii(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index 198f38c3d2..adecdee888 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.h b/ext/mbstring/libmbfl/filters/mbfilter_base64.h index 6bd525fd3e..24a3c0ee0d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 099f8e6af0..122ff4c778 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_tw.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -158,7 +158,7 @@ mbfl_filt_conv_big5_wchar(int c, mbfl_convert_filter *filter) if (c >= 0 && c <= 0x80) { /* latin */ CK((*filter->output_function)(c, filter->data)); } else if (c == 0xff) { - CK((*filter->output_function)(0xf8f8, filter->data)); + CK((*filter->output_function)(0xf8f8, filter->data)); } else if (c > c1 && c < 0xff) { /* dbcs lead byte */ filter->status = 1; filter->cache = c; @@ -183,12 +183,12 @@ mbfl_filt_conv_big5_wchar(int c, mbfl_convert_filter *filter) } else { w = 0; } - + if (filter->from->no_encoding == mbfl_no_encoding_cp950) { /* PUA for CP950 */ - if (w <= 0 && + if (w <= 0 && (((c1 >= 0xfa && c1 <= 0xfe) || (c1 >= 0x8e && c1 <= 0xa0) || - (c1 >= 0x81 && c1 <= 0x8d) ||(c1 >= 0xc7 && c1 <= 0xc8)) + (c1 >= 0x81 && c1 <= 0x8d) ||(c1 >= 0xc7 && c1 <= 0xc8)) && ((c > 0x39 && c < 0x7f) || (c > 0xa0 && c < 0xff))) || ((c1 == 0xc6) && (c > 0xa0 && c < 0xff))) { c2 = c1 << 8 | c; @@ -197,14 +197,14 @@ mbfl_filt_conv_big5_wchar(int c, mbfl_convert_filter *filter) break; } } - + if ((cp950_pua_tbl[k][2] & 0xff) == 0x40) { w = 157*(c1 - (cp950_pua_tbl[k][2]>>8)) + c - (c >= 0xa1 ? 0x62 : 0x40) + cp950_pua_tbl[k][0]; } else { w = c2 - cp950_pua_tbl[k][2] + cp950_pua_tbl[k][0]; } - } + } } if (w <= 0) { @@ -268,12 +268,12 @@ mbfl_filt_conv_wchar_big5(int c, mbfl_convert_filter *filter) if ((cp950_pua_tbl[k][2] & 0xff) == 0x40) { c2 = cp950_pua_tbl[k][2] >> 8; s = ((c1 / 157) + c2) << 8; c1 %= 157; - s |= c1 + (c1 >= 0x3f ? 0x62 : 0x40); + s |= c1 + (c1 >= 0x3f ? 0x62 : 0x40); } else { s = c1 + cp950_pua_tbl[k][2]; } } - + if (c == 0x80) { s = 0x80; } else if (c == 0xf8f8) { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.h b/ext/mbstring/libmbfl/filters/mbfilter_big5.h index 93d10de61a..c5a0955f8d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_tw.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_BIG5_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 03b471bf5b..7452c127fc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.h b/ext/mbstring/libmbfl/filters/mbfilter_byte2.h index e762a9db7f..8b1d991810 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 24b7367fea..7475e5424c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.h b/ext/mbstring/libmbfl/filters/mbfilter_byte4.h index f6c0aed2be..572a2cf477 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index b5ab8e71b5..a26ce19492 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -146,7 +146,7 @@ static int mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h index 6c0f680b29..becae48c19 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index ad160821a5..0c5eba3dd5 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -141,7 +141,7 @@ static int mbfl_filt_ident_cp1252(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h index 032c30eb9e..afb2fffa9b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 7e933425f4..78e79335e4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -151,7 +151,7 @@ static int mbfl_filt_ident_cp1254(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h index 3200d520eb..15a63eae30 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index 8d733a9d19..77736a051b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -626,7 +626,7 @@ mbfl_filt_conv_wchar_cp50220raw(int c, mbfl_convert_filter *filter) { if (c & MBFL_WCSPLANE_JIS0208) { const int s = c & MBFL_WCSPLANE_MASK; - + if ((filter->status & 0xff00) != 0x200) { CK((*filter->output_function)(0x1b, filter->data)); /* ESC */ CK((*filter->output_function)(0x24, filter->data)); /* '$' */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h index a462f70ec4..e7cde7dff8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_CP50221_h @@ -52,7 +52,7 @@ extern const struct mbfl_convert_vtbl vtbl_cp50221_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_cp50221; extern const struct mbfl_convert_vtbl vtbl_cp50222_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_cp50222; - + int mbfl_filt_conv_jis_ms_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_jis_ms(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_cp50220(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index f84be1e290..aae45380c8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.h b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.h index be86b82262..bbf56f48ca 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_CP51932_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 9e4696a5a9..179873eb3a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -141,7 +141,7 @@ static int mbfl_filt_ident_cp850(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.h b/ext/mbstring/libmbfl/filters/mbfilter_cp850.h index a1e0f9c0c2..2a0e8e9e65 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 22e109fe5b..307f370d03 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -145,7 +145,7 @@ static int mbfl_filt_ident_cp866(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.h b/ext/mbstring/libmbfl/filters/mbfilter_cp866.h index 9cb4e257e3..e9eb25a541 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_CP866_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 40ba849651..4063a68208 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.h b/ext/mbstring/libmbfl/filters/mbfilter_cp932.h index b6a211412e..f0b6daeac7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c index caf26e329b..23e3a1d847 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -124,25 +124,25 @@ mbfl_filt_conv_cp936_wchar(int c, mbfl_convert_filter *filter) c1 = filter->cache; if (((c1 >= 0xaa && c1 <= 0xaf) || (c1 >= 0xf8 && c1 <= 0xfe)) && - (c >= 0xa1 && c <= 0xfe)) { + (c >= 0xa1 && c <= 0xfe)) { /* UDA part1,2: U+E000-U+E4C5 */ w = 94*(c1 >= 0xf8 ? c1 - 0xf2 : c1 - 0xaa) + (c - 0xa1) + 0xe000; CK((*filter->output_function)(w, filter->data)); - } else if (c1 >= 0xa1 && c1 <= 0xa7 && c >= 0x40 && c < 0xa1 && c != 0x7f) { + } else if (c1 >= 0xa1 && c1 <= 0xa7 && c >= 0x40 && c < 0xa1 && c != 0x7f) { /* UDA part3 : U+E4C6-U+E765*/ w = 96*(c1 - 0xa1) + c - (c >= 0x80 ? 0x41 : 0x40) + 0xe4c6; CK((*filter->output_function)(w, filter->data)); - } + } c2 = (c1 << 8) | c; - if (w <= 0 && + if (w <= 0 && ((c2 >= 0xa2ab && c2 <= 0xa9f0 + (0xe80f-0xe801)) || (c2 >= 0xd7fa && c2 <= 0xd7fa + (0xe814-0xe810)) || (c2 >= 0xfe50 && c2 <= 0xfe80 + (0xe864-0xe844)))) { for (k = 0; k < mbfl_cp936_pua_tbl_max; k++) { - if (c2 >= mbfl_cp936_pua_tbl[k][2] && - c2 <= mbfl_cp936_pua_tbl[k][2] + + if (c2 >= mbfl_cp936_pua_tbl[k][2] && + c2 <= mbfl_cp936_pua_tbl[k][2] + mbfl_cp936_pua_tbl[k][1] - mbfl_cp936_pua_tbl[k][0]) { w = c2 - mbfl_cp936_pua_tbl[k][2] + mbfl_cp936_pua_tbl[k][0]; CK((*filter->output_function)(w, filter->data)); @@ -222,7 +222,7 @@ mbfl_filt_conv_wchar_cp936(int c, mbfl_convert_filter *filter) } else { c1 = c - 0xe4c6; s = ((c1 / 96) + 0xa1) << 8; c1 %= 96; - s |= c1 + (c1 >= 0x3f ? 0x41 : 0x40); + s |= c1 + (c1 >= 0x3f ? 0x41 : 0x40); } } else { /* U+E766..U+E864 */ @@ -248,12 +248,12 @@ mbfl_filt_conv_wchar_cp936(int c, mbfl_convert_filter *filter) s = ucs_cf_cp936_table[c - ucs_cf_cp936_table_min]; } else if (c >= ucs_sfv_cp936_table_min && c < ucs_sfv_cp936_table_max) { s = ucs_sfv_cp936_table[c - ucs_sfv_cp936_table_min]; /* U+FE50-FE6F Small Form Variants */ - } else if (c >= ucs_hff_cp936_table_min && c < ucs_hff_cp936_table_max) { - /* U+FF00-FFFF HW/FW Forms */ + } else if (c >= ucs_hff_cp936_table_min && c < ucs_hff_cp936_table_max) { + /* U+FF00-FFFF HW/FW Forms */ if (c == 0xff04) { s = 0xa1e7; } else if (c == 0xff5e) { - s = 0xa1ab; + s = 0xa1ab; } else if (c >= 0xff01 && c <= 0xff5d) { s = c - 0xff01 + 0xa3a1; } else if (c >= 0xffe0 && c <= 0xffe5) { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.h b/ext/mbstring/libmbfl/filters/mbfilter_cp936.h index 1bd603d157..cc5e9bd333 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -39,5 +39,5 @@ extern const struct mbfl_convert_vtbl vtbl_wchar_cp936; int mbfl_filt_conv_cp936_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_cp936(int c, mbfl_convert_filter *filter); - + #endif /* MBFL_MBFILTER_CP936_H */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index f91edf364a..bf3ec25ee7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -172,7 +172,7 @@ mbfl_filt_conv_wchar_euccn(int c, mbfl_convert_filter *filter) if (c == 0xff04) { s = 0xa1e7; } else if (c == 0xff5e) { - s = 0xa1ab; + s = 0xa1ab; } else if (c >= 0xff01 && c <= 0xff5d) { s = c - 0xff01 + 0xa3a1; } else if (c >= 0xffe0 && c <= 0xffe5) { @@ -181,7 +181,7 @@ mbfl_filt_conv_wchar_euccn(int c, mbfl_convert_filter *filter) } c1 = (s >> 8) & 0xff; c2 = s & 0xff; - + if (c1 < 0xa1 || c2 < 0xa1) { /* exclude CP936 extension */ s = c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.h index e72bc08ebf..31251fcf6d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index 7015df4eae..3b13850882 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.h index de1212dfa8..e1bd565343 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_EUC_JP_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index 2905ce8dfa..aeb94c388d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by rui hirokawa <hirokawa@php.net> on 16 aug 2011. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.h index ce4b60aacc..55c06aef98 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.h * by rui hirokawa <hirokawa@php.net> on 15 aug 2011. - * + * */ #ifndef MBFL_MBFILTER_EUC_JP_2004_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index eb8949a298..95aec45f4d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ static const unsigned char mblen_table_eucjp[] = { /* 0xA1-0xFE */ }; -static const char *mbfl_encoding_eucjp_win_aliases[] = {"eucJP-open", +static const char *mbfl_encoding_eucjp_win_aliases[] = {"eucJP-open", "eucJP-ms", NULL}; const struct mbfl_identify_vtbl vtbl_identify_eucjpwin = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.h index 8b79a7241f..f17058d523 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_EUC_JP_WIN_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c index 211a3ad5ad..2a537ade6e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -142,7 +142,7 @@ mbfl_filt_conv_euckr_wchar(int c, mbfl_convert_filter *filter) w = 0; } } - + if (w <= 0) { w = (c1 << 8) | c; w &= MBFL_WCSPLANE_MASK; @@ -196,7 +196,7 @@ mbfl_filt_conv_wchar_euckr(int c, mbfl_convert_filter *filter) c1 = (s >> 8) & 0xff; c2 = s & 0xff; /* exclude UHC extension area */ - if (c1 < 0xa1 || c2 < 0xa1){ + if (c1 < 0xa1 || c2 < 0xa1){ s = c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.h index 5ccbe79445..1534d2bedc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_EUC_KR_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c index 95665d0562..bc780c99ee 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_tw.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -184,7 +184,7 @@ mbfl_filt_conv_euctw_wchar(int c, mbfl_convert_filter *filter) filter->status = 0; c1 = filter->cache; if (c1 >= 0x100 && c1 <= 0xdff && c > 0xa0 && c < 0xff) { - plane = (c1 & 0xf00) >> 8; + plane = (c1 & 0xf00) >> 8; s = (c1 & 0xff)*94 + c - 0xa1; w = 0; if (s >= 0) { @@ -259,7 +259,7 @@ mbfl_filt_conv_wchar_euctw(int c, mbfl_convert_filter *filter) s = (s & 0xffff) | 0x8080; CK((*filter->output_function)((s >> 8) & 0xff, filter->data)); CK((*filter->output_function)(s & 0xff, filter->data)); - } + } } else { s = (0x8ea00000 + (plane << 16)) | ((s & 0xffff) | 0x8080); CK((*filter->output_function)(0x8e , filter->data)); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.h b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.h index 64071809d0..ed1f091259 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_tw.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_EUC_TW_H @@ -33,7 +33,7 @@ #include "mbfilter.h" extern const mbfl_encoding mbfl_encoding_euc_tw; -extern const struct mbfl_identify_vtbl vtbl_identify_euctw; +extern const struct mbfl_identify_vtbl vtbl_identify_euctw; extern const struct mbfl_convert_vtbl vtbl_euctw_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_euctw; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index f6f12be449..a5ead7a693 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -82,7 +82,7 @@ int mbfl_bisec_srch(int w, const unsigned short *tbl, int n) { int k, k1 = 0, k2 = n-1; - + while (k1 < k2) { k = (k1+k2) >> 1; if (w <= tbl[2*k+1]) { @@ -100,7 +100,7 @@ int mbfl_bisec_srch2(int w, const unsigned short tbl[], int n) { int k, k1 = 0, k2 = n; - + if (w == tbl[0]) { return 0; } @@ -153,7 +153,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) filter->status = 2; filter->cache = (c1 << 8) | c; return c; - } else if (c1 >= 0x90 && c1 <= 0xe3 && c >= 0x30 && c <= 0x39) { + } else if (c1 >= 0x90 && c1 <= 0xe3 && c >= 0x30 && c <= 0x39) { /* 4 byte range: Unicode 16 planes */ filter->status = 2; filter->cache = (c1 << 8) | c; @@ -162,21 +162,21 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) (c >= 0xa1 && c <= 0xfe)) { /* UDA part1,2: U+E000-U+E4C5 */ w = 94*(c1 >= 0xf8 ? c1 - 0xf2 : c1 - 0xaa) + (c - 0xa1) + 0xe000; CK((*filter->output_function)(w, filter->data)); - } else if (c1 >= 0xa1 && c1 <= 0xa7 && c >= 0x40 && c < 0xa1 && c != 0x7f) { + } else if (c1 >= 0xa1 && c1 <= 0xa7 && c >= 0x40 && c < 0xa1 && c != 0x7f) { /* UDA part3 : U+E4C6-U+E765*/ w = 96*(c1 - 0xa1) + c - (c >= 0x80 ? 0x41 : 0x40) + 0xe4c6; CK((*filter->output_function)(w, filter->data)); - } + } c2 = (c1 << 8) | c; - if (w <= 0 && + if (w <= 0 && ((c2 >= 0xa2ab && c2 <= 0xa9f0 + (0xe80f-0xe801)) || (c2 >= 0xd7fa && c2 <= 0xd7fa + (0xe814-0xe810)) || (c2 >= 0xfe50 && c2 <= 0xfe80 + (0xe864-0xe844)))) { for (k = 0; k < mbfl_gb18030_pua_tbl_max; k++) { - if (c2 >= mbfl_gb18030_pua_tbl[k][2] && - c2 <= mbfl_gb18030_pua_tbl[k][2] + mbfl_gb18030_pua_tbl[k][1] + if (c2 >= mbfl_gb18030_pua_tbl[k][2] && + c2 <= mbfl_gb18030_pua_tbl[k][2] + mbfl_gb18030_pua_tbl[k][1] - mbfl_gb18030_pua_tbl[k][0]) { w = c2 - mbfl_gb18030_pua_tbl[k][2] + mbfl_gb18030_pua_tbl[k][0]; CK((*filter->output_function)(w, filter->data)); @@ -226,7 +226,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) w = (c1 << 16) | (c2 << 8) | c; w &= MBFL_WCSGROUP_MASK; w |= MBFL_WCSGROUP_THROUGH; - CK((*filter->output_function)(w, filter->data)); + CK((*filter->output_function)(w, filter->data)); } break; @@ -249,7 +249,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) w = (c1 << 24) | (c2 << 16) | (c3 << 8) | c; w &= MBFL_WCSGROUP_MASK; w |= MBFL_WCSGROUP_THROUGH; - CK((*filter->output_function)(w, filter->data)); + CK((*filter->output_function)(w, filter->data)); return c; } w += mbfl_gb_uni_ofst[k]; @@ -257,7 +257,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) w = (c1 << 24) | (c2 << 16) | (c3 << 8) | c; w &= MBFL_WCSGROUP_MASK; w |= MBFL_WCSGROUP_THROUGH; - CK((*filter->output_function)(w, filter->data)); + CK((*filter->output_function)(w, filter->data)); return c; } } @@ -266,7 +266,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) w = (c1 << 24) | (c2 << 16) | (c3 << 8) | c; w &= MBFL_WCSGROUP_MASK; w |= MBFL_WCSGROUP_THROUGH; - CK((*filter->output_function)(w, filter->data)); + CK((*filter->output_function)(w, filter->data)); } break; @@ -321,7 +321,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter) if (c == 0xff04) { s = 0xa1e7; } else if (c == 0xff5e) { - s = 0xa1ab; + s = 0xa1ab; } else if (c >= 0xff01 && c <= 0xff5d) { s = c - 0xff01 + 0xa3a1; } else if (c >= 0xffe0 && c <= 0xffe5) { @@ -333,7 +333,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter) s = 0xa2e3; } - if (s <= 0 && c >= mbfl_gb18030_c_tbl_key[0] && + if (s <= 0 && c >= mbfl_gb18030_c_tbl_key[0] && c <= mbfl_gb18030_c_tbl_key[mbfl_gb18030_c_tbl_max-1]) { k1 = mbfl_bisec_srch2(c, mbfl_gb18030_c_tbl_key, mbfl_gb18030_c_tbl_max); if (k1 >= 0) { @@ -350,7 +350,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter) } else { c1 = c - 0xe4c6; s = ((c1 / 96) + 0xa1) << 8; c1 %= 96; - s |= c1 + (c1 >= 0x3f ? 0x41 : 0x40); + s |= c1 + (c1 >= 0x3f ? 0x41 : 0x40); } } else { /* U+E766..U+E864 */ @@ -367,7 +367,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter) } } } - } + } if (s <= 0 && c >= 0x0080 && c <= 0xffff) { /* BMP */ s = mbfl_bisec_srch(c, mbfl_uni2gb_tbl, mbfl_gb_uni_max); @@ -421,7 +421,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter) static int mbfl_filt_ident_gb18030(int c, mbfl_identify_filter *filter) { int c1; - + c1 = (filter->status >> 8) & 0xff; filter->status &= 0xff; @@ -447,7 +447,7 @@ static int mbfl_filt_ident_gb18030(int c, mbfl_identify_filter *filter) filter->status = 0; /* DBCS */ } else { filter->flag = 1; /* bad */ - filter->status = 0; + filter->status = 0; } } else if (filter->status == 2) { /* qbcs 3rd byte */ if (c > 0x80 && c < 0xff) { @@ -462,7 +462,7 @@ static int mbfl_filt_ident_gb18030(int c, mbfl_identify_filter *filter) } else { filter->flag = 1; /* bad */ filter->status = 0; - } + } } else { /* bad */ filter->flag = 1; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.h b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.h index e182a39555..dc7d51b6e2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -39,5 +39,5 @@ extern const struct mbfl_convert_vtbl vtbl_wchar_gb18030; int mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter); - + #endif /* MBFL_MBFILTER_GB18030_H */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index f9d34fbfab..9d530abfba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -111,7 +111,7 @@ int mbfl_filt_conv_html_enc(int c, mbfl_convert_filter *filter) for (i = 0; (e = &mbfl_html_entity_list[i])->name != NULL; i++) { if (c == e->code) { char *p; - + for (p = e->name; *p != '\0'; p++) { CK((*filter->output_function)((int)*p, filter->data)); } @@ -165,7 +165,7 @@ void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter) filter->status = 0; filter->opaque = mbfl_malloc(html_enc_buffer_size+1); } - + void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter) { filter->status = 0; @@ -255,7 +255,7 @@ int mbfl_filt_conv_html_dec(int c, mbfl_convert_filter *filter) CK((*filter->output_function)(ent, filter->data)); filter->status = 0; /*php_error_docref("ref.mbstring", E_NOTICE,"mbstring decoded '%s'=%d", buffer, ent);*/ - } else { + } else { /* failure */ buffer[filter->status++] = ';'; buffer[filter->status] = 0; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h index 99827c2303..6b6ce49951 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_HTMLENT_H @@ -33,7 +33,7 @@ #include "mbfilter.h" extern const mbfl_encoding mbfl_encoding_html_ent; -extern const struct mbfl_convert_vtbl vtbl_wchar_html; +extern const struct mbfl_convert_vtbl vtbl_wchar_html; extern const struct mbfl_convert_vtbl vtbl_html_wchar; void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c index 893ad5f740..a3422cd8e5 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_cn.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -168,7 +168,7 @@ mbfl_filt_conv_wchar_hz(int c, mbfl_convert_filter *filter) if (c == 0xff04) { s = 0xa1e7; } else if (c == 0xff5e) { - s = 0xa1ab; + s = 0xa1ab; } else if (c >= 0xff01 && c <= 0xff5d) { s = c - 0xff01 + 0xa3a1; } else if (c >= 0xffe0 && c <= 0xffe5) { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.h b/ext/mbstring/libmbfl/filters/mbfilter_hz.h index 1e7ebc334d..e7e35cacc8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_cn.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_HZ_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c index a7daf2b913..1f26d1771b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h index 8479a45095..7c40b19246 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO2022_JP_MS_H @@ -36,7 +36,7 @@ extern const mbfl_encoding mbfl_encoding_2022jpms; extern const struct mbfl_identify_vtbl vtbl_identify_2022jpms; extern const struct mbfl_convert_vtbl vtbl_2022jpms_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_2022jpms; - + int mbfl_filt_conv_2022jpms_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_2022jpms(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_any_2022jpms_flush(mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 01c01a4477..501bcb8d19 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -89,9 +89,9 @@ retry: if (c == 0x1b) { /* ESC */ filter->status += 2; } else if (c == 0x0f) { /* SI (ASCII) */ - filter->status &= ~0xff; + filter->status &= ~0xff; } else if (c == 0x0e) { /* SO (KSC5601) */ - filter->status |= 0x10; + filter->status |= 0x10; } else if ((filter->status & 0x10) != 0 && c > 0x20 && c < 0x7f) { /* KSC5601 lead byte */ filter->cache = c; @@ -131,7 +131,7 @@ retry: w = 0; } } - + if (w <= 0) { w = (c1 << 8) | c; w &= MBFL_WCSPLANE_MASK; @@ -218,7 +218,7 @@ mbfl_filt_conv_wchar_2022kr(int c, mbfl_convert_filter *filter) c1 = (s >> 8) & 0xff; c2 = s & 0xff; /* exclude UHC extension area */ - if (c1 < 0xa1 || c2 < 0xa1){ + if (c1 < 0xa1 || c2 < 0xa1){ s = c; } if (s & 0x8000) { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.h b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.h index 1dd9f69351..7277c5f11c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO2022_KR_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index d855374bf0..fc6678ecb6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_jis.c * by rui hirokawa <hirokawa@php.net> on 18 aug 2011. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.h b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.h index f6e56b9b9d..929559b87f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_2022JP_2004_H @@ -36,7 +36,7 @@ extern const mbfl_encoding mbfl_encoding_2022jp_2004; extern const struct mbfl_identify_vtbl vtbl_identify_2022jp_2004; extern const struct mbfl_convert_vtbl vtbl_2022jp_2004_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_2022jp_2004; - + int mbfl_filt_conv_2022jp_2004_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_2022jp_2004(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_any_2022jp_2004_flush(mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index 03e9633cae..a5260807d4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_iso2022_jp_ms.c * by Rui Hirokawa <hirokawa@php.net> on 25 July 2011. - * + * */ #ifdef HAVE_CONFIG_H @@ -194,7 +194,7 @@ retry: w = 0xffe2; /* FULLWIDTH NOT SIGN */ } } - + if (w == 0) { if (s >= cp932ext1_ucs_table_min && s < cp932ext1_ucs_table_max) { /* vendor ext1 (13ku) */ w = cp932ext1_ucs_table[s - cp932ext1_ucs_table_min]; @@ -204,7 +204,7 @@ retry: w = 0; } } - + if (s >= (84*94) && s < 91*94) { s += 22*94; if (filter->from->no_encoding == mbfl_no_encoding_2022jp_kddi) { @@ -212,9 +212,9 @@ retry: } if (w > 0 && snd > 0) { CK((*filter->output_function)(snd, filter->data)); - } + } } - + if (w <= 0) { w = (c1 << 8) | c; w &= MBFL_WCSPLANE_MASK; @@ -422,7 +422,7 @@ mbfl_filt_conv_wchar_2022jp_mobile(int c, mbfl_convert_filter *filter) filter->status = 0x200; CK((*filter->output_function)((s1 >> 8) & 0xff, filter->data)); CK((*filter->output_function)(s1 & 0x7f, filter->data)); - } + } } else { if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) { CK(mbfl_filt_conv_illegal_output(c, filter)); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.h index 7ae1da2ddc..a375e8df0e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_iso2022_jp_ms.h * by Rui Hirokawa <hirokawa@php.net> on 25 July 2011. - * + * */ #ifndef MBFL_MBFILTER_ISO2022_JP_MOBILE_H @@ -36,7 +36,7 @@ extern const mbfl_encoding mbfl_encoding_2022jp_kddi; extern const struct mbfl_identify_vtbl vtbl_identify_2022jp_kddi; extern const struct mbfl_convert_vtbl vtbl_2022jp_kddi_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_2022jp_kddi; - + int mbfl_filt_conv_2022jp_mobile_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_2022jp_mobile(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 901bbb7eec..382d0c2294 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h index d55a457679..b593f10f54 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_1_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index b0f80e7a17..f6d1b21b55 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h index 3743422c6d..f9133404de 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_10_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index 674db7e469..cbc8f77d87 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h index 594575c981..dcd6075594 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_13_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index c0d241c842..03581ccf45 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h index 0006baedb6..90531e668a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h @@ -3,8 +3,8 @@ * * This file is a portion of "streamable kanji code filter and converter" * library, which is distributed under GNU Lesser General Public License - * version 2.1. - * + * version 2.1. + * * The source code included in this files was separated from mbfilter.c * by Moriyoshi Koizumi <moriyoshi@php.net> on 4 Dec 2002. * diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c index af321d671f..25323bd7f0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h index b5054dec2c..a8fb339b0d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h @@ -3,8 +3,8 @@ * * This file is a portion of "streamable kanji code filter and converter" * library, which is distributed under GNU Lesser General Public License - * version 2.1. - * + * version 2.1. + * * The source code included in this files was separated from mbfilter.c * by Moriyoshi Koizumi <moriyoshi@php.net> on 4 Dec 2002. * diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index 8f12feb47e..1bd5f8a25d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h index a5e2d2fbef..a1a53d7909 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h @@ -3,8 +3,8 @@ * * This file is a portion of "streamable kanji code filter and converter" * library, which is distributed under GNU Lesser General Public License - * version 2.1. - * + * version 2.1. + * */ #ifndef MBFL_MBFILTER_ISO8859_16_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index c52c72ae62..50649ddeb6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h index 732e9194e6..f344168a18 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_2_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index d47098ceb5..e1897069eb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h index 88ab3be6cd..746085373a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_3_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index 65c539eb4a..a04910eb78 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h index c68239100a..fe4dcdc696 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_4_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index 3a41398bf3..0bd4d5e155 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h index 531c1c1a72..8b09844141 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_5_H @@ -36,7 +36,7 @@ extern const mbfl_encoding mbfl_encoding_8859_5; extern const struct mbfl_identify_vtbl vtbl_identify_8859_5; extern const struct mbfl_convert_vtbl vtbl_8859_5_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_8859_5; - + int mbfl_filt_conv_8859_5_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_8859_5(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index 9823064e7e..df89eb75ba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h index bc27f3eb31..c7e16c7e0b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_6_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index a02ce7fb67..d8d4494a22 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h index d3042f3e4b..8421edb929 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_7_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index fa4571aa31..fad0f5c51e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h index 884d5095e0..ee679814f1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_8_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 57d2e3777c..97948d0ff6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h index 3731eda82a..5a61237113 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_ISO8859_9_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index 7fa1fd35b9..b3fbb4f94b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.h b/ext/mbstring/libmbfl/filters/mbfilter_jis.h index 0375307263..e7a164167e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_JIS_H @@ -40,7 +40,7 @@ extern const struct mbfl_convert_vtbl vtbl_jis_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_jis; extern const struct mbfl_convert_vtbl vtbl_2022jp_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_2022jp; - + int mbfl_filt_conv_jis_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_jis(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_2022jp(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c index 892bf15213..e35a0258ac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -145,5 +145,5 @@ static int mbfl_filt_ident_koi8r(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h index 8298631f97..c0b198ccad 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ru.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_KOI8R_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c index 9b8f450e9e..4dfc68654a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -142,5 +142,5 @@ static int mbfl_filt_ident_koi8u(int c, mbfl_identify_filter *filter) filter->flag = 0; else filter->flag = 1; /* not it */ - return c; + return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h index 693ade3d6d..fee7ebe2c0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index df9752bc3b..c141dc4102 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -108,7 +108,7 @@ int mbfl_filt_conv_qprintenc(int c, mbfl_convert_filter *filter) } if (s <= 0 || s >= 0x80 || s == 0x3d /* not ASCII or '=' */ - || ((filter->status & MBFL_QPRINT_STS_MIME_HEADER) != 0 && + || ((filter->status & MBFL_QPRINT_STS_MIME_HEADER) != 0 && (mbfl_charprop_table[s] & MBFL_CHP_MMHQENC) != 0)) { /* hex-octet */ CK((*filter->output_function)(0x3d, filter->data)); /* '=' */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.h b/ext/mbstring/libmbfl/filters/mbfilter_qprint.h index 3a39fa7402..2c989141d4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_QPRINT_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 7c463cd7b1..782e0dfaf9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis.h index cb9146fd89..f271f399c9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_ja.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_SJIS_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 87bb2f21fd..d02e5e6421 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_sjis.c * by rui hirokawa <hirokawa@php.net> on 15 aug 2011. - * + * */ #ifdef HAVE_CONFIG_H @@ -157,11 +157,11 @@ retry: && c > 0x20 && c < 0x7f) { /* kanji first char */ filter->cache = c; if (filter->status == 0x90) { - filter->status += 1; /* JIS X 0213 plane 1 */ + filter->status += 1; /* JIS X 0213 plane 1 */ } else if (filter->status == 0xa0) { - filter->status += 4; /* JIS X 0213 plane 2 */ + filter->status += 4; /* JIS X 0213 plane 2 */ } else { - filter->status += 5; /* JIS X 0208 */ + filter->status += 5; /* JIS X 0208 */ } } else { CK((*filter->output_function)(c, filter->data)); @@ -175,7 +175,7 @@ retry: } else if (c == 0x8e) { /* kana first char */ filter->status = 2; } else if (c == 0x8f) { /* X 0213 plane 2 first char */ - filter->status = 3; + filter->status = 3; } else { w = c & MBFL_WCSGROUP_MASK; w |= MBFL_WCSGROUP_THROUGH; @@ -230,7 +230,7 @@ retry: CK((*filter->output_function)(w, filter->data)); w = jisx0213_u2_tbl[2*k+1]; } - } + } /* conversion for BMP */ if (w <= 0) { @@ -307,7 +307,7 @@ retry: } else { w = c & 0x7f; w &= MBFL_WCSPLANE_MASK; - w |= MBFL_WCSPLANE_JIS0213; + w |= MBFL_WCSPLANE_JIS0213; } CK((*filter->output_function)(w, filter->data)); } @@ -326,14 +326,14 @@ retry: s1 = c1 - 0x21; s2 = c2 - 0x21; - if (((s1 >= 0 && s1 <= 4 && s1 != 1) || s1 == 7 || (s1 >= 11 && s1 <= 14) || + if (((s1 >= 0 && s1 <= 4 && s1 != 1) || s1 == 7 || (s1 >= 11 && s1 <= 14) || (s1 >= 77 && s1 < 94)) && s2 >= 0 && s2 < 94) { /* calc offset from ku */ for (k = 0; k < jisx0213_p2_ofst_len; k++) { if (s1 == jisx0213_p2_ofst[k]-1) { break; - } - } + } + } k = k - (jisx0213_p2_ofst[k]-1); /* check for japanese chars in BMP */ @@ -359,7 +359,7 @@ retry: w |= MBFL_WCSPLANE_JIS0213; } - CK((*filter->output_function)(w, filter->data)); + CK((*filter->output_function)(w, filter->data)); } else if ((c >= 0 && c < 0x21) || c == 0x7f) { /* CTLs */ CK((*filter->output_function)(c, filter->data)); } else { @@ -370,7 +370,7 @@ retry: } else { w = ((c1 & 0x7f) << 8) | (c2 & 0x7f); w &= MBFL_WCSPLANE_MASK; - w |= MBFL_WCSPLANE_JIS0213; + w |= MBFL_WCSPLANE_JIS0213; } CK((*filter->output_function)(w, filter->data)); } @@ -385,7 +385,7 @@ retry: if (s >= 0 && s < jisx0208_ucs_table_size) { w = jisx0208_ucs_table[s]; } - } + } if (w <= 0) { w = (c1 << 8) | c; w &= MBFL_WCSPLANE_MASK; @@ -489,9 +489,9 @@ mbfl_filt_conv_wchar_jis2004(int c, mbfl_convert_filter *filter) { retry: /* check for 1st char of combining characters */ - if ((filter->status & 0xf)== 0 && ( + if ((filter->status & 0xf)== 0 && ( c == 0x00E6 || - (c >= 0x0254 && c <= 0x02E9) || + (c >= 0x0254 && c <= 0x02E9) || (c >= 0x304B && c <= 0x3053) || (c >= 0x30AB && c <= 0x30C8) || c == 0x31F7)) { @@ -502,24 +502,24 @@ retry: return c; } } - } + } /* check for 2nd char of combining characters */ - if ((filter->status & 0xf) == 1 && + if ((filter->status & 0xf) == 1 && filter->cache >= 0 && filter->cache <= jisx0213_u2_tbl_len) { k = filter->cache; filter->status &= ~0xf; filter->cache = 0; - + c1 = jisx0213_u2_tbl[2*k]; - if ((c1 == 0x0254 || c1 == 0x028C || c1 == 0x0259 || c1 == 0x025A) + if ((c1 == 0x0254 || c1 == 0x028C || c1 == 0x0259 || c1 == 0x025A) && c == 0x0301) { k++; } if (c == jisx0213_u2_tbl[2*k+1]) { s1 = jisx0213_u2_key[k]; } else { /* fallback */ - s1 = jisx0213_u2_fb_tbl[k]; + s1 = jisx0213_u2_fb_tbl[k]; if (filter->to->no_encoding == mbfl_no_encoding_sjis2004) { c1 = (s1 >> 8) & 0xff; @@ -531,7 +531,7 @@ retry: } else { if (filter->status != 0x200) { CK((*filter->output_function)(0x1b, filter->data)); - CK((*filter->output_function)(0x24, filter->data)); + CK((*filter->output_function)(0x24, filter->data)); CK((*filter->output_function)(0x28, filter->data)); CK((*filter->output_function)(0x51, filter->data)); } @@ -556,7 +556,7 @@ retry: } } } - + /* check for japanese chars in compressed mapping area: U+1E00 - U+4DBF */ if (s1 <= 0 && c >= ucs_c1_jisx0213_min && c <= ucs_c1_jisx0213_max) { k = mbfl_bisec_srch(c, ucs_c1_jisx0213_tbl, ucs_c1_jisx0213_tbl_len); @@ -564,7 +564,7 @@ retry: s1 = ucs_c1_jisx0213_ofst[k] + c - ucs_c1_jisx0213_tbl[2*k]; } } - + /* check for japanese chars in CJK Unified Ideographs ext.B (U+2XXXX) */ if (s1 <= 0 && c >= jisx0213_u5_tbl_min && c <= jisx0213_u5_tbl_max) { k = mbfl_bisec_srch2(c - 0x20000, jisx0213_u5_jis_key, jisx0213_u5_tbl_len); @@ -579,7 +579,7 @@ retry: s1 = 0x233e; } else if (c == 0xfe46) { s1 = 0x233d; - } else if (c >= 0xf91d && c <= 0xf9dc) { + } else if (c >= 0xf91d && c <= 0xf9dc) { /* CJK Compatibility Ideographs: U+F900 - U+F92A */ k = mbfl_bisec_srch2(c, ucs_r2b_jisx0213_cmap_key, ucs_r2b_jisx0213_cmap_len); if (k >= 0) { @@ -634,10 +634,10 @@ retry: } filter->status = 0x200; s2 = s1 & 0xff; - s1 = (s1 >> 8) & 0xff; + s1 = (s1 >> 8) & 0xff; } CK((*filter->output_function)(s1, filter->data)); - CK((*filter->output_function)(s2, filter->data)); + CK((*filter->output_function)(s2, filter->data)); } else { /* X 0213 plane 2 */ if (filter->to->no_encoding == mbfl_no_encoding_sjis2004) { c1 = (s1 >> 8) & 0xff; @@ -661,7 +661,7 @@ retry: CK((*filter->output_function)(0x50, filter->data)); /* 'P' */ } filter->status = 0x200; - } + } } CK((*filter->output_function)(s1, filter->data)); @@ -683,17 +683,17 @@ mbfl_filt_conv_jis2004_flush(mbfl_convert_filter *filter) filter->cache = 0; if (filter->status == 1 && k >= 0 && k <= jisx0213_u2_tbl_len) { - s1 = jisx0213_u2_fb_tbl[k]; - + s1 = jisx0213_u2_fb_tbl[k]; + if (filter->to->no_encoding == mbfl_no_encoding_sjis2004) { c1 = (s1 >> 8) & 0xff; c2 = s1 & 0xff; SJIS_ENCODE(c1, c2, s1, s2); } else if (filter->to->no_encoding == mbfl_no_encoding_eucjp2004) { - s2 = (s1 & 0xff) | 0x80; + s2 = (s1 & 0xff) | 0x80; s1 = ((s1 >> 8) & 0xff) | 0x80; } else { - s2 = s1 & 0x7f; + s2 = s1 & 0x7f; s1 = (s1 >> 8) & 0x7f; if ((filter->status & 0xff00) != 0x200) { CK((*filter->output_function)(0x1b, filter->data)); /* ESC */ @@ -705,7 +705,7 @@ mbfl_filt_conv_jis2004_flush(mbfl_convert_filter *filter) } CK((*filter->output_function)(s1, filter->data)); - CK((*filter->output_function)(s2, filter->data)); + CK((*filter->output_function)(s2, filter->data)); } /* back to latin */ @@ -713,7 +713,7 @@ mbfl_filt_conv_jis2004_flush(mbfl_convert_filter *filter) CK((*filter->output_function)(0x1b, filter->data)); /* ESC */ CK((*filter->output_function)(0x28, filter->data)); /* '(' */ CK((*filter->output_function)(0x42, filter->data)); /* 'B' */ - } + } filter->status = 0; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.h index cf91f7a06b..c75e3a910b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_sjis.c * by rui hirokawa <hirokawa@php.net> on 15 aug 2011. - * + * */ #ifndef MBFL_MBFILTER_SJIS_2004_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index c134e5d585..2087786c06 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -144,15 +144,15 @@ mbfl_filt_conv_sjis_mac_wchar(int c, mbfl_convert_filter *filter) filter->status = 1; filter->cache = c; } else if (c == 0x5c) { - CK((*filter->output_function)(0x00a5, filter->data)); + CK((*filter->output_function)(0x00a5, filter->data)); } else if (c == 0x80) { - CK((*filter->output_function)(0x005c, filter->data)); + CK((*filter->output_function)(0x005c, filter->data)); } else if (c == 0xa0) { - CK((*filter->output_function)(0x00a0, filter->data)); + CK((*filter->output_function)(0x00a0, filter->data)); } else if (c == 0xfd) { - CK((*filter->output_function)(0x00a9, filter->data)); + CK((*filter->output_function)(0x00a9, filter->data)); } else if (c == 0xfe) { - CK((*filter->output_function)(0x2122, filter->data)); + CK((*filter->output_function)(0x2122, filter->data)); } else if (c == 0xff) { CK((*filter->output_function)(0x2026, filter->data)); CK((*filter->output_function)(0xf87f, filter->data)); @@ -172,7 +172,7 @@ mbfl_filt_conv_sjis_mac_wchar(int c, mbfl_convert_filter *filter) s = (s1 - 0x21)*94 + s2 - 0x21; if (s <= 0x89) { if (s == 0x1c) { - w = 0x2014; /* EM DASH */ + w = 0x2014; /* EM DASH */ } else if (s == 0x1f) { w = 0xff3c; /* FULLWIDTH REVERSE SOLIDUS */ } else if (s == 0x20) { @@ -196,7 +196,7 @@ mbfl_filt_conv_sjis_mac_wchar(int c, mbfl_convert_filter *filter) if (s >= code_tbl[i][0] && s <= code_tbl[i][1]) { w = s - code_tbl[i][0] + code_tbl[i][2]; break; - } + } } } @@ -212,7 +212,7 @@ mbfl_filt_conv_sjis_mac_wchar(int c, mbfl_convert_filter *filter) n = 6; } for (j=1; j<n-1; j++) { - CK((*filter->output_function)(code_tbl_m[i][j], filter->data)); + CK((*filter->output_function)(code_tbl_m[i][j], filter->data)); } w = code_tbl_m[i][n-1]; break; @@ -244,11 +244,11 @@ mbfl_filt_conv_sjis_mac_wchar(int c, mbfl_convert_filter *filter) } } } - + if (w == 0 && s >= 0 && s < jisx0208_ucs_table_size) { /* X 0208 */ w = jisx0208_ucs_table[s]; } - + if (w <= 0) { w = (s1 << 8) | s2; w &= MBFL_WCSPLANE_MASK; @@ -364,7 +364,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) } else { if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) { CK(mbfl_filt_conv_illegal_output(c, filter)); - } + } } if (s2 <= 0 || s1 == -1) { @@ -394,7 +394,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) } else if (c >= ucs_r_jis_table_min && c < ucs_r_jis_table_max) { s1 = ucs_r_jis_table[c - ucs_r_jis_table_min]; } - + if (c >= 0x2000) { for (i=0;i<s_form_tbl_len;i++) { if (c == s_form_tbl[i]) { @@ -407,7 +407,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) if (c == 0xf860 || c == 0xf861 || c == 0xf862) { filter->status = 2; filter->cache = c; - return c; + return c; } } @@ -429,7 +429,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) s1 = 0x2140; } } - + if (s1 <= 0) { for (i=0; i<wchar2sjis_mac_r_tbl_len; i++) { if (c >= wchar2sjis_mac_r_tbl[i][0] && c <= wchar2sjis_mac_r_tbl[i][1]) { @@ -441,9 +441,9 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) if (s1 <= 0) { for (i=0; i<wchar2sjis_mac_r_map_len; i++) { if (c >= wchar2sjis_mac_r_map[i][0] && c <= wchar2sjis_mac_r_map[i][1]) { - s1 = wchar2sjis_mac_code_map[i][c-wchar2sjis_mac_r_map[i][0]]; + s1 = wchar2sjis_mac_code_map[i][c-wchar2sjis_mac_r_map[i][0]]; break; - } + } } } @@ -455,7 +455,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) } } } - + if (s1 > 0) { c1 = s1/94+0x21; c2 = s1-94*(c1-0x21)+0x21; @@ -463,18 +463,18 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) s2 = 1; } } - + if ((s1 <= 0) || (s1 >= 0x8080 && s2 == 0)) { /* not found or X 0212 */ s1 = -1; c1 = 0; - + if (c == 0) { s1 = 0; } else if (s1 <= 0) { s1 = -1; } } - + if (s1 >= 0) { if (s1 < 0x100) { /* latin or kana */ CK((*filter->output_function)(s1, filter->data)); @@ -494,7 +494,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) case 2: - c1 = filter->cache; + c1 = filter->cache; filter->cache = 0; filter->status = 0; if (c1 == 0xf860) { @@ -527,12 +527,12 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) CK(mbfl_filt_conv_illegal_output(c1, filter)); CK(mbfl_filt_conv_illegal_output(c, filter)); } - + break; case 3: s1 = 0; - c1 = filter->cache & 0xffff; + c1 = filter->cache & 0xffff; mode = (filter->cache & 0xf0000) >> 16; filter->cache = 0; @@ -558,7 +558,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) CK(mbfl_filt_conv_illegal_output(0xf860, filter)); CK(mbfl_filt_conv_illegal_output(c1, filter)); CK(mbfl_filt_conv_illegal_output(c, filter)); - } + } } else if (mode == 0x2) { for (i=0; i<3; i++) { @@ -581,7 +581,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) case 4: s1 = 0; - c1 = filter->cache & 0xffff; + c1 = filter->cache & 0xffff; mode = (filter->cache & 0xf0000) >> 16; filter->cache = 0; @@ -593,7 +593,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) s1 = code_tbl_m[i+5][0]; break; } - } + } if (s1 > 0) { c1 = s1/94+0x21; @@ -613,7 +613,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) } CK(mbfl_filt_conv_illegal_output(c1, filter)); CK(mbfl_filt_conv_illegal_output(c, filter)); - } + } } else if (mode == 0x4) { for (i=0; i<4; i++) { if (c1 == code_tbl_m[i+8][3] && c == code_tbl_m[i+8][4]) { @@ -621,13 +621,13 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) filter->status = 5; break; } - } + } } break; case 5: s1 = 0; - c1 = filter->cache & 0xffff; + c1 = filter->cache & 0xffff; mode = (filter->cache & 0xf0000) >> 16; filter->cache = 0; @@ -639,7 +639,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) s1 = code_tbl_m[i+8][0]; break; } - } + } if (s1 > 0) { c1 = s1/94+0x21; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.h index 3b191aa418..f4b2adfeac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index 93ac34644a..a856aa3d46 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -6,7 +6,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -158,16 +158,16 @@ const unsigned short mbfl_docomo2uni_pua[4][3] = { {0x28c2, 0x292f, 0xe63e}, {0x2930, 0x2934, 0xe6ac}, {0x2935, 0x2951, 0xe6b1}, - {0x2952, 0x29db, 0xe6ce}, + {0x2952, 0x29db, 0xe6ce}, }; const unsigned short mbfl_kddi2uni_pua[7][3] = { {0x26ec, 0x2838, 0xe468}, {0x284c, 0x2863, 0xe5b5}, {0x24b8, 0x24ca, 0xe5cd}, - {0x24cb, 0x2545, 0xea80}, - {0x2839, 0x284b, 0xeafb}, - {0x2546, 0x25c0, 0xeb0e}, + {0x24cb, 0x2545, 0xea80}, + {0x2839, 0x284b, 0xeafb}, + {0x2546, 0x25c0, 0xeb0e}, {0x25c1, 0x25c6, 0xeb89}, }; @@ -248,7 +248,7 @@ int mbfilter_conv_map_tbl(int c, int *w, const unsigned short map[][3], int n) { int i, match = 0; - + for (i = 0; i < n; i++) { if (map[i][0] <= c && c <= map[i][1]) { *w = c - map[i][0] + map[i][2]; @@ -263,7 +263,7 @@ int mbfilter_conv_r_map_tbl(int c, int *w, const unsigned short map[][3], int n) { int i, match = 0; - + for (i = 0; i < n; i++) { if (map[i][2] <= c && c <= map[i][2] - map[i][0] + map[i][1]) { *w = c + map[i][0] - map[i][2]; @@ -282,8 +282,8 @@ mbfilter_sjis_emoji_docomo2unicode(int s, int *snd) if (s >= mb_tbl_code2uni_docomo1_min + 0x00a2 && s <= mb_tbl_code2uni_docomo1_min + 0x00ad && s != mb_tbl_code2uni_docomo1_min + 0x00a3) { - w = 0x20E3; - *snd = mb_tbl_code2uni_docomo1[s - mb_tbl_code2uni_docomo1_min]; + w = 0x20E3; + *snd = mb_tbl_code2uni_docomo1[s - mb_tbl_code2uni_docomo1_min]; if (*snd > 0xf000) { *snd += 0x10000; } @@ -328,7 +328,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd) w += 0x10000; } else if (w > 0xe000) { /* unsuported by Unicode 6.0 */ w += 0xf0000; - } + } } } else if (s >= mb_tbl_code2uni_kddi2_min && s <= mb_tbl_code2uni_kddi2_max) { si = s - mb_tbl_code2uni_kddi2_min; @@ -346,7 +346,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd) w += 0x10000; } else if (w > 0xe000) { /* unsuported by Unicode 6.0 */ w += 0xf0000; - } + } } } return w; @@ -368,12 +368,12 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd) } w = 0x20E3; } else { - w = mb_tbl_code2uni_sb1[si]; + w = mb_tbl_code2uni_sb1[si]; if (w > 0xf000) { w += 0x10000; } else if (w > 0xe000) { /* unsuported by Unicode 6.0 */ w += 0xf0000; - } + } } } else if (s >= mb_tbl_code2uni_sb2_min && s <= mb_tbl_code2uni_sb2_max) { si = s - mb_tbl_code2uni_sb2_min; @@ -382,7 +382,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd) w += 0x10000; } else if (w > 0xe000) { /* unsuported by Unicode 6.0 */ w += 0xf0000; - } + } } else if (s >= mb_tbl_code2uni_sb3_min && s <= mb_tbl_code2uni_sb3_max) { si = s - mb_tbl_code2uni_sb3_min; if (si >= 0x0069 && si <= 0x0072) { @@ -394,7 +394,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd) w += 0x10000; } else if (w > 0xe000) { /* unsuported by Unicode 6.0 */ w += 0xf0000; - } + } } } return w; @@ -404,7 +404,7 @@ int mbfilter_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter *filter) { int i, match = 0, c1s; - + if (filter->status == 1) { c1s = filter->cache; filter->cache = 0; @@ -413,7 +413,7 @@ mbfilter_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter *filter) if (c1s == 0x0023) { *s1 = 0x2964; match = 1; - } else if (c1s == 0x0030) { + } else if (c1s == 0x0030) { *s1 = 0x296f; match = 1; } else if (c1s >= 0x0031 && c1s <= 0x0039) { @@ -429,7 +429,7 @@ mbfilter_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter *filter) filter->cache = c; *s1 = -1; return match; - } + } if (c == 0x00A9) { *s1 = 0x29b5; match = 1; @@ -446,13 +446,13 @@ mbfilter_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter *filter) if (i >= 0) { *s1 = mb_tbl_uni_docomo2code3_value[i]; match = 1; - } + } } else if (c >= mb_tbl_uni_docomo2code5_min && c <= mb_tbl_uni_docomo2code5_max) { i = mbfl_bisec_srch2(c - 0xf0000, mb_tbl_uni_docomo2code5_key, mb_tbl_uni_docomo2code5_len); if (i >= 0) { *s1 = mb_tbl_uni_docomo2code5_val[i]; match = 1; - } + } } } @@ -463,7 +463,7 @@ int mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter) { int i, match = 0, c1s; - + if (filter->status == 1) { c1s = filter->cache; filter->cache = 0; @@ -472,7 +472,7 @@ mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter) if (c1s == 0x0023) { *s1 = 0x25bc; match = 1; - } else if (c1s == 0x0030) { + } else if (c1s == 0x0030) { *s1 = 0x2830; match = 1; } else if (c1s >= 0x0031 && c1s <= 0x0039) { @@ -482,7 +482,7 @@ mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter) } else if ((c >= NFLAGS(0x41) && c <= NFLAGS(0x5A)) && (c1s >= NFLAGS(0x41) && c1s <= NFLAGS(0x5A))) { for (i=0; i<10; i++) { if (c1s == NFLAGS(nflags_s[i][0]) && c == NFLAGS(nflags_s[i][1])) { - *s1 = nflags_code_kddi[i]; + *s1 = nflags_code_kddi[i]; match = 1; break; } @@ -500,7 +500,7 @@ mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter) filter->cache = c; *s1 = -1; return match; - } + } if (c == 0x00A9) { *s1 = 0x27dc; match = 1; @@ -523,10 +523,10 @@ mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter) if (i >= 0) { *s1 = mb_tbl_uni_kddi2code5_val[i]; match = 1; - } - } + } + } } - + return match; } @@ -534,7 +534,7 @@ int mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter) { int i, match = 0, c1s; - + if (filter->status == 1) { filter->status = 0; c1s = filter->cache; @@ -543,7 +543,7 @@ mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter) if (c1s == 0x0023) { *s1 = 0x2817; match = 1; - } else if (c1s == 0x0030) { + } else if (c1s == 0x0030) { *s1 = 0x282c; match = 1; } else if (c1s >= 0x0031 && c1s <= 0x0039) { @@ -553,7 +553,7 @@ mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter) } else if ((c >= NFLAGS(0x41) && c <= NFLAGS(0x5A)) && (c1s >= NFLAGS(0x41) && c1s <= NFLAGS(0x5A))) { for (i=0; i<10; i++) { if (c1s == NFLAGS(nflags_s[i][0]) && c == NFLAGS(nflags_s[i][1])) { - *s1 = nflags_code_sb[i]; + *s1 = nflags_code_sb[i]; match = 1; break; } @@ -570,7 +570,7 @@ mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter) filter->cache = c; *s1 = -1; return match; - } + } if (c == 0x00A9) { *s1 = 0x2855; match = 1; @@ -593,8 +593,8 @@ mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter) if (i >= 0) { *s1 = mb_tbl_uni_sb2code5_val[i]; match = 1; - } - } + } + } } return match; } @@ -666,7 +666,7 @@ retry: } else if (s >= (94*94) && s < (114*94)) { /* user (95ku - 114ku) */ w = s - (94*94) + 0xe000; } - + if (s >= (94*94) && s < 119*94) { if (filter->from->no_encoding == mbfl_no_encoding_sjis_docomo) { w = mbfilter_sjis_emoji_docomo2unicode(s, &snd); @@ -679,7 +679,7 @@ retry: if (w > 0 && snd > 0) { CK((*filter->output_function)(snd, filter->data)); } - } + } } if (w <= 0) { w = (s1 << 8) | s2; @@ -698,7 +698,7 @@ retry: break; /* ESC : Softbank Emoji */ case 2: - if (filter->from->no_encoding == mbfl_no_encoding_sjis_sb && + if (filter->from->no_encoding == mbfl_no_encoding_sjis_sb && c == 0x24) { filter->cache = c; filter->status++; @@ -712,7 +712,7 @@ retry: /* ESC $ : Softbank Emoji */ case 3: - if (filter->from->no_encoding == mbfl_no_encoding_sjis_sb && + if (filter->from->no_encoding == mbfl_no_encoding_sjis_sb && ((c >= 0x45 && c <= 0x47) || (c >= 0x4f && c <= 0x51))) { filter->cache = c; filter->status++; @@ -734,27 +734,27 @@ retry: if (c == 0x0f) { w = c; filter->cache = 0; - filter->status = 0; + filter->status = 0; } else { if (c1 == 0x47 && c >= 0x21 && c <= 0x7a) { - s1 = 0x91; s2 = c; + s1 = 0x91; s2 = c; } else if (c1 == 0x45 && c >= 0x21 && c <= 0x7a) { - s1 = 0x8d; s2 = c; + s1 = 0x8d; s2 = c; } else if (c1 == 0x46 && c >= 0x21 && c <= 0x7a) { - s1 = 0x8e; s2 = c; + s1 = 0x8e; s2 = c; } else if (c1 == 0x4f && c >= 0x21 && c <= 0x6d) { - s1 = 0x92; s2 = c; + s1 = 0x92; s2 = c; } else if (c1 == 0x50 && c >= 0x21 && c <= 0x6c) { - s1 = 0x95; s2 = c; + s1 = 0x95; s2 = c; } else if (c1 == 0x51 && c >= 0x21 && c <= 0x5e) { - s1 = 0x96; s2 = c; + s1 = 0x96; s2 = c; } s = (s1 - 0x21)*94 + s2 - 0x21; w = mbfilter_sjis_emoji_sb2unicode(s, &snd); if (w > 0) { if (snd > 0) { CK((*filter->output_function)(snd, filter->data)); - } + } CK((*filter->output_function)(w, filter->data)); } } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h index 15a91a58b5..51b703da72 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 81ab32edfd..265c577e5f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h index f24e42ea22..2c6c70373a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c index c66c51f248..4d075e51d4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -220,7 +220,7 @@ mbfl_filt_tl_jisx0201_jisx0208(int c, mbfl_convert_filter *filt) s = 0xff65; /* HALFWIDTH KATAKANA MIDDLE DOT */ } } else if (mode & (MBFL_FILT_TL_ZEN2HAN_HIRA2KANA - | MBFL_FILT_TL_ZEN2HAN_KANA2HIRA)) { + | MBFL_FILT_TL_ZEN2HAN_KANA2HIRA)) { if ((mode & MBFL_FILT_TL_ZEN2HAN_HIRA2KANA) && c >= 0x3041 && c <= 0x3093) { /* Zenkaku hirangana to Zenkaku katakana */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h index b52b38ee93..922eee168a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 4d83af0bf1..32f174f602 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.h b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.h index 6dd1e65697..bbf567a493 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UCS2_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 12a2033e0c..8906b8ff09 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.h b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.h index 718c7e1c2c..b5280f1bfb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UCS4_H @@ -39,7 +39,7 @@ extern const struct mbfl_convert_vtbl vtbl_ucs4be_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_ucs4be; extern const struct mbfl_convert_vtbl vtbl_ucs4le_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_ucs4le; - + int mbfl_filt_conv_ucs4_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_ucs4be_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_ucs4be(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 86765b2ece..2e1c696f8a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -128,23 +128,23 @@ mbfl_filt_conv_uhc_wchar(int c, mbfl_convert_filter *filter) w = uhc1_ucs_table[w]; } else { w = 0; - } + } } else if ( c1 >= 0xa1 && c1 <= 0xc6){ - w = (c1 - 0xa1)*190 + (c - 0x41); + w = (c1 - 0xa1)*190 + (c - 0x41); if (w >= 0 && w < uhc2_ucs_table_size) { flag = 2; w = uhc2_ucs_table[w]; } else { w = 0; - } + } } else if ( c1 >= 0xc7 && c1 <= 0xfe){ - w = (c1 - 0xc7)*94 + (c - 0xa1); + w = (c1 - 0xc7)*94 + (c - 0xa1); if (w >= 0 && w < uhc3_ucs_table_size) { flag = 3; w = uhc3_ucs_table[w]; } else { w = 0; - } + } } if (flag > 0){ if (w <= 0) { @@ -238,7 +238,7 @@ static int mbfl_filt_ident_uhc(int c, mbfl_identify_filter *filter) filter->status= 3; } else { /* bad */ filter->flag = 1; - } + } case 1: case 2: diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.h b/ext/mbstring/libmbfl/filters/mbfilter_uhc.h index f964249197..6ed5486767 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter_kr.h * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UHC_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index 5df6551d4d..3e008e8035 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.h b/ext/mbstring/libmbfl/filters/mbfilter_utf16.h index f54bb00573..4aa88619c7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UTF16_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c index 3cef6b051a..852bca2002 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 20 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -262,7 +262,7 @@ int mbfl_filt_conv_utf32le_wchar(int c, mbfl_convert_filter *filter) } else { n = (n & MBFL_WCSGROUP_MASK) | MBFL_WCSGROUP_THROUGH; CK((*filter->output_function)(n, filter->data)); - } + } } return c; } diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h index c280e9f376..aa0883fff4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 20 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UTF32_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index 2bb1dfada1..db0979c25d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.h b/ext/mbstring/libmbfl/filters/mbfilter_utf7.h index 0da3b02c0e..6223bdba97 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UTF7_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c index b32095cd33..72c772b072 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.h b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.h index d6c54789c3..19ab934da0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UTF7IMAP_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index 5539700343..a9c141bbfe 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -134,18 +134,18 @@ retry: case 0x32: /* 4byte code 4th char: 0x80-0xbf */ filter->status = 0; if (c >= 0x80 && c <= 0xbf) { - s = (filter->cache<<6) | (c & 0x3f); + s = (filter->cache<<6) | (c & 0x3f); filter->cache = 0; - CK((*filter->output_function)(s, filter->data)); + CK((*filter->output_function)(s, filter->data)); } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */ s = (filter->cache<<6) | (c & 0x3f); c1 = filter->cache & 0xf; - + if ((c >= 0x80 && c <= 0xbf) && ((c1 == 0x0 && c >= 0xa0) || (c1 == 0xd && c < 0xa0) || @@ -154,13 +154,13 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */ s = (filter->cache<<6) | (c & 0x3f); c1 = filter->cache & 0x7; - + if ((c >= 0x80 && c <= 0xbf) && ((c1 == 0x0 && c >= 0x90) || (c1 == 0x4 && c < 0x90) || @@ -169,7 +169,7 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x31: /* 4byte code 3rd char: 0x80-0xbf */ @@ -178,7 +178,7 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; default: @@ -247,7 +247,7 @@ int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter) filter->status &= 0xff; if (c < 0x80) { - if (c < 0) { + if (c < 0) { filter->flag = 1; /* bad */ } else if (filter->status) { filter->flag = 1; /* bad */ @@ -256,23 +256,23 @@ int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter) } else if (c < 0xc0) { switch (filter->status) { case 0x20: /* 3 byte code 2nd char */ - if ((c1 == 0x0 && c >= 0xa0) || - (c1 == 0xd && c < 0xa0) || + if ((c1 == 0x0 && c >= 0xa0) || + (c1 == 0xd && c < 0xa0) || (c1 > 0x0 && c1 != 0xd)) { filter->status++; } else { filter->flag = 1; /* bad */ - filter->status = 0; + filter->status = 0; } break; case 0x30: /* 4 byte code 2nd char */ - if ((c1 == 0x0 && c >= 0x90) || - (c1 > 0x0 && c1 < 0x4) || + if ((c1 == 0x0 && c >= 0x90) || + (c1 > 0x0 && c1 < 0x4) || (c1 == 0x4 && c < 0x90)) { filter->status++; } else { filter->flag = 1; /* bad */ - filter->status = 0; + filter->status = 0; } break; case 0x31: /* 4 byte code 3rd char */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.h b/ext/mbstring/libmbfl/filters/mbfilter_utf8.h index 970ace6462..b0c93ccd3d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UTF8_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index f9b643c17d..c449d3132a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by rui hrokawa <hirokawa@php.net> on 8 aug 2011. - * + * */ #ifdef HAVE_CONFIG_H @@ -215,7 +215,7 @@ retry: case 0x32: /* 4byte code 4th char: 0x80-0xbf */ filter->status = 0; if (c >= 0x80 && c <= 0xbf) { - s = (filter->cache<<6) | (c & 0x3f); + s = (filter->cache<<6) | (c & 0x3f); filter->cache = 0; if (filter->from->no_encoding == mbfl_no_encoding_utf8_docomo && @@ -231,20 +231,20 @@ retry: mbfilter_conv_r_map_tbl(s, &s1, mbfl_sb2uni_pua, 6) > 0) { s = mbfilter_sjis_emoji_sb2unicode(s1, &snd); } - + if (snd > 0) { CK((*filter->output_function)(snd, filter->data)); } CK((*filter->output_function)(s, filter->data)); } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */ s = (filter->cache<<6) | (c & 0x3f); c1 = filter->cache & 0xf; - + if ((c >= 0x80 && c <= 0xbf) && ((c1 == 0x0 && c >= 0xa0) || (c1 == 0xd && c < 0xa0) || @@ -253,13 +253,13 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */ s = (filter->cache<<6) | (c & 0x3f); c1 = filter->cache & 0x7; - + if ((c >= 0x80 && c <= 0xbf) && ((c1 == 0x0 && c >= 0x90) || (c1 == 0x4 && c < 0x90) || @@ -268,7 +268,7 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; case 0x31: /* 4byte code 3rd char: 0x80-0xbf */ @@ -277,7 +277,7 @@ retry: filter->status++; } else { mbfl_filt_put_invalid_char(filter->cache, filter); - goto retry; + goto retry; } break; default: @@ -298,7 +298,7 @@ int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter) if ((filter->to->no_encoding == mbfl_no_encoding_utf8_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter) > 0 && - mbfilter_conv_map_tbl(s1, &c1, mbfl_docomo2uni_pua, 4) > 0) || + mbfilter_conv_map_tbl(s1, &c1, mbfl_docomo2uni_pua, 4) > 0) || (filter->to->no_encoding == mbfl_no_encoding_utf8_kddi_a && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0 && mbfilter_conv_map_tbl(s1, &c1, mbfl_kddi2uni_pua, 7) > 0) || diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h index c127b18404..74ac6e195e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by rui hrokawa <hirokawa@php.net> on 8 aug 2011. - * + * */ #ifndef MBFL_MBFILTER_UTF8_MOBILE_H diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index 64fc39d19b..b8cdfcaf79 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H @@ -65,7 +65,7 @@ enum { uudec_state_ground=0, uudec_state_inbegin, int mbfl_filt_conv_uudec(int c, mbfl_convert_filter * filter) { int n; - + switch(filter->status) { case uudec_state_ground: /* looking for "begin 0666 filename\n" line */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h index ca7521c39c..c02d21f878 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_UUENCODE_H diff --git a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h index 1bd77c91a3..7853d96ba4 100644 --- a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h +++ b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h @@ -1,218 +1,218 @@ static const unsigned short sjis_mac2wchar1[] = { // 0x03ac - 0x03c9 -0x339c, 0x339f, 0x339d, 0x33a0, -0x33a4, 0xff4d, 0x33a1, 0x33a5, -0x339e, 0x33a2, 0x338e, 0xff47, -0x338f, 0x33c4, 0x3396, 0x3397, -0x2113, 0x3398, 0x33b3, 0x33b2, -0x33b1, 0x33b0, 0x2109, 0x33d4, -0x33cb, 0x3390, 0x3385, 0x3386, +0x339c, 0x339f, 0x339d, 0x33a0, +0x33a4, 0xff4d, 0x33a1, 0x33a5, +0x339e, 0x33a2, 0x338e, 0xff47, +0x338f, 0x33c4, 0x3396, 0x3397, +0x2113, 0x3398, 0x33b3, 0x33b2, +0x33b1, 0x33b0, 0x2109, 0x33d4, +0x33cb, 0x3390, 0x3385, 0x3386, 0x3387, 0xf860, }; static const unsigned short sjis_mac2wchar2[] = { // 0x0406 - 0x0420 -0x2116, 0x33cd, -0x2121, 0xf861, 0x2664, 0x2667, -0x2661, 0x2662, 0x2660, 0x2663, -0x2665, 0x2666, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x3020, 0x260e, +0x2116, 0x33cd, +0x2121, 0xf861, 0x2664, 0x2667, +0x2661, 0x2662, 0x2660, 0x2663, +0x2665, 0x2666, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x3020, 0x260e, 0x3004, }; static const unsigned short sjis_mac2wchar3[] = { // 0x0432 - 0x0441 -0x261e, 0x261c, -0x261d, 0x261f, 0x21c6, 0x21c4, -0x21c5, 0xf860, 0x21e8, 0x21e6, -0x21e7, 0x21e9, 0x21e8, 0x21e6, +0x261e, 0x261c, +0x261d, 0x261f, 0x21c6, 0x21c4, +0x21c5, 0xf860, 0x21e8, 0x21e6, +0x21e7, 0x21e9, 0x21e8, 0x21e6, 0x21e7, 0x21e9, }; static const unsigned short sjis_mac2wchar4[] = { // 0x0468 - 0x0480 -0x3230, 0x322a, 0x322b, 0x322c, -0x322d, 0x322e, 0x322f, 0x3240, -0x3237, 0x3242, 0x3243, 0x3239, -0x323a, 0x3231, 0x323e, 0x3234, -0x3232, 0x323b, 0x3236, 0x3233, -0x3235, 0x323c, 0x323d, 0x323f, +0x3230, 0x322a, 0x322b, 0x322c, +0x322d, 0x322e, 0x322f, 0x3240, +0x3237, 0x3242, 0x3243, 0x3239, +0x323a, 0x3231, 0x323e, 0x3234, +0x3232, 0x323b, 0x3236, 0x3233, +0x3235, 0x323c, 0x323d, 0x323f, 0x3238, }; static const unsigned short sjis_mac2wchar5[] = { // 0x04b8 - 0x04e8 -0x5927, 0x5c0f, 0x32a4, 0x32a5, -0x32a6, 0x32a7, 0x32a8, 0x32a9, -0x3296, 0x329d, 0x3298, 0x329e, -0x63a7, 0x3299, 0x3349, 0x3322, -0x334d, 0x3314, 0x3316, 0x3305, -0x3333, 0x334e, 0x3303, 0x3336, -0x3318, 0x3315, 0x3327, 0x3351, -0x334a, 0x3339, 0x3357, 0x330d, -0x3342, 0x3323, 0x3326, 0x333b, -0x332b, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x3300, 0x331e, 0x332a, 0x3331, +0x5927, 0x5c0f, 0x32a4, 0x32a5, +0x32a6, 0x32a7, 0x32a8, 0x32a9, +0x3296, 0x329d, 0x3298, 0x329e, +0x63a7, 0x3299, 0x3349, 0x3322, +0x334d, 0x3314, 0x3316, 0x3305, +0x3333, 0x334e, 0x3303, 0x3336, +0x3318, 0x3315, 0x3327, 0x3351, +0x334a, 0x3339, 0x3357, 0x330d, +0x3342, 0x3323, 0x3326, 0x333b, +0x332b, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x3300, 0x331e, 0x332a, 0x3331, 0x3347, }; static const unsigned short sjis_mac2wchar6[] = { // 0x050c - 0x0551 -0x337e, 0x337d, 0x337c, 0x337b, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x337f, 0xf862, 0xf862, -0x222e, 0x221f, 0x22bf, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x301d, 0x301f, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x3094, 0x0000, 0x30f7, 0x30f8, +0x337e, 0x337d, 0x337c, 0x337b, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x337f, 0xf862, 0xf862, +0x222e, 0x221f, 0x22bf, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x301d, 0x301f, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x3094, 0x0000, 0x30f7, 0x30f8, 0x30f9, 0x30fa, }; static const unsigned short sjis_mac2wchar7[] = { // 0x1ed9 - 0x1f18 -0x3001, 0x3002, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0xffe3, 0xfe33, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x30fc, -0xfe31, 0x2010, 0x0000, 0x0000, -0x301c, 0x2016, 0xff5c, 0x2026, -0xfe30, 0x0000, 0x0000, 0x0000, -0x0000, 0xfe35, 0xfe36, 0xfe39, -0xfe3a, 0xff3b, 0xff3d, 0xfe37, -0xfe38, 0xfe3f, 0xfe40, 0xfe3d, -0xfe3e, 0xfe41, 0xfe42, 0xfe43, -0xfe44, 0xfe3b, 0xfe3c, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, +0x3001, 0x3002, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0xffe3, 0xfe33, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x30fc, +0xfe31, 0x2010, 0x0000, 0x0000, +0x301c, 0x2016, 0xff5c, 0x2026, +0xfe30, 0x0000, 0x0000, 0x0000, +0x0000, 0xfe35, 0xfe36, 0xfe39, +0xfe3a, 0xff3b, 0xff3d, 0xfe37, +0xfe38, 0xfe3f, 0xfe40, 0xfe3d, +0xfe3e, 0xfe41, 0xfe42, 0xfe43, +0xfe44, 0xfe3b, 0xfe3c, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, 0xff1d, }; static const unsigned short sjis_mac2wchar8[] = { // 0x1ff2 - 0x20a5 -0x3041, 0x0000, -0x3043, 0x0000, 0x3045, 0x0000, -0x3047, 0x0000, 0x3049, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x3063, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x3083, 0x0000, 0x3085, 0x0000, -0x3087, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x308e, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x30a1, 0x0000, 0x30a3, 0x0000, -0x30a5, 0x0000, 0x30a7, 0x0000, -0x30a9, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x30c3, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x30e3, 0x0000, -0x30e5, 0x0000, 0x30e7, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x30ee, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, +0x3041, 0x0000, +0x3043, 0x0000, 0x3045, 0x0000, +0x3047, 0x0000, 0x3049, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x3063, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x3083, 0x0000, 0x3085, 0x0000, +0x3087, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x308e, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x30a1, 0x0000, 0x30a3, 0x0000, +0x30a5, 0x0000, 0x30a7, 0x0000, +0x30a9, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x30c3, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x30e3, 0x0000, +0x30e5, 0x0000, 0x30e7, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x30ee, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, 0x30f5, 0x30f6, }; static const unsigned short wchar2sjis_mac4[] = { // 0x2660 - 0x2667 -0x040e, 0x040c, 0x040d, 0x040f, -0x040a, 0x0410, 0x0411, 0x040b, +0x040e, 0x040c, 0x040d, 0x040f, +0x040a, 0x0410, 0x0411, 0x040b, }; static const unsigned short wchar2sjis_mac7[] = { // 0x322a - 0x3243 -0x0469, 0x046a, -0x046b, 0x046c, 0x046d, 0x046e, -0x0468, 0x0475, 0x0478, 0x047b, -0x0477, 0x047c, 0x047a, 0x0470, -0x0480, 0x0473, 0x0474, 0x0479, -0x047d, 0x047e, 0x0476, 0x047f, -0x046f, 0x0000, 0x0471, 0x0472, +0x0469, 0x046a, +0x046b, 0x046c, 0x046d, 0x046e, +0x0468, 0x0475, 0x0478, 0x047b, +0x0477, 0x047c, 0x047a, 0x0470, +0x0480, 0x0473, 0x0474, 0x0479, +0x047d, 0x047e, 0x0476, 0x047f, +0x046f, 0x0000, 0x0471, 0x0472, }; static const unsigned short wchar2sjis_mac8[] = { // 0x3296 - 0x329e -0x04c0, 0x0000, -0x04c2, 0x04c5, 0x0000, 0x0000, +0x04c0, 0x0000, +0x04c2, 0x04c5, 0x0000, 0x0000, 0x0000, 0x04c1, 0x04c3, }; static const unsigned short wchar2sjis_mac9[] = { // 0x3300 - 0x33d4 -0x04e4, 0x0000, 0x0000, 0x04ce, -0x0000, 0x04cb, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x04d7, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x04c9, 0x04d1, 0x04ca, 0x0000, -0x04d0, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x04e5, 0x0000, -0x0000, 0x0000, 0x04c7, 0x04d9, -0x0000, 0x0000, 0x04da, 0x04d2, -0x0000, 0x0000, 0x04e6, 0x04dc, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x04e7, 0x0000, 0x04cc, -0x0000, 0x0000, 0x04cf, 0x0000, -0x0000, 0x04d5, 0x0000, 0x04db, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x04d8, 0x0000, -0x0000, 0x0000, 0x0000, 0x04e8, -0x0000, 0x04c6, 0x04d4, 0x0000, -0x0000, 0x04c8, 0x04cd, 0x0000, -0x0000, 0x04d3, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x04d6, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x050f, -0x050e, 0x050d, 0x050c, 0x0521, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x03c6, 0x03c7, 0x03c8, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x03b6, 0x03b8, -0x03c5, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x03ba, 0x03bb, -0x03bd, 0x0000, 0x0000, 0x0000, -0x03ac, 0x03ae, 0x03b4, 0x03ad, -0x03af, 0x03b2, 0x03b5, 0x0000, -0x03b0, 0x03b3, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x03c1, 0x03c0, 0x03bf, 0x03be, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, -0x03b9, 0x0000, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x03c4, -0x0000, 0x0407, 0x0000, 0x0000, -0x0000, 0x0000, 0x0000, 0x0000, +0x04e4, 0x0000, 0x0000, 0x04ce, +0x0000, 0x04cb, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x04d7, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x04c9, 0x04d1, 0x04ca, 0x0000, +0x04d0, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x04e5, 0x0000, +0x0000, 0x0000, 0x04c7, 0x04d9, +0x0000, 0x0000, 0x04da, 0x04d2, +0x0000, 0x0000, 0x04e6, 0x04dc, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x04e7, 0x0000, 0x04cc, +0x0000, 0x0000, 0x04cf, 0x0000, +0x0000, 0x04d5, 0x0000, 0x04db, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x04d8, 0x0000, +0x0000, 0x0000, 0x0000, 0x04e8, +0x0000, 0x04c6, 0x04d4, 0x0000, +0x0000, 0x04c8, 0x04cd, 0x0000, +0x0000, 0x04d3, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x04d6, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x050f, +0x050e, 0x050d, 0x050c, 0x0521, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x03c6, 0x03c7, 0x03c8, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x03b6, 0x03b8, +0x03c5, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x03ba, 0x03bb, +0x03bd, 0x0000, 0x0000, 0x0000, +0x03ac, 0x03ae, 0x03b4, 0x03ad, +0x03af, 0x03b2, 0x03b5, 0x0000, +0x03b0, 0x03b3, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x03c1, 0x03c0, 0x03bf, 0x03be, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, +0x03b9, 0x0000, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x03c4, +0x0000, 0x0407, 0x0000, 0x0000, +0x0000, 0x0000, 0x0000, 0x0000, 0x03c3, }; static const unsigned short wchar2sjis_mac10[] = { // 0xfe30 - 0xfe44 -0x1efc, 0x1ef4, 0x0000, 0x1ee9, -0x0000, 0x1f01, 0x1f02, 0x1f07, -0x1f08, 0x1f03, 0x1f04, 0x1f11, -0x1f12, 0x1f0b, 0x1f0c, 0x1f09, -0x1f0a, 0x1f0d, 0x1f0e, 0x1f0f, +0x1efc, 0x1ef4, 0x0000, 0x1ee9, +0x0000, 0x1f01, 0x1f02, 0x1f07, +0x1f08, 0x1f03, 0x1f04, 0x1f11, +0x1f12, 0x1f0b, 0x1f0c, 0x1f09, +0x1f0a, 0x1f0d, 0x1f0e, 0x1f0f, 0x1f10, }; static const unsigned short code_tbl[][3] = { diff --git a/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h b/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h index 4f8f4b7b11..b30efce5d7 100644 --- a/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h +++ b/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_prop.h b/ext/mbstring/libmbfl/filters/unicode_prop.h index 4feb5756e3..bbb92b98e7 100644 --- a/ext/mbstring/libmbfl/filters/unicode_prop.h +++ b/ext/mbstring/libmbfl/filters/unicode_prop.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h b/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h index 174e95de7a..abf89867ea 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h @@ -19,7 +19,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * The author of this file: Hayk Chamyan <hamshen@gmail.com> - * + * */ #ifndef UNICODE_TABLE_ARMSCII8_H diff --git a/ext/mbstring/libmbfl/filters/unicode_table_big5.h b/ext/mbstring/libmbfl/filters/unicode_table_big5.h index 2616d0433a..0be595f6e3 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_big5.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_big5.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cns11643.h b/ext/mbstring/libmbfl/filters/unicode_table_cns11643.h index 0c17e1e616..83915af1bd 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cns11643.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cns11643.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h b/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h index 99ec985b36..9be88c587f 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -27,21 +27,21 @@ /* cp1251 to Unicode table */ static const unsigned short cp1251_ucs_table[] = { - 0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, - 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f, - 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, - 0x003f, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f, - 0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, - 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407, - 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, - 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, + 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f, + 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, + 0x003f, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f, + 0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, + 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407, + 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, + 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f }; static const int cp1251_ucs_table_min = 0x80; diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp1252.h b/ext/mbstring/libmbfl/filters/unicode_table_cp1252.h index 8a33920f11..eb48af55e3 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp1252.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp1252.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h b/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h index 644053cf7a..7a9c4424ad 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -27,21 +27,21 @@ /* cp1254 to Unicode table */ static const unsigned short cp1254_ucs_table[] = { - 0x20ac, 0xfffe, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, - 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0xfffe, 0xfffe, 0xfffe, - 0xfffe, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, - 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0xfffe, 0xfffe, 0x0178, - 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, - 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, - 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, - 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, - 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, - 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, - 0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, - 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df, - 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, - 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, - 0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, + 0x20ac, 0xfffe, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, + 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0xfffe, 0xfffe, 0xfffe, + 0xfffe, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, + 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0xfffe, 0xfffe, 0x0178, + 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, + 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, + 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, + 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, + 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, + 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, + 0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, + 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df, + 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, + 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, + 0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff }; static const int cp1254_ucs_table_min = 0x80; diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp850.h b/ext/mbstring/libmbfl/filters/unicode_table_cp850.h index 6c60ae03e0..57fb61dbc9 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp850.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp850.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp866.h b/ext/mbstring/libmbfl/filters/unicode_table_cp866.h index 567493276f..468e1a77c2 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp866.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp866.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -27,21 +27,21 @@ /* cp866_DOSCyrillicRussian to Unicode table */ static const unsigned short cp866_ucs_table[] = { - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, - 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, - 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, - 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f, - 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040e, 0x045e, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, + 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, + 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, + 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f, + 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040e, 0x045e, 0x00b0, 0x2219, 0x00b7, 0x221a, 0x2116, 0x00a4, 0x25a0, 0x00a0 }; static const int cp866_ucs_table_min = 0x80; diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp932_ext.h b/ext/mbstring/libmbfl/filters/unicode_table_cp932_ext.h index b685713142..8b1efdd0be 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp932_ext.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp932_ext.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_cp936.h b/ext/mbstring/libmbfl/filters/unicode_table_cp936.h index 173c8f4b3f..cefd5568c9 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_cp936.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_cp936.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -3175,7 +3175,7 @@ const int cp936_ucs_table_size = (sizeof(cp936_ucs_table)/sizeof(unsigned short) /* UCS -> CP936 */ -const unsigned short ucs_a1_cp936_table[] = { +const unsigned short ucs_a1_cp936_table[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000a,0x000b,0x000c,0x000d,0x000e,0x000f, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_gb18030.h b/ext/mbstring/libmbfl/filters/unicode_table_gb18030.h index 7c38045638..04126d8ccd 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_gb18030.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_gb18030.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -89,142 +89,142 @@ static const unsigned short mbfl_gb18030_pua_tbl[][3] = { static const int mbfl_gb18030_pua_tbl_max = sizeof(mbfl_gb18030_pua_tbl)/(sizeof(unsigned short)*3); static const unsigned short mbfl_gb2uni_tbl[] = { -0x0000, 0x0023, 0x0024, 0x0025, 0x0026, 0x002c, 0x002d, 0x0031, -0x0032, 0x0050, 0x0051, 0x0058, 0x0059, 0x005e, 0x005f, 0x005f, -0x0060, 0x0063, 0x0064, 0x0066, 0x0067, 0x0067, 0x0068, 0x0068, -0x0069, 0x006c, 0x006d, 0x007d, 0x007e, 0x0084, 0x0085, 0x0093, -0x0094, 0x00ab, 0x00ac, 0x00ae, 0x00af, 0x00b2, 0x00b3, 0x00cf, -0x00d0, 0x0131, 0x0132, 0x0132, 0x0133, 0x0133, 0x0134, 0x0134, -0x0135, 0x0135, 0x0136, 0x0136, 0x0137, 0x0137, 0x0138, 0x0138, -0x0139, 0x0154, 0x0155, 0x01ab, 0x01ac, 0x01ba, 0x01bb, 0x021f, -0x0220, 0x0220, 0x0221, 0x022d, 0x022e, 0x02e4, 0x02e5, 0x02e5, -0x02e6, 0x02ec, 0x02ed, 0x02ed, 0x02ee, 0x0324, 0x0325, 0x0332, -0x0333, 0x0333, 0x0334, 0x1ef1, 0x1ef2, 0x1ef3, 0x1ef4, 0x1ef4, -0x1ef5, 0x1ef6, 0x1ef7, 0x1efd, 0x1efe, 0x1f06, 0x1f07, 0x1f07, -0x1f08, 0x1f08, 0x1f09, 0x1f0d, 0x1f0e, 0x1f7d, 0x1f7e, 0x1fd3, -0x1fd4, 0x1fd4, 0x1fd5, 0x1fd7, 0x1fd8, 0x1fe3, 0x1fe4, 0x1fed, -0x1fee, 0x202b, 0x202c, 0x202f, 0x2030, 0x2045, 0x2046, 0x2047, -0x2048, 0x20b5, 0x20b6, 0x20bb, 0x20bc, 0x20bc, 0x20bd, 0x20bf, -0x20c0, 0x20c3, 0x20c4, 0x20c5, 0x20c6, 0x20c7, 0x20c8, 0x20c8, -0x20c9, 0x20c9, 0x20ca, 0x20cb, 0x20cc, 0x20d0, 0x20d1, 0x20d5, -0x20d6, 0x20df, 0x20e0, 0x20e2, 0x20e3, 0x20e7, 0x20e8, 0x20f4, -0x20f5, 0x20f6, 0x20f7, 0x20fc, 0x20fd, 0x2121, 0x2122, 0x2124, -0x2125, 0x212f, 0x2130, 0x2148, 0x2149, 0x219a, 0x219b, 0x22e7, -0x22e8, 0x22f1, 0x22f2, 0x2355, 0x2356, 0x2359, 0x235a, 0x2366, -0x2367, 0x2369, 0x236a, 0x2373, 0x2374, 0x2383, 0x2384, 0x238b, -0x238c, 0x2393, 0x2394, 0x2396, 0x2397, 0x2398, 0x2399, 0x23aa, -0x23ab, 0x23c9, 0x23ca, 0x23cb, 0x23cc, 0x2401, 0x2402, 0x2402, -0x2403, 0x2c40, 0x2c41, 0x2c42, 0x2c43, 0x2c45, 0x2c46, 0x2c47, -0x2c48, 0x2c51, 0x2c52, 0x2c60, 0x2c61, 0x2c62, 0x2c63, 0x2c65, -0x2c66, 0x2c69, 0x2c6a, 0x2c6b, 0x2c6c, 0x2c6e, 0x2c6f, 0x2c7c, -0x2c7d, 0x2da1, 0x2da2, 0x2da5, 0x2da6, 0x2da6, 0x2da7, 0x2dab, -0x2dac, 0x2dad, 0x2dae, 0x2dc1, 0x2dc2, 0x2dc3, 0x2dc4, 0x2dca, -0x2dcb, 0x2dcc, 0x2dcd, 0x2dd1, 0x2dd2, 0x2dd7, 0x2dd8, 0x2ecd, -0x2ece, 0x2ed4, 0x2ed5, 0x2f45, 0x2f46, 0x302f, 0x3030, 0x303b, -0x303c, 0x303d, 0x303e, 0x305f, 0x3060, 0x3068, 0x3069, 0x306a, -0x306b, 0x306c, 0x306d, 0x30dd, 0x30de, 0x3108, 0x3109, 0x3232, -0x3233, 0x32a1, 0x32a2, 0x32ac, 0x32ad, 0x35a9, 0x35aa, 0x35fe, -0x35ff, 0x365e, 0x365f, 0x366c, 0x366d, 0x36ff, 0x3700, 0x37d9, -0x37da, 0x38f8, 0x38f9, 0x3969, 0x396a, 0x3cde, 0x3cdf, 0x3de6, -0x3de7, 0x3fbd, 0x3fbe, 0x4031, 0x4032, 0x4035, 0x4036, 0x4060, -0x4061, 0x4158, 0x4159, 0x42cd, 0x42ce, 0x42e1, 0x42e2, 0x43a2, -0x43a3, 0x43a7, 0x43a8, 0x43f9, 0x43fa, 0x4409, 0x440a, 0x45c2, -0x45c3, 0x45f4, 0x45f5, 0x45f6, 0x45f7, 0x45fa, 0x45fb, 0x45fb, -0x45fc, 0x460f, 0x4610, 0x4612, 0x4613, 0x4628, 0x4629, 0x48e7, -0x48e8, 0x490e, 0x490f, 0x497d, 0x497e, 0x4a11, 0x4a12, 0x4a62, -0x4a63, 0x82bc, 0x82bd, 0x82bd, 0x82be, 0x82be, 0x82bf, 0x82cb, -0x82cc, 0x82cc, 0x82cd, 0x82d1, 0x82d2, 0x82d8, 0x82d9, 0x82dc, -0x82dd, 0x82e0, 0x82e1, 0x82e8, 0x82e9, 0x82ef, 0x82f0, 0x82ff, -0x8300, 0x830d, 0x830e, 0x93d4, 0x93d5, 0x9420, 0x9421, 0x943b, -0x943c, 0x948c, 0x948d, 0x9495, 0x9496, 0x94af, 0x94b0, 0x94b0, -0x94b1, 0x94b1, 0x94b2, 0x94b4, 0x94b5, 0x94ba, 0x94bb, 0x94bb, -0x94bc, 0x94bd, 0x94be, 0x98c3, 0x98c4, 0x98c4, 0x98c5, 0x98c8, -0x98c9, 0x98c9, 0x98ca, 0x98ca, 0x98cb, 0x98cb, 0x98cc, 0x9960, -0x9961, 0x99e1, 0x99e2, 0x99fb, +0x0000, 0x0023, 0x0024, 0x0025, 0x0026, 0x002c, 0x002d, 0x0031, +0x0032, 0x0050, 0x0051, 0x0058, 0x0059, 0x005e, 0x005f, 0x005f, +0x0060, 0x0063, 0x0064, 0x0066, 0x0067, 0x0067, 0x0068, 0x0068, +0x0069, 0x006c, 0x006d, 0x007d, 0x007e, 0x0084, 0x0085, 0x0093, +0x0094, 0x00ab, 0x00ac, 0x00ae, 0x00af, 0x00b2, 0x00b3, 0x00cf, +0x00d0, 0x0131, 0x0132, 0x0132, 0x0133, 0x0133, 0x0134, 0x0134, +0x0135, 0x0135, 0x0136, 0x0136, 0x0137, 0x0137, 0x0138, 0x0138, +0x0139, 0x0154, 0x0155, 0x01ab, 0x01ac, 0x01ba, 0x01bb, 0x021f, +0x0220, 0x0220, 0x0221, 0x022d, 0x022e, 0x02e4, 0x02e5, 0x02e5, +0x02e6, 0x02ec, 0x02ed, 0x02ed, 0x02ee, 0x0324, 0x0325, 0x0332, +0x0333, 0x0333, 0x0334, 0x1ef1, 0x1ef2, 0x1ef3, 0x1ef4, 0x1ef4, +0x1ef5, 0x1ef6, 0x1ef7, 0x1efd, 0x1efe, 0x1f06, 0x1f07, 0x1f07, +0x1f08, 0x1f08, 0x1f09, 0x1f0d, 0x1f0e, 0x1f7d, 0x1f7e, 0x1fd3, +0x1fd4, 0x1fd4, 0x1fd5, 0x1fd7, 0x1fd8, 0x1fe3, 0x1fe4, 0x1fed, +0x1fee, 0x202b, 0x202c, 0x202f, 0x2030, 0x2045, 0x2046, 0x2047, +0x2048, 0x20b5, 0x20b6, 0x20bb, 0x20bc, 0x20bc, 0x20bd, 0x20bf, +0x20c0, 0x20c3, 0x20c4, 0x20c5, 0x20c6, 0x20c7, 0x20c8, 0x20c8, +0x20c9, 0x20c9, 0x20ca, 0x20cb, 0x20cc, 0x20d0, 0x20d1, 0x20d5, +0x20d6, 0x20df, 0x20e0, 0x20e2, 0x20e3, 0x20e7, 0x20e8, 0x20f4, +0x20f5, 0x20f6, 0x20f7, 0x20fc, 0x20fd, 0x2121, 0x2122, 0x2124, +0x2125, 0x212f, 0x2130, 0x2148, 0x2149, 0x219a, 0x219b, 0x22e7, +0x22e8, 0x22f1, 0x22f2, 0x2355, 0x2356, 0x2359, 0x235a, 0x2366, +0x2367, 0x2369, 0x236a, 0x2373, 0x2374, 0x2383, 0x2384, 0x238b, +0x238c, 0x2393, 0x2394, 0x2396, 0x2397, 0x2398, 0x2399, 0x23aa, +0x23ab, 0x23c9, 0x23ca, 0x23cb, 0x23cc, 0x2401, 0x2402, 0x2402, +0x2403, 0x2c40, 0x2c41, 0x2c42, 0x2c43, 0x2c45, 0x2c46, 0x2c47, +0x2c48, 0x2c51, 0x2c52, 0x2c60, 0x2c61, 0x2c62, 0x2c63, 0x2c65, +0x2c66, 0x2c69, 0x2c6a, 0x2c6b, 0x2c6c, 0x2c6e, 0x2c6f, 0x2c7c, +0x2c7d, 0x2da1, 0x2da2, 0x2da5, 0x2da6, 0x2da6, 0x2da7, 0x2dab, +0x2dac, 0x2dad, 0x2dae, 0x2dc1, 0x2dc2, 0x2dc3, 0x2dc4, 0x2dca, +0x2dcb, 0x2dcc, 0x2dcd, 0x2dd1, 0x2dd2, 0x2dd7, 0x2dd8, 0x2ecd, +0x2ece, 0x2ed4, 0x2ed5, 0x2f45, 0x2f46, 0x302f, 0x3030, 0x303b, +0x303c, 0x303d, 0x303e, 0x305f, 0x3060, 0x3068, 0x3069, 0x306a, +0x306b, 0x306c, 0x306d, 0x30dd, 0x30de, 0x3108, 0x3109, 0x3232, +0x3233, 0x32a1, 0x32a2, 0x32ac, 0x32ad, 0x35a9, 0x35aa, 0x35fe, +0x35ff, 0x365e, 0x365f, 0x366c, 0x366d, 0x36ff, 0x3700, 0x37d9, +0x37da, 0x38f8, 0x38f9, 0x3969, 0x396a, 0x3cde, 0x3cdf, 0x3de6, +0x3de7, 0x3fbd, 0x3fbe, 0x4031, 0x4032, 0x4035, 0x4036, 0x4060, +0x4061, 0x4158, 0x4159, 0x42cd, 0x42ce, 0x42e1, 0x42e2, 0x43a2, +0x43a3, 0x43a7, 0x43a8, 0x43f9, 0x43fa, 0x4409, 0x440a, 0x45c2, +0x45c3, 0x45f4, 0x45f5, 0x45f6, 0x45f7, 0x45fa, 0x45fb, 0x45fb, +0x45fc, 0x460f, 0x4610, 0x4612, 0x4613, 0x4628, 0x4629, 0x48e7, +0x48e8, 0x490e, 0x490f, 0x497d, 0x497e, 0x4a11, 0x4a12, 0x4a62, +0x4a63, 0x82bc, 0x82bd, 0x82bd, 0x82be, 0x82be, 0x82bf, 0x82cb, +0x82cc, 0x82cc, 0x82cd, 0x82d1, 0x82d2, 0x82d8, 0x82d9, 0x82dc, +0x82dd, 0x82e0, 0x82e1, 0x82e8, 0x82e9, 0x82ef, 0x82f0, 0x82ff, +0x8300, 0x830d, 0x830e, 0x93d4, 0x93d5, 0x9420, 0x9421, 0x943b, +0x943c, 0x948c, 0x948d, 0x9495, 0x9496, 0x94af, 0x94b0, 0x94b0, +0x94b1, 0x94b1, 0x94b2, 0x94b4, 0x94b5, 0x94ba, 0x94bb, 0x94bb, +0x94bc, 0x94bd, 0x94be, 0x98c3, 0x98c4, 0x98c4, 0x98c5, 0x98c8, +0x98c9, 0x98c9, 0x98ca, 0x98ca, 0x98cb, 0x98cb, 0x98cc, 0x9960, +0x9961, 0x99e1, 0x99e2, 0x99fb, }; static const unsigned short mbfl_uni2gb_tbl[] = { -0x0080, 0x00a3, 0x00a5, 0x00a6, 0x00a9, 0x00af, 0x00b2, 0x00b6, -0x00b8, 0x00d6, 0x00d8, 0x00df, 0x00e2, 0x00e7, 0x00eb, 0x00eb, -0x00ee, 0x00f1, 0x00f4, 0x00f6, 0x00f8, 0x00f8, 0x00fb, 0x00fb, -0x00fd, 0x0100, 0x0102, 0x0112, 0x0114, 0x011a, 0x011c, 0x012a, -0x012c, 0x0143, 0x0145, 0x0147, 0x0149, 0x014c, 0x014e, 0x016a, -0x016c, 0x01cd, 0x01cf, 0x01cf, 0x01d1, 0x01d1, 0x01d3, 0x01d3, -0x01d5, 0x01d5, 0x01d7, 0x01d7, 0x01d9, 0x01d9, 0x01db, 0x01db, -0x01dd, 0x01f8, 0x01fa, 0x0250, 0x0252, 0x0260, 0x0262, 0x02c6, -0x02c8, 0x02c8, 0x02cc, 0x02d8, 0x02da, 0x0390, 0x03a2, 0x03a2, -0x03aa, 0x03b0, 0x03c2, 0x03c2, 0x03ca, 0x0400, 0x0402, 0x040f, -0x0450, 0x0450, 0x0452, 0x200f, 0x2011, 0x2012, 0x2017, 0x2017, -0x201a, 0x201b, 0x201e, 0x2024, 0x2027, 0x202f, 0x2031, 0x2031, -0x2034, 0x2034, 0x2036, 0x203a, 0x203c, 0x20ab, 0x20ad, 0x2102, -0x2104, 0x2104, 0x2106, 0x2108, 0x210a, 0x2115, 0x2117, 0x2120, -0x2122, 0x215f, 0x216c, 0x216f, 0x217a, 0x218f, 0x2194, 0x2195, -0x219a, 0x2207, 0x2209, 0x220e, 0x2210, 0x2210, 0x2212, 0x2214, -0x2216, 0x2219, 0x221b, 0x221c, 0x2221, 0x2222, 0x2224, 0x2224, -0x2226, 0x2226, 0x222c, 0x222d, 0x222f, 0x2233, 0x2238, 0x223c, -0x223e, 0x2247, 0x2249, 0x224b, 0x224d, 0x2251, 0x2253, 0x225f, -0x2262, 0x2263, 0x2268, 0x226d, 0x2270, 0x2294, 0x2296, 0x2298, -0x229a, 0x22a4, 0x22a6, 0x22be, 0x22c0, 0x2311, 0x2313, 0x245f, -0x246a, 0x2473, 0x249c, 0x24ff, 0x254c, 0x254f, 0x2574, 0x2580, -0x2590, 0x2592, 0x2596, 0x259f, 0x25a2, 0x25b1, 0x25b4, 0x25bb, -0x25be, 0x25c5, 0x25c8, 0x25ca, 0x25cc, 0x25cd, 0x25d0, 0x25e1, -0x25e6, 0x2604, 0x2607, 0x2608, 0x260a, 0x263f, 0x2641, 0x2641, -0x2643, 0x2e80, 0x2e82, 0x2e83, 0x2e85, 0x2e87, 0x2e89, 0x2e8a, -0x2e8d, 0x2e96, 0x2e98, 0x2ea6, 0x2ea8, 0x2ea9, 0x2eab, 0x2ead, -0x2eaf, 0x2eb2, 0x2eb4, 0x2eb5, 0x2eb8, 0x2eba, 0x2ebc, 0x2ec9, -0x2ecb, 0x2fef, 0x2ffc, 0x2fff, 0x3004, 0x3004, 0x3018, 0x301c, -0x301f, 0x3020, 0x302a, 0x303d, 0x303f, 0x3040, 0x3094, 0x309a, -0x309f, 0x30a0, 0x30f7, 0x30fb, 0x30ff, 0x3104, 0x312a, 0x321f, -0x322a, 0x3230, 0x3232, 0x32a2, 0x32a4, 0x338d, 0x3390, 0x339b, -0x339f, 0x33a0, 0x33a2, 0x33c3, 0x33c5, 0x33cd, 0x33cf, 0x33d0, -0x33d3, 0x33d4, 0x33d6, 0x3446, 0x3448, 0x3472, 0x3474, 0x359d, -0x359f, 0x360d, 0x360f, 0x3619, 0x361b, 0x3917, 0x3919, 0x396d, -0x396f, 0x39ce, 0x39d1, 0x39de, 0x39e0, 0x3a72, 0x3a74, 0x3b4d, -0x3b4f, 0x3c6d, 0x3c6f, 0x3cdf, 0x3ce1, 0x4055, 0x4057, 0x415e, -0x4160, 0x4336, 0x4338, 0x43ab, 0x43ad, 0x43b0, 0x43b2, 0x43dc, -0x43de, 0x44d5, 0x44d7, 0x464b, 0x464d, 0x4660, 0x4662, 0x4722, -0x4724, 0x4728, 0x472a, 0x477b, 0x477d, 0x478c, 0x478e, 0x4946, -0x4948, 0x4979, 0x497b, 0x497c, 0x497e, 0x4981, 0x4984, 0x4984, -0x4987, 0x499a, 0x499c, 0x499e, 0x49a0, 0x49b5, 0x49b8, 0x4c76, -0x4c78, 0x4c9e, 0x4ca4, 0x4d12, 0x4d1a, 0x4dad, 0x4daf, 0x4dff, -0x9fa6, 0xd7ff, 0xe76c, 0xe76c, 0xe7c8, 0xe7c8, 0xe7e7, 0xe7f3, -0xe815, 0xe815, 0xe819, 0xe81d, 0xe81f, 0xe825, 0xe827, 0xe82a, -0xe82d, 0xe830, 0xe833, 0xe83a, 0xe83c, 0xe842, 0xe844, 0xe853, -0xe856, 0xe863, 0xe865, 0xf92b, 0xf92d, 0xf978, 0xf97a, 0xf994, -0xf996, 0xf9e6, 0xf9e8, 0xf9f0, 0xf9f2, 0xfa0b, 0xfa10, 0xfa10, -0xfa12, 0xfa12, 0xfa15, 0xfa17, 0xfa19, 0xfa1e, 0xfa22, 0xfa22, -0xfa25, 0xfa26, 0xfa2a, 0xfe2f, 0xfe32, 0xfe32, 0xfe45, 0xfe48, -0xfe53, 0xfe53, 0xfe58, 0xfe58, 0xfe67, 0xfe67, 0xfe6c, 0xff00, -0xff5f, 0xffdf, 0xffe6, 0xffff, +0x0080, 0x00a3, 0x00a5, 0x00a6, 0x00a9, 0x00af, 0x00b2, 0x00b6, +0x00b8, 0x00d6, 0x00d8, 0x00df, 0x00e2, 0x00e7, 0x00eb, 0x00eb, +0x00ee, 0x00f1, 0x00f4, 0x00f6, 0x00f8, 0x00f8, 0x00fb, 0x00fb, +0x00fd, 0x0100, 0x0102, 0x0112, 0x0114, 0x011a, 0x011c, 0x012a, +0x012c, 0x0143, 0x0145, 0x0147, 0x0149, 0x014c, 0x014e, 0x016a, +0x016c, 0x01cd, 0x01cf, 0x01cf, 0x01d1, 0x01d1, 0x01d3, 0x01d3, +0x01d5, 0x01d5, 0x01d7, 0x01d7, 0x01d9, 0x01d9, 0x01db, 0x01db, +0x01dd, 0x01f8, 0x01fa, 0x0250, 0x0252, 0x0260, 0x0262, 0x02c6, +0x02c8, 0x02c8, 0x02cc, 0x02d8, 0x02da, 0x0390, 0x03a2, 0x03a2, +0x03aa, 0x03b0, 0x03c2, 0x03c2, 0x03ca, 0x0400, 0x0402, 0x040f, +0x0450, 0x0450, 0x0452, 0x200f, 0x2011, 0x2012, 0x2017, 0x2017, +0x201a, 0x201b, 0x201e, 0x2024, 0x2027, 0x202f, 0x2031, 0x2031, +0x2034, 0x2034, 0x2036, 0x203a, 0x203c, 0x20ab, 0x20ad, 0x2102, +0x2104, 0x2104, 0x2106, 0x2108, 0x210a, 0x2115, 0x2117, 0x2120, +0x2122, 0x215f, 0x216c, 0x216f, 0x217a, 0x218f, 0x2194, 0x2195, +0x219a, 0x2207, 0x2209, 0x220e, 0x2210, 0x2210, 0x2212, 0x2214, +0x2216, 0x2219, 0x221b, 0x221c, 0x2221, 0x2222, 0x2224, 0x2224, +0x2226, 0x2226, 0x222c, 0x222d, 0x222f, 0x2233, 0x2238, 0x223c, +0x223e, 0x2247, 0x2249, 0x224b, 0x224d, 0x2251, 0x2253, 0x225f, +0x2262, 0x2263, 0x2268, 0x226d, 0x2270, 0x2294, 0x2296, 0x2298, +0x229a, 0x22a4, 0x22a6, 0x22be, 0x22c0, 0x2311, 0x2313, 0x245f, +0x246a, 0x2473, 0x249c, 0x24ff, 0x254c, 0x254f, 0x2574, 0x2580, +0x2590, 0x2592, 0x2596, 0x259f, 0x25a2, 0x25b1, 0x25b4, 0x25bb, +0x25be, 0x25c5, 0x25c8, 0x25ca, 0x25cc, 0x25cd, 0x25d0, 0x25e1, +0x25e6, 0x2604, 0x2607, 0x2608, 0x260a, 0x263f, 0x2641, 0x2641, +0x2643, 0x2e80, 0x2e82, 0x2e83, 0x2e85, 0x2e87, 0x2e89, 0x2e8a, +0x2e8d, 0x2e96, 0x2e98, 0x2ea6, 0x2ea8, 0x2ea9, 0x2eab, 0x2ead, +0x2eaf, 0x2eb2, 0x2eb4, 0x2eb5, 0x2eb8, 0x2eba, 0x2ebc, 0x2ec9, +0x2ecb, 0x2fef, 0x2ffc, 0x2fff, 0x3004, 0x3004, 0x3018, 0x301c, +0x301f, 0x3020, 0x302a, 0x303d, 0x303f, 0x3040, 0x3094, 0x309a, +0x309f, 0x30a0, 0x30f7, 0x30fb, 0x30ff, 0x3104, 0x312a, 0x321f, +0x322a, 0x3230, 0x3232, 0x32a2, 0x32a4, 0x338d, 0x3390, 0x339b, +0x339f, 0x33a0, 0x33a2, 0x33c3, 0x33c5, 0x33cd, 0x33cf, 0x33d0, +0x33d3, 0x33d4, 0x33d6, 0x3446, 0x3448, 0x3472, 0x3474, 0x359d, +0x359f, 0x360d, 0x360f, 0x3619, 0x361b, 0x3917, 0x3919, 0x396d, +0x396f, 0x39ce, 0x39d1, 0x39de, 0x39e0, 0x3a72, 0x3a74, 0x3b4d, +0x3b4f, 0x3c6d, 0x3c6f, 0x3cdf, 0x3ce1, 0x4055, 0x4057, 0x415e, +0x4160, 0x4336, 0x4338, 0x43ab, 0x43ad, 0x43b0, 0x43b2, 0x43dc, +0x43de, 0x44d5, 0x44d7, 0x464b, 0x464d, 0x4660, 0x4662, 0x4722, +0x4724, 0x4728, 0x472a, 0x477b, 0x477d, 0x478c, 0x478e, 0x4946, +0x4948, 0x4979, 0x497b, 0x497c, 0x497e, 0x4981, 0x4984, 0x4984, +0x4987, 0x499a, 0x499c, 0x499e, 0x49a0, 0x49b5, 0x49b8, 0x4c76, +0x4c78, 0x4c9e, 0x4ca4, 0x4d12, 0x4d1a, 0x4dad, 0x4daf, 0x4dff, +0x9fa6, 0xd7ff, 0xe76c, 0xe76c, 0xe7c8, 0xe7c8, 0xe7e7, 0xe7f3, +0xe815, 0xe815, 0xe819, 0xe81d, 0xe81f, 0xe825, 0xe827, 0xe82a, +0xe82d, 0xe830, 0xe833, 0xe83a, 0xe83c, 0xe842, 0xe844, 0xe853, +0xe856, 0xe863, 0xe865, 0xf92b, 0xf92d, 0xf978, 0xf97a, 0xf994, +0xf996, 0xf9e6, 0xf9e8, 0xf9f0, 0xf9f2, 0xfa0b, 0xfa10, 0xfa10, +0xfa12, 0xfa12, 0xfa15, 0xfa17, 0xfa19, 0xfa1e, 0xfa22, 0xfa22, +0xfa25, 0xfa26, 0xfa2a, 0xfe2f, 0xfe32, 0xfe32, 0xfe45, 0xfe48, +0xfe53, 0xfe53, 0xfe58, 0xfe58, 0xfe67, 0xfe67, 0xfe6c, 0xff00, +0xff5f, 0xffdf, 0xffe6, 0xffff, }; static const unsigned short mbfl_gb_uni_ofst[] = { - 128, 129, 131, 133, 134, 135, 137, 140, - 142, 144, 145, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, - 168, 171, 172, 189, 196, 213, 220, 221, - 285, 286, 287, 291, 293, 295, 297, 298, - 300, 301, 302, 303, 304, 305, 306, 307, - 308, 320, 330, 334, 338, 339, 340, 341, - 342, 343, 347, 348, 349, 354, 355, 359, - 360, 361, 362, 363, 365, 369, 371, 372, - 373, 374, 375, 376, 386, 426, 502, 538, - 553, 556, 558, 560, 562, 564, 565, 567, - 571, 573, 574, 575, 576, 577, 578, 579, - 581, 582, 583, 584, 585, 586, 588, 589, - 590, 602, 606, 625, 627, 636, 637, 720, - 724, 810, 813, 850, 860, 861, 862, 864, - 867, 868, 869, 870, 872, 873, 874, 875, - 876, 877, 878, 879, 880, 882, 883, 884, - 885, 886, 887, 888, 889, 890, 891, 892, - 893, 894, 895, 896, 897, 898, 899, 900, - 901, 902, 903, 905, 907, 908, 909, 911, - 912, 917, 924, 925, 21827, 25775, 25866, 25896, - 25929, 25932, 25933, 25934, 25936, 25938, 25939, 25940, - 25942, 25943, 25944, 25945, 25946, 25947, 25948, 25952, - 25953, 25955, 25956, 25959, 25961, 25964, 25966, 25984, - 25994, 25998, 26012, 26016, 26110, 26116, + 128, 129, 131, 133, 134, 135, 137, 140, + 142, 144, 145, 147, 148, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, + 168, 171, 172, 189, 196, 213, 220, 221, + 285, 286, 287, 291, 293, 295, 297, 298, + 300, 301, 302, 303, 304, 305, 306, 307, + 308, 320, 330, 334, 338, 339, 340, 341, + 342, 343, 347, 348, 349, 354, 355, 359, + 360, 361, 362, 363, 365, 369, 371, 372, + 373, 374, 375, 376, 386, 426, 502, 538, + 553, 556, 558, 560, 562, 564, 565, 567, + 571, 573, 574, 575, 576, 577, 578, 579, + 581, 582, 583, 584, 585, 586, 588, 589, + 590, 602, 606, 625, 627, 636, 637, 720, + 724, 810, 813, 850, 860, 861, 862, 864, + 867, 868, 869, 870, 872, 873, 874, 875, + 876, 877, 878, 879, 880, 882, 883, 884, + 885, 886, 887, 888, 889, 890, 891, 892, + 893, 894, 895, 896, 897, 898, 899, 900, + 901, 902, 903, 905, 907, 908, 909, 911, + 912, 917, 924, 925, 21827, 25775, 25866, 25896, + 25929, 25932, 25933, 25934, 25936, 25938, 25939, 25940, + 25942, 25943, 25944, 25945, 25946, 25947, 25948, 25952, + 25953, 25955, 25956, 25959, 25961, 25964, 25966, 25984, + 25994, 25998, 26012, 26016, 26110, 26116, }; static const int mbfl_gb_uni_max = sizeof(mbfl_gb_uni_ofst)/sizeof(unsigned short); diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis.h b/ext/mbstring/libmbfl/filters/unicode_table_jis.h index 9132d4b33c..3236578f9b 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_jis.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_jis.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -2314,7 +2314,7 @@ const unsigned short ucs_a1_jis_table[] = { 0xABB2,0xABB1,0xABB4,0xABB3,0xABC0,0xABBF,0xABC2,0xABC1, 0xA9C3,0xABD0,0xABD2,0xABD1,0xABD4,0xABD8,0xABD3,0x2160, 0xA9CC,0xABE3,0xABE2,0xABE5,0xABE4,0xABF2,0xA9D0,0xABF3, - + /* 0100h */ 0xAAA7,0xABA7,0xAAA5,0xABA5,0xAAA8,0xABA8,0xAAAB,0xABAB, 0xAAAC,0xABAC,0xAAAF,0xABAF,0xAAAD,0xABAD,0xAAB0,0xABB0, @@ -2348,7 +2348,7 @@ const unsigned short ucs_a1_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0xABB9,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 0200h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2382,7 +2382,7 @@ const unsigned short ucs_a1_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 0300h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2416,7 +2416,7 @@ const unsigned short ucs_a1_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 0400h */ 0x0000,0x2727,0xA7C2,0xA7C3,0xA7C4,0xA7C5,0xA7C6,0xA7C7, 0xA7C8,0xA7C9,0xA7CA,0xA7CB,0xA7CC,0x0000,0xA7CD,0xA7CE, @@ -2469,7 +2469,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2100h */ 0x0000,0x0000,0x0000,0x216E,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2503,7 +2503,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2200h */ 0x224F,0x0000,0x225F,0x2250,0x0000,0x0000,0x0000,0x2260, 0x223A,0x0000,0x0000,0x223B,0x0000,0x0000,0x0000,0x0000, @@ -2537,7 +2537,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2300h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2571,7 +2571,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2400h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2605,7 +2605,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2500h */ 0x2821,0x282C,0x2822,0x282D,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x2823,0x0000,0x0000,0x282E, @@ -2639,7 +2639,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x227E, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2600h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x217A,0x2179,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2673,7 +2673,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2700h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2707,7 +2707,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2800h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2741,7 +2741,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2900h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2775,7 +2775,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2A00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2809,7 +2809,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2B00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2843,7 +2843,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2C00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2877,7 +2877,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2D00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2911,7 +2911,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2E00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2945,7 +2945,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 2F00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -2979,7 +2979,7 @@ const unsigned short ucs_a2_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 3000h */ 0x2121,0x2122,0x2123,0x2137,0x0000,0x2139,0x213A,0x213B, 0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159, @@ -3052,7 +3052,7 @@ const unsigned short ucs_i_jis_table[] = { 0xB0CA,0x0000,0x0000,0x0000,0x0000,0x5041,0x323E,0xB0CB, 0x3644,0xB0CC,0x4367,0xB0CD,0x0000,0xB0CE,0x376F,0x5043, 0x0000,0x0000,0x0000,0x4724,0x0000,0xB0CF,0xB0D0,0xB0D1, - + /* 4F00h */ 0xB0D2,0x346B,0xB0D3,0xB0D4,0x0000,0x0000,0x0000,0x0000, 0xB0D5,0x5044,0x304B,0xB0D6,0xB0D7,0x3860,0x346C,0x497A, @@ -3086,7 +3086,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x3D24,0x506D, 0xB1C4,0x0000,0xB1C5,0x4750,0x0000,0x4936,0x5068,0x0000, 0x4A70,0x0000,0x3236,0x0000,0xB1C6,0xB1C7,0x506C,0xB1C8, - + /* 5000h */ 0xB1C9,0xB1CA,0x0000,0x0000,0xB1CB,0x5066,0x506F,0xB1CC, 0x0000,0x4152,0xB1CD,0x3844,0xB1CE,0x475C,0xB1CF,0x6047, @@ -3120,7 +3120,7 @@ const unsigned short ucs_i_jis_table[] = { 0xB2C2,0xB2C3,0x0000,0x0000,0x0000,0x5128,0x512A,0xB2C4, 0x0000,0xB2C5,0xB2D1,0x0000,0x0000,0x512C,0xB2C6,0x0000, 0x0000,0x512B,0xB2C7,0x4A48,0x0000,0x0000,0xB2C8,0x0000, - + /* 5100h */ 0x3537,0x512E,0x512F,0xB2C9,0x322F,0x0000,0xB2CA,0xB2CB, 0xB2CC,0x512D,0x0000,0xB2CD,0xB2CE,0xB2CF,0xB2D0,0x0000, @@ -3154,7 +3154,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x515E,0x4664,0x0000,0x0000,0x515F,0xB3AB,0x0000, 0x5160,0x332E,0xB3AC,0xB3AD,0xB3AE,0x5161,0x3627,0xB3AF, 0x464C,0x317A,0x3D50,0x0000,0x0000,0x4821,0x5162,0x0000, - + /* 5200h */ 0x4561,0xB3B0,0xB3B1,0x3F4F,0x5163,0xB3B2,0x4A2C,0x405A, 0x3422,0x0000,0x3429,0x5164,0x0000,0x0000,0x5166,0x0000, @@ -3188,7 +3188,7 @@ const unsigned short ucs_i_jis_table[] = { 0xB3F2,0xB3F3,0xB3F4,0x0000,0xB3F5,0x0000,0x0000,0x0000, 0xB3F6,0xB3F7,0x372E,0x522E,0xB3F8,0x522F,0xB3F9,0xB3FA, 0x5230,0x5231,0x3C5B,0x0000,0x0000,0x0000,0x387B,0x4C5E, - + /* 5300h */ 0xB3FB,0x4C68,0x4677,0xB3FC,0x0000,0x4A71,0x5232,0x0000, 0x5233,0x0000,0xB3FD,0xB3FE,0xB4A1,0x5235,0x0000,0x5237, @@ -3222,7 +3222,7 @@ const unsigned short ucs_i_jis_table[] = { 0x525B,0x4321,0x427E,0x362B,0x3E24,0x525C,0x525A,0x3244, 0x4266,0x3C38,0x3B4B,0x3126,0x0000,0xB4E3,0x3370,0x3966, 0x3B4A,0x0000,0x525D,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 5400h */ 0x0000,0x525E,0xB4E4,0x3549,0x3346,0x0000,0x0000,0x0000, 0x3967,0x3548,0x445F,0x3125,0x4631,0x4C3E,0x3921,0x4D79, @@ -3256,7 +3256,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3E25,0x4B69,0xB5BE,0x0000,0xB5BF,0x532D,0x532C,0xB5C0, 0x0000,0x0000,0x452F,0x0000,0x0000,0x0000,0xB5C1,0x0000, 0x0000,0x0000,0x532E,0x0000,0xB5C2,0x532B,0xB5C3,0xB5C4, - + /* 5500h */ 0xB5C5,0xB5C6,0x0000,0x0000,0x3134,0xB5C7,0x3A36,0x3F30, 0xB5C8,0xB5C9,0x0000,0x0000,0xB5CA,0xB5CB,0xB5CC,0x5329, @@ -3290,7 +3290,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xB6A7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xB6A8,0x5353, 0x0000,0x5358,0x0000,0x0000,0x0000,0x5356,0x5355,0xB6A9, - + /* 5600h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xB6AA,0x4332,0x0000, 0xB6AB,0x3245,0xB6AC,0x0000,0x0000,0xB6AD,0xB6AE,0xB6AF, @@ -3324,7 +3324,7 @@ const unsigned short ucs_i_jis_table[] = { 0xB6FB,0x0000,0x0000,0xB6FD,0x0000,0xB6FE,0x5379,0x0000, 0x3A24,0xB6FC,0x304F,0x3F5E,0x0000,0x0000,0xB7A1,0xB7A2, 0x0000,0x537A,0x3847,0x0000,0x0000,0x3971,0x0000,0x537C, - + /* 5700h */ 0x537B,0xB7A3,0xB7A4,0x4A60,0x537D,0x0000,0x0000,0xB7A5, 0x5421,0x537E,0xB7A6,0x5422,0xB7A7,0x5423,0x0000,0x3777, @@ -3358,7 +3358,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xB7F1,0x0000,0x0000,0x0000,0xB7F2,0x0000,0x0000, 0xB7F3,0x0000,0x0000,0x0000,0x3E7D,0xB7F4,0xB7F5,0x3C39, 0xB7F6,0x475D,0x3470,0x0000,0x3A6B,0xB7F7,0xB7F8,0xB7F9, - + /* 5800h */ 0x4B59,0x0000,0x4632,0xB7FA,0xB7FB,0x3778,0x424F,0x0000, 0xB7FC,0xB7FD,0x5441,0x5444,0xB8A1,0xB8A2,0x0000,0x0000, @@ -3392,7 +3392,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xB8DD,0x0000,0x3B4E,0x3F51,0x0000,0x4154,0x5463, 0x403C,0x306D,0x4764,0xB8DE,0x0000,0x0000,0x0000,0x445B, 0x0000,0x5465,0x5464,0x5466,0x5467,0x5468,0x0000,0x0000, - + /* 5900h */ 0x0000,0x0000,0x5469,0x0000,0x0000,0xB8DF,0xB8E0,0x0000, 0x0000,0x4A51,0x546A,0xB8E1,0xB8E2,0x0000,0x0000,0x3246, @@ -3426,7 +3426,7 @@ const unsigned short ucs_i_jis_table[] = { 0x5529,0x0000,0x4C45,0x4931,0x0000,0x0000,0xB9C6,0xB9C7, 0x0000,0xB9C8,0xB9C9,0x0000,0xB9CA,0x0000,0x3028,0xB9CB, 0x0000,0x0000,0x0000,0x3079,0x0000,0x0000,0x0000,0x3B51, - + /* 5A00h */ 0xB9CC,0x3052,0x0000,0x3023,0xB9CD,0x0000,0x0000,0x0000, 0x0000,0x5532,0x0000,0x0000,0xB9CE,0xB9CF,0xB9D0,0x0000, @@ -3460,7 +3460,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x5544,0xBAA9,0x0000,0x0000,0x0000,0xBAAA,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0xBAAB,0xBAAC,0x0000, 0x0000,0x0000,0x5546,0x5547,0x0000,0xBAAD,0x0000,0x0000, - + /* 5B00h */ 0xBAAE,0xBAAF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0xBAB0,0x3472,0x0000,0x5549,0x5548,0x0000,0x0000,0x0000, @@ -3494,7 +3494,7 @@ const unsigned short ucs_i_jis_table[] = { 0x5C4D,0x3F33,0x0000,0x556D,0x0000,0x0000,0x4E40,0xBAE5, 0x556E,0xBAE6,0x0000,0x5570,0xBAE7,0x437E,0x556F,0x0000, 0x4023,0x0000,0x3B7B,0x0000,0x0000,0xBAE8,0x4250,0x3C77, - + /* 5C00h */ 0x0000,0x4975,0x406C,0x0000,0x3C4D,0x5571,0x3E2D,0x5572, 0x5573,0x3053,0x423A,0x3F52,0xBAE9,0x5574,0x4633,0x3E2E, @@ -3528,7 +3528,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3265,0x5636,0x563B,0x0000,0x0000,0x5639,0xBBBE,0x4A77, 0x4A76,0xBBBF,0xBBC0,0x0000,0xBBC1,0x0000,0x4567,0x0000, 0x0000,0x0000,0x5638,0x3D54,0x0000,0x5637,0x0000,0x0000, - + /* 5D00h */ 0x0000,0xBBC2,0x0000,0x0000,0x0000,0x0000,0xBBC3,0x3F72, 0x0000,0x0000,0x0000,0x563C,0x0000,0xBBC4,0x3A6A,0x0000, @@ -3562,7 +3562,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3570,0xBCA1,0x0000,0x5660,0x0000,0x0000,0x3A39,0x0000, 0x0000,0x384A,0x5661,0x4C26,0x4743,0x5662,0x0000,0x392B, 0xBCA2,0xBCA3,0x0000,0x342C,0x0000,0x4327,0x3652,0x0000, - + /* 5E00h */ 0xBCA4,0x0000,0x3B54,0x495B,0x0000,0x0000,0x4841,0xBCA5, 0x0000,0x0000,0x0000,0x5663,0x3475,0xBCA6,0x0000,0x0000, @@ -3596,7 +3596,7 @@ const unsigned short ucs_i_jis_table[] = { 0x5728,0x5729,0x0000,0xBCDB,0x572A,0x0000,0x0000,0x0000, 0x572D,0x572B,0x0000,0x572C,0x572E,0x0000,0x3164,0x446E, 0x572F,0x0000,0x377A,0x3276,0x4736,0x0000,0x5730,0x467B, - + /* 5F00h */ 0x0000,0x4A5B,0xBCDC,0x5731,0x4F2E,0x0000,0xBCDD,0xBCDE, 0xBCDF,0x5732,0x4A40,0x5735,0x5021,0x5031,0xBCE0,0x3C30, @@ -3630,7 +3630,7 @@ const unsigned short ucs_i_jis_table[] = { 0xBDC5,0xBDC6,0xBDC7,0x3277,0xBDC8,0xBDC9,0xBDCA,0xBDCB, 0x582D,0x575A,0xBDCC,0xBDCD,0x0000,0x4730,0xBDCE,0x0000, 0x5759,0x0000,0xBDCF,0x5757,0xBDD0,0x397A,0x0000,0x575D, - + /* 6000h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xBDD1, 0x0000,0x0000,0xBDD2,0x0000,0x0000,0xBDD3,0x5763,0x5769, @@ -3664,7 +3664,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3B34,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x4246,0x583D,0xBEB3,0x415B,0x5838,0xBEB4,0x5835,0x5836, 0xBEB5,0x3C66,0x5839,0x583C,0xBEB6,0xBEB7,0x0000,0x0000, - + /* 6100h */ 0x5837,0x3D25,0xBEB8,0x583A,0x0000,0x0000,0x5834,0xBEB9, 0x4C7C,0x4C7B,0xBEBA,0x0000,0xBEBB,0x583E,0x583F,0x3055, @@ -3698,7 +3698,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xBEFD,0x0000,0x0000,0xBFA1,0xBFA2,0x0000,0xBFA3, 0x0000,0x0000,0x4428,0x0000,0x5873,0x0000,0x5871,0x5867, 0x377C,0x0000,0x5872,0x0000,0x5876,0x5875,0x5877,0x5874, - + /* 6200h */ 0x5878,0xBFA4,0x0000,0xBFA5,0xBFA6,0x0000,0x0000,0xBFA7, 0x5879,0x587A,0x4A6A,0x0000,0x587C,0x587B,0x3D3F,0x0000, @@ -3732,7 +3732,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0xBFD6,0x0000,0x3367,0x3F21,0x5949,0x594E, 0x0000,0x594A,0xBFD7,0x377D,0xBFD8,0x594F,0x3B22,0x3969, 0x0000,0x0000,0x0000,0x0000,0xBFD9,0xBFDA,0x3D26,0x593D, - + /* 6300h */ 0x0000,0x3B7D,0x594C,0xBFDB,0xBFDC,0x0000,0x0000,0x3B58, 0x594D,0x3044,0xBFDD,0xBFDE,0x5948,0xBFDF,0x0000,0x0000, @@ -3766,7 +3766,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x5962,0xC0C0,0x0000,0xC0C1,0x0000,0x3478,0x0000, 0x0000,0x0000,0xC0C2,0xC0C3,0x3167,0xC0C4,0x5968,0x0000, 0xC0C5,0xC0C6,0x4D49,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 6400h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x596C,0x0000, 0x0000,0xC0C7,0xC0C8,0x0000,0x0000,0x423B,0x0000,0x5973, @@ -3800,7 +3800,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xC1AD,0xC1AE,0x0000,0x353C,0xC1AF,0x0000,0x5A2F, 0xC1B0,0x5A28,0x5A33,0x0000,0x5A32,0xC1B1,0x5A31,0xC1B2, 0x0000,0x0000,0x5A34,0xC1B3,0x0000,0x5A36,0x3E71,0xC1B4, - + /* 6500h */ 0x5A35,0xC1B5,0x0000,0x0000,0xC1B6,0x5A39,0x0000,0x0000, 0xC1B7,0xC1B8,0xC1B9,0x0000,0x0000,0x0000,0x0000,0xC1BA, @@ -3834,7 +3834,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3B5D,0x4161,0x0000,0x0000,0x3D5C,0x3030,0x0000,0x0000, 0xC1EE,0x5A5D,0xC1EF,0x0000,0xC1F0,0xC1F1,0x0000,0x0000, 0x0000,0xC1F2,0x3222,0x5A61,0x0000,0x0000,0xC1F3,0xC1F4, - + /* 6600h */ 0xC1F5,0x0000,0x3937,0x5A60,0xC1F6,0x0000,0x3A2B,0x3E3A, 0xC1F7,0xC1F8,0x5A5F,0x0000,0x3E3B,0xC1F9,0x4C40,0x3A2A, @@ -3868,7 +3868,7 @@ const unsigned short ucs_i_jis_table[] = { 0xC2E9,0x5B28,0x0000,0xC2EA,0xC2EB,0x0000,0xC2EC,0x0000, 0x5B29,0x0000,0x364A,0x3148,0x3939,0x5B2A,0x0000,0x5B2B, 0x3D71,0x4162,0xC2ED,0xC2BF,0x5258,0x413E,0x413D,0x4258, - + /* 6700h */ 0x3A47,0x0000,0x0000,0x5072,0x0000,0xC2EE,0x0000,0xC2EF, 0x376E,0x4D2D,0x0000,0x4A7E,0x0000,0x497E,0xC2F0,0x5B2C, @@ -3902,7 +3902,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x5B4D,0x0000,0x0000,0x5B4B,0x0000,0x5B53,0x5B49, 0xC3C5,0x436C,0xC3C6,0x4C78,0x3C46,0x3A74,0xC3C7,0xC3C8, 0x0000,0xC3B8,0x0000,0x3A3A,0x0000,0x0000,0x4B6F,0x3341, - + /* 6800h */ 0x0000,0x0000,0x444E,0x464A,0x3149,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -3936,7 +3936,7 @@ const unsigned short ucs_i_jis_table[] = { 0xC4A9,0x0000,0xC4AA,0xC4AB,0xC4AC,0xC4AD,0x3F39,0x5C2C, 0xC4AE,0xC4AF,0x4033,0x0000,0x0000,0xC4B0,0xC4B1,0x0000, 0x0000,0x5C2A,0x343D,0xC4B2,0xC4B3,0xC4B4,0x0000,0x0000, - + /* 6900h */ 0x4F50,0x5B76,0x0000,0x0000,0x5C26,0x3058,0xC4B5,0x0000, 0x5B78,0xC4B6,0xC4B7,0x4C3A,0x5B7D,0x3F22,0x4447,0x5B73, @@ -3970,7 +3970,7 @@ const unsigned short ucs_i_jis_table[] = { 0x5C5A,0x0000,0x0000,0x5C67,0x0000,0x5C65,0xC4EC,0xC4ED, 0x0000,0xC4EE,0x5C60,0xC4EF,0x0000,0xC4F0,0x0000,0x0000, 0x0000,0x5C5F,0x0000,0x4450,0x0000,0x4165,0xC4F1,0x5C5D, - + /* 6A00h */ 0xC4F2,0xC4F3,0x5C5B,0xC4F4,0x0000,0x5C62,0x0000,0x0000, 0x0000,0x0000,0x5C68,0x4875,0x5C6E,0x0000,0x0000,0xC4F5, @@ -4004,7 +4004,7 @@ const unsigned short ucs_i_jis_table[] = { 0x4827,0x0000,0x5D2E,0x0000,0xC5D7,0x0000,0x0000,0x0000, 0xC5D8,0xC5D9,0xC5DA,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x5D32,0x5D2F,0xC5DB,0xC5DC,0x0000,0x0000, - + /* 6B00h */ 0x0000,0x0000,0xC5DD,0xC5DE,0x4D73,0x5D30,0xC5DF,0xC5E0, 0x0000,0xC5E1,0x5C5E,0x0000,0x0000,0x0000,0x0000,0xC5E2, @@ -4038,7 +4038,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x5D5D,0x5D5C,0x0000,0xC6BE,0x5D5F, 0x0000,0xC6BF,0x0000,0x5D5E,0x0000,0x0000,0x0000,0xC6C0, 0x0000,0xC6C1,0x0000,0x0000,0x0000,0x0000,0x0000,0xC6C2, - + /* 6C00h */ 0x0000,0x0000,0xC6C3,0x0000,0xC6C4,0xC6C5,0x0000,0x0000, 0x5D61,0xC6C6,0x0000,0x0000,0x0000,0xC6C7,0xC6C8,0x3B61, @@ -4072,7 +4072,7 @@ const unsigned short ucs_i_jis_table[] = { 0x436D,0xC7A5,0x5E25,0xC7A6,0xC7A7,0x0000,0xC7A8,0x5E23, 0x4259,0x5D76,0xC7A9,0x314B,0xC7AA,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 6D00h */ 0x0000,0x0000,0x0000,0x0000,0xC7AB,0x0000,0x0000,0xC7AC, 0x0000,0x0000,0xC7AD,0x4D4E,0x5E30,0x0000,0xC7AE,0xC7AF, @@ -4106,7 +4106,7 @@ const unsigned short ucs_i_jis_table[] = { 0x5E46,0xC7E1,0x5E4D,0x307C,0x5E43,0x0000,0x5E4E,0xC7E2, 0xC7E3,0x3F3C,0x0000,0x3D5F,0xC7E4,0x4A25,0xC7E5,0x3A2E, 0x0000,0x5E3B,0x5E49,0x453A,0xC7E6,0x0000,0x0000,0x0000, - + /* 6E00h */ 0xC7E7,0x0000,0x0000,0x0000,0xC7E8,0x4036,0x0000,0x3369, 0x3A51,0x3E44,0x5E3D,0x3D42,0x0000,0x0000,0x0000,0x0000, @@ -4140,7 +4140,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0xC8BB,0x5E76,0xC8BC,0xC8BD,0x5E7C, 0x0000,0x0000,0x5E7A,0x0000,0x4529,0x0000,0x0000,0x5F23, 0x5E77,0xC8BE,0x0000,0xC8BF,0x0000,0xC8C0,0x5E78,0x5E60, - + /* 6F00h */ 0x0000,0x3579,0x493A,0x0000,0xC8C1,0x0000,0x3C3F,0x0000, 0xC8C2,0x3977,0xC8C3,0x0000,0xC8C4,0xC8C5,0x0000,0x4F33, @@ -4174,7 +4174,7 @@ const unsigned short ucs_i_jis_table[] = { 0xC9A3,0xC9A4,0x0000,0x4D74,0x5F3D,0x0000,0x5F41,0x4275, 0xC9A5,0x5F40,0x0000,0x5F2B,0x0000,0xC9A6,0x6F69,0x0000, 0x0000,0xC9A7,0x5F45,0x0000,0xC9A8,0xC9A9,0x5F49,0x0000, - + /* 7000h */ 0xC9AA,0x5F47,0x0000,0x0000,0x0000,0xC9AB,0xC9AC,0xC9AD, 0x0000,0x5F43,0x0000,0x5F44,0x0000,0xC9AE,0x0000,0x5F48, @@ -4208,7 +4208,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x5F58,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x4B23,0xC9E1,0x0000,0x0000,0x5F62,0x0000,0x0000, - + /* 7100h */ 0x0000,0x0000,0x0000,0xC9E2,0xC9E3,0xC9E4,0xC9E5,0xC9E6, 0x0000,0x5F61,0x0000,0xC9E7,0xC9E8,0x0000,0x0000,0xC9E9, @@ -4242,7 +4242,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x5F7B,0x3F24,0x5259,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x5F7D,0x0000,0x0000, 0xCABC,0x6021,0x0000,0x5F6E,0x5F7E,0x0000,0xCABD,0x6022, - + /* 7200h */ 0xCABE,0x0000,0x0000,0x0000,0x0000,0x0000,0x477A,0xCABF, 0xCAC0,0xCAC1,0x0000,0x0000,0x0000,0x6023,0x0000,0x0000, @@ -4276,7 +4276,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x3C6D,0x0000,0x0000,0x4648,0x3639,0x0000,0x0000, 0x0000,0x0000,0x0000,0xCAFB,0xCAFC,0x0000,0x0000,0x6046, 0x432C,0x6045,0xCAFD,0xCAFE,0x4F35,0x4762,0xCBA1,0x0000, - + /* 7300h */ 0x0000,0x0000,0xCBA2,0x0000,0xCBA3,0xCBA4,0x0000,0xCBA5, 0x0000,0x0000,0x6049,0xCBA6,0x0000,0xCBA7,0x0000,0x0000, @@ -4310,7 +4310,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xCBF7,0x373E,0x0000,0x0000,0x4849,0x6063,0x0000, 0x0000,0x607E,0x0000,0x0000,0xCBF8,0xCBF9,0x0000,0xCBFA, 0x6069,0xCBFB,0xCBFC,0xCBFD,0x0000,0xCBFE,0x383D,0xCCA1, - + /* 7400h */ 0xCCA2,0xCCA3,0x0000,0x3565,0xCCA4,0x6066,0x4D7D,0xCCA5, 0x0000,0x4E30,0xCCA6,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -4344,7 +4344,7 @@ const unsigned short ucs_i_jis_table[] = { 0xCCF5,0x6124,0xCCF6,0xCCF7,0x0000,0x0000,0x6125,0xCCF8, 0x6127,0x6128,0x6126,0x0000,0xCCF9,0x0000,0x4953,0x612A, 0x6129,0x0000,0xCCFA,0xCCFB,0xCCFC,0x0000,0x0000,0xCCFD, - + /* 7500h */ 0x0000,0x0000,0x0000,0x612C,0x612B,0x612D,0xCCFE,0x0000, 0x0000,0x0000,0x0000,0x0000,0x612E,0x6130,0x612F,0x0000, @@ -4378,7 +4378,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x4169,0x0000,0x0000,0xCDDE,0x0000,0xCDDF,0xCDE0, 0x6162,0xCDE1,0x6164,0x6165,0x4354,0x0000,0x0000,0x0000, 0x0000,0xCDE2,0x6163,0x0000,0x6160,0x0000,0x615E,0x615F, - + /* 7600h */ 0xCDE3,0x6161,0xCDE4,0xCDE5,0xCDE6,0x0000,0x0000,0xCDE7, 0xCDE8,0x6168,0xCDE9,0x6166,0xCDEA,0x6167,0x0000,0xCDEB, @@ -4412,7 +4412,7 @@ const unsigned short ucs_i_jis_table[] = { 0xCED3,0x0000,0x623B,0x0000,0xCED4,0x0000,0x4C5C,0x0000, 0xCED5,0xCED6,0x4C55,0x0000,0x443E,0x0000,0xCED7,0x0000, 0x416A,0xCED8,0x0000,0x623D,0xCED9,0x0000,0x3D62,0x0000, - + /* 7700h */ 0xCEDA,0x3E4A,0x0000,0x0000,0x6240,0x0000,0xCEDB,0x623F, 0x623E,0x487D,0xCEDC,0x3447,0x3829,0x0000,0xCEDD,0x0000, @@ -4446,7 +4446,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x366B,0xCFC7,0x0000,0xCFC8,0x433B,0x6264,0x363A, 0xCFC9,0xCFCA,0x0000,0x4050,0xCFCB,0x0000,0x0000,0x0000, 0xCFCC,0x0000,0x0000,0xCFCD,0x6265,0x0000,0x0000,0x0000, - + /* 7800h */ 0x0000,0x0000,0x3A3D,0x0000,0x0000,0xCFCE,0xCFCF,0x0000, 0x0000,0xCFD0,0x0000,0x0000,0x6266,0xCFD1,0xCFD2,0x0000, @@ -4480,7 +4480,7 @@ const unsigned short ucs_i_jis_table[] = { 0x4B61,0x0000,0xD0B3,0x0000,0x627E,0x0000,0x0000,0x306B, 0x0000,0x0000,0xD0B4,0xD0B5,0x6324,0x0000,0xD0B7,0xD0B8, 0x0000,0x0000,0xD0B9,0xD0BA,0x0000,0x6323,0x0000,0xD0BB, - + /* 7900h */ 0xD0B6,0x3E4C,0x0000,0x0000,0x0000,0x0000,0xD0BC,0x6325, 0x0000,0x0000,0x0000,0x0000,0xD0BD,0x0000,0x4143,0x0000, @@ -4514,7 +4514,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x4361,0xD1A4,0xD1A5,0x6340,0xD1A6,0x0000,0x0000, 0x3E4E,0xD1A7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0xD1A8,0x0000,0x0000,0x305C,0xD1A9,0x0000,0x0000,0x0000, - + /* 7A00h */ 0x3529,0x0000,0xD1AA,0xD1AB,0x0000,0x0000,0x0000,0xD1AC, 0x6343,0xD1AD,0xD1AE,0x4478,0xD1AF,0x6344,0x4047,0x0000, @@ -4548,7 +4548,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD1EA,0xD1EB,0x4328,0xD1EC,0xD1ED,0x6371,0x0000,0x433C, 0x6372,0xD1EE,0x0000,0x0000,0xD1EF,0x0000,0x3625,0x0000, 0x513F,0x435D,0x3C33,0xD1F0,0x0000,0xD1F1,0xD1F2,0x3448, - + /* 7B00h */ 0x0000,0x0000,0x6373,0x0000,0x6422,0x0000,0x6376,0xD1F3, 0x3568,0x0000,0x6375,0x6424,0x0000,0x0000,0x0000,0x6374, @@ -4582,7 +4582,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD2D2,0x6441,0xD2D3,0x0000,0x0000,0x4F36,0x0000,0x0000, 0x0000,0x0000,0xD2D4,0x644A,0xD2D5,0xD2D6,0x644E,0x644B, 0xD2D7,0xD2D8,0xD2D9,0x0000,0xD2DA,0x0000,0xD2DB,0x0000, - + /* 7C00h */ 0x6447,0xD2DC,0xD2DD,0xD2DE,0xD2DF,0x0000,0xD2E0,0x6448, 0x0000,0xD2E1,0x0000,0xD2E2,0xD2E3,0x644D,0xD2E4,0xD2E5, @@ -4616,7 +4616,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xD3C8,0x0000,0xD3C9,0x0000,0x0000,0x0000,0x6479, 0x0000,0x0000,0x647A,0x0000,0x647B,0xD3CA,0x647C,0x0000, 0x3B65,0x0000,0x647D,0x374F,0x0000,0x0000,0x356A,0x0000, - + /* 7D00h */ 0x352A,0x0000,0x6521,0xD3CB,0x4C73,0x3948,0x647E,0xD3CC, 0xD3CD,0xD3CE,0x6524,0x4C66,0x0000,0x473C,0x0000,0xD3CF, @@ -4650,7 +4650,7 @@ const unsigned short ucs_i_jis_table[] = { 0x4A54,0x344B,0xD4B7,0xD4B8,0x4C4B,0xD4B9,0x0000,0x305E, 0x0000,0xD4BA,0x654D,0x0000,0x4E7D,0xD4BB,0xD4BC,0x0000, 0x0000,0xD4BD,0xD4BE,0x654C,0x0000,0x0000,0x0000,0x0000, - + /* 7E00h */ 0xD4B3,0x316F,0x0000,0x0000,0x466C,0x654F,0x0000,0x0000, 0xD4BF,0x6556,0x6550,0x6557,0x0000,0x0000,0x0000,0x0000, @@ -4684,7 +4684,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 7F00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -4718,7 +4718,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD5BF,0x6649,0x0000,0x3465,0xD5C0,0x0000,0xD5C1,0xD5C2, 0x344D,0x0000,0xD5C3,0x664A,0x0000,0x0000,0x0000,0x0000, 0x0000,0x664B,0xD5C4,0x4B5D,0x4D63,0xD5C5,0xD5C6,0xD5C7, - + /* 8000h */ 0x4D54,0x4F37,0x0000,0x394D,0x664E,0x3C54,0x664D,0xD5C8, 0xD5C9,0x0000,0xD5CA,0x664F,0x3C29,0xD5CB,0xD5CC,0xD5CD, @@ -4752,7 +4752,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0xD5FD,0xD5FE,0x6678, 0xD6A1,0x6679,0xD6A2,0xD6A3,0x4639,0x0000,0xD6A4,0x0000, 0x363B,0xD6A5,0xD6A6,0x0000,0x6726,0x473D,0xD6A7,0x0000, - + /* 8100h */ 0x0000,0x0000,0x3B69,0xD6A8,0x0000,0x363C,0x4048,0x4F46, 0x4C2E,0x6677,0x4054,0xD6A9,0x0000,0x0000,0x0000,0x0000, @@ -4786,7 +4786,7 @@ const unsigned short ucs_i_jis_table[] = { 0x4E57,0x0000,0x3C2B,0xD6E2,0xD6E3,0x3D2D,0x0000,0x0000, 0xD6E4,0xD6E5,0xD6E6,0x3B6A,0x4357,0xD6E7,0xD6E8,0x0000, 0xD6E9,0xD6EA,0x674A,0x674B,0x3131,0xD6EB,0x674C,0xD6EC, - + /* 8200h */ 0xD6ED,0x674D,0x674E,0xD6EE,0x0000,0x674F,0x0000,0x6750, 0x363D,0x5A2A,0x6751,0x0000,0x4065,0x6752,0x3C4B,0xD6EF, @@ -4820,7 +4820,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD7D5,0x0000,0xD7D6,0x4651,0x0000,0xD7D7,0x0000,0xD7D8, 0x0000,0x3151,0x0000,0x6774,0x6773,0x0000,0xD7D9,0xD7DA, 0x0000,0x6779,0x6775,0x6778,0x0000,0xD7DB,0xD7DC,0x0000, - + /* 8300h */ 0xD7DD,0xD7DE,0x4C50,0x6777,0x3258,0x337D,0x677B,0xD7DF, 0xD7E0,0x677D,0xD7E1,0xD7E2,0x0000,0x0000,0x3754,0x0000, @@ -4854,7 +4854,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD8BF,0x4A6E,0xD8C0,0x6841,0x0000,0x0000,0x0000,0x325A, 0x3856,0x4929,0x684B,0x0000,0x683F,0x0000,0xD8C1,0x6848, 0xD8C2,0xD8C3,0x0000,0x6852,0xD8C4,0x6843,0x0000,0x0000, - + /* 8400h */ 0x0000,0xD8C5,0x0000,0x6844,0x463A,0x0000,0xD8C6,0x6849, 0x0000,0x0000,0xD8C7,0x6846,0x4B28,0x684C,0x3060,0xD8C8, @@ -4888,7 +4888,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0xD9A3,0x0000,0x4B29,0x0000,0x4F21,0xD9A4, 0xD9A5,0xD9A6,0xD9A7,0x0000,0x6873,0x0000,0x0000,0xD9A8, 0x0000,0x0000,0xD9AA,0xD9AB,0x687A,0xD9AC,0x0000,0x6872, - + /* 8500h */ 0x3C43,0x0000,0xD9AD,0xD9AE,0x0000,0x0000,0x6851,0xD9AF, 0x0000,0x0000,0x0000,0x0000,0xD9B0,0x0000,0xD9B1,0x0000, @@ -4922,7 +4922,7 @@ const unsigned short ucs_i_jis_table[] = { 0xD9FA,0x484D,0x692E,0x0000,0x0000,0xD9FB,0x0000,0x0000, 0x0000,0x0000,0x0000,0xD9FC,0x0000,0x0000,0xD9FD,0x3D73, 0x0000,0x693D,0x6942,0x4174,0xD9FE,0x0000,0x6941,0xDAA1, - + /* 8600h */ 0xDAA2,0x0000,0x6922,0x0000,0xDAA3,0xDAA4,0x6943,0x4149, 0x0000,0x0000,0x693E,0x6940,0x0000,0xDAA5,0xDAA6,0x0000, @@ -4956,7 +4956,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x695E,0x0000,0x0000,0x695F,0x4948,0x485A,0x6962, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x427D,0x696C,0xDAEE,0x6968,0xDAEF,0xDAF0,0x326B,0x0000, - + /* 8700h */ 0x6966,0x0000,0x4B2A,0x6967,0xDAF1,0xDAF2,0x6964,0xDAF3, 0x6965,0x696A,0x696D,0xDAF4,0x0000,0x696B,0xDAF5,0xDAF6, @@ -4990,7 +4990,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0xDBE0,0xDBE1,0x0000,0xDBE2,0x0000,0x6A34, 0x0000,0xDBE3,0x6A35,0xDBE4,0x0000,0x0000,0x6A3A,0x6A3B, 0xDBE5,0x332A,0xDBE6,0x3542,0x0000,0x0000,0x6A39,0xDBE7, - + /* 8800h */ 0x0000,0xDBE8,0x0000,0xDBE9,0x0000,0x6A24,0xDBEA,0x0000, 0x0000,0xDBEB,0xDBEC,0xDBED,0x0000,0x6A38,0x6A3C,0x6A37, @@ -5024,7 +5024,7 @@ const unsigned short ucs_i_jis_table[] = { 0x6A6B,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xDCD0, 0xDCD1,0xDCD2,0x6A6C,0x3E58,0x6A6A,0xDCD3,0x0000,0xDCD4, 0x4D67,0x6A67,0x0000,0x0000,0x6A69,0x403D,0x3F7E,0x0000, - + /* 8900h */ 0x0000,0xDCD5,0x6A68,0x0000,0x6A6D,0x0000,0xDCD6,0x4A23, 0x0000,0x0000,0x6A6F,0x0000,0x6A6E,0xDCD7,0xDCD8,0xDCD9, @@ -5058,7 +5058,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xDDBA,0x0000,0xDDBB,0x0000,0xDDBC,0x0000,0x0000, 0x0000,0xDDBD,0x0000,0xDDBE,0x6B3C,0x0000,0xDDBF,0x0000, 0x6B3D,0xDDC0,0x0000,0x0000,0x0000,0xDDC1,0x0000,0xDDC2, - + /* 8A00h */ 0x3840,0x0000,0x447B,0x6B3E,0xDDC3,0xDDC4,0x0000,0xDDC5, 0x3757,0x0000,0x3F56,0x0000,0x6B41,0x0000,0x4624,0xDDC6, @@ -5092,7 +5092,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x6B5D,0xDEB1,0x4D21,0x3B70,0x0000, 0xDEB2,0x6B61,0x0000,0x6B5E,0xDEB3,0xDEB4,0xDEB5,0x6B65, 0x3D74,0x0000,0x3841,0x0000,0xDEB6,0x0000,0x427A,0xDEB7, - + /* 8B00h */ 0x4B45,0x315A,0x3062,0x0000,0x4625,0xDEB8,0xDEB9,0x6B69, 0x0000,0x0000,0xDEBF,0xDEBA,0x6B68,0x0000,0x4666,0x0000, @@ -5126,7 +5126,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 8C00h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -5160,7 +5160,7 @@ const unsigned short ucs_i_jis_table[] = { 0xDFB6,0x0000,0x3C41,0x0000,0xDFB7,0x4552,0x0000,0xDFB8, 0xDFB9,0x0000,0xDFBA,0x0000,0x0000,0xDFBB,0x0000,0xDFBC, 0xDFBD,0x0000,0x6C51,0x6C52,0x3958,0x6C50,0xDFBE,0xDFBF, - + /* 8D00h */ 0x0000,0xDFC0,0x0000,0xDFC1,0x6C53,0x6C54,0x0000,0x6C56, 0x4223,0xDFC2,0x6C55,0x3466,0x0000,0x6C58,0x0000,0x6C57, @@ -5194,7 +5194,7 @@ const unsigned short ucs_i_jis_table[] = { 0x3859,0x0000,0x6C6E,0x6C6F,0xDFED,0x0000,0x0000,0x4F29, 0xDFEE,0xDFF0,0xDFF1,0x4437,0xDFF2,0x4129,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x6C72,0xDFF3,0x0000,0x6C75, - + /* 8E00h */ 0x0000,0xDFF4,0x0000,0x0000,0xDFF5,0xDFF6,0xDFF7,0x0000, 0x6C73,0x6C74,0x4D59,0xDFF8,0x0000,0x0000,0x0000,0x4627, @@ -5228,7 +5228,7 @@ const unsigned short ucs_i_jis_table[] = { 0xE0DD,0x0000,0x0000,0x6D47,0x0000,0xE0E4,0xE0DE,0x0000, 0xE0DF,0xE0E0,0x0000,0x0000,0x0000,0x0000,0x0000,0xE0E1, 0x3C34,0xE0E2,0xE0E3,0x6D46,0x6D45,0x375A,0x6D48,0x0000, - + /* 8F00h */ 0xE0E5,0x0000,0xE0E6,0x3353,0x0000,0x6D4A,0x0000,0xE0E7, 0xE0E8,0x3A5C,0x6D49,0x0000,0x6D52,0x0000,0x0000,0xE0E9, @@ -5262,7 +5262,7 @@ const unsigned short ucs_i_jis_table[] = { 0xE1C4,0x4676,0x6D6C,0x4777,0x0000,0x4533,0xE1C5,0x6D6D, 0x3D52,0xE1C6,0x0000,0x0000,0x6D6F,0xE1C7,0xE1C8,0x4C42, 0x6D7E,0x6D71,0x6D72,0xE1C9,0x0000,0x4449,0xE1CA,0x0000, - + /* 9000h */ 0x4260,0x4177,0xE1CB,0x4628,0xE1CC,0x6D70,0x3555,0x0000, 0xE1CD,0x0000,0x0000,0x6D79,0xE1CE,0x6D76,0x6E25,0x4629, @@ -5296,7 +5296,7 @@ const unsigned short ucs_i_jis_table[] = { 0x4974,0x0000,0x0000,0xE2AF,0x0000,0x3354,0x0000,0xE2B0, 0xE2B1,0x0000,0x0000,0x0000,0xE2B2,0x4D39,0xE2AE,0x363F, 0x0000,0x0000,0x0000,0x0000,0x0000,0x4554,0xE2B3,0xE2B4, - + /* 9100h */ 0xE2B5,0x0000,0x6E3F,0x0000,0xE2B6,0xE2B7,0xE2B8,0x0000, 0xE2B9,0x0000,0x0000,0x0000,0x0000,0xE2BA,0x0000,0x0000, @@ -5330,7 +5330,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xE3AC,0xE3AD,0x0000,0xE3AE,0xE3AF,0xE3B0,0xE3B1, 0xE3B2,0xE3B3,0x0000,0x0000,0x0000,0x6E60,0x6E61,0xE3B4, 0x0000,0xE3B5,0x0000,0xE3B6,0x6E5F,0xE3B7,0x0000,0x6E63, - + /* 9200h */ 0xE3B8,0xE3B9,0x0000,0x0000,0xE3BA,0xE3BB,0xE3BC,0xE3BD, 0x0000,0xE3BE,0xE3BF,0x0000,0xE3C0,0x465F,0x3343,0x0000, @@ -5364,7 +5364,7 @@ const unsigned short ucs_i_jis_table[] = { 0xE4CC,0x6E7A,0x4A5F,0x0000,0xE4CD,0x3154,0xE4CE,0x0000, 0xE4CF,0x0000,0x4946,0x4372,0x0000,0x0000,0x0000,0x0000, 0x3578,0xE4D0,0x6E7C,0xE4D1,0x395D,0x0000,0x0000,0xE4D2, - + /* 9300h */ 0xE4D3,0x0000,0xE4D4,0x0000,0x0000,0x0000,0x3B2C,0x0000, 0xE4D5,0x0000,0x0000,0x0000,0x0000,0xE4D6,0x0000,0x6E7B, @@ -5398,7 +5398,7 @@ const unsigned short ucs_i_jis_table[] = { 0x6F34,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xE5CF, 0xE5D0,0xE5CE,0xE5D1,0xE5D2,0x0000,0xE5D3,0x0000,0x0000, - + /* 9400h */ 0x0000,0xE5D4,0xE5D5,0x6F3F,0xE5D6,0x0000,0x0000,0x6F40, 0xE5D7,0xE5D8,0x0000,0x0000,0x0000,0xE5D9,0xE5DA,0xE5DB, @@ -5432,7 +5432,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 9500h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -5466,7 +5466,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 9600h */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -5500,7 +5500,7 @@ const unsigned short ucs_i_jis_table[] = { 0x312B,0xE6FA,0x4063,0x3C36,0x0000,0x0000,0x0000,0xE6FB, 0x4A37,0xE6FC,0x3140,0x0000,0x0000,0x0000,0x4E6D,0x4D6B, 0x0000,0x703B,0xE6FD,0x4545,0x0000,0x0000,0x0000,0x0000, - + /* 9700h */ 0x3C7B,0x0000,0xE6FE,0xE7A1,0x703C,0xE7A2,0x703D,0x3F4C, 0x703E,0xE7A3,0x4E6E,0x0000,0x0000,0x7039,0x7040,0x7042, @@ -5534,7 +5534,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x706C,0x4723,0xE7ED, 0x0000,0xE7EE,0x706E,0x323B,0xE7EF,0x7071,0x7070,0xE7F0, 0xE7F1,0x0000,0xE7F2,0x3124,0x0000,0x0000,0x0000,0x3641, - + /* 9800h */ 0x0000,0x4A47,0x443A,0x3A22,0x0000,0x3960,0x3D67,0xE7F3, 0x3F5C,0x0000,0xE7F4,0x0000,0x7073,0xE7F6,0xE7F7,0x7072, @@ -5568,7 +5568,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x712B,0xE8CD,0x712C,0x0000,0x522C,0x5D3B,0x4853, 0x0000,0x0000,0x307B,0xE8CE,0x303B,0x0000,0xE8CF,0x0000, 0x0000,0x0000,0x0000,0x0000,0x3B74,0x4B30,0x3E7E,0x0000, - + /* 9900h */ 0x0000,0x0000,0xE8D0,0x712D,0x0000,0x4C5F,0x0000,0xE8D1, 0xE8D2,0x712E,0x4D5C,0x0000,0x3142,0x0000,0x0000,0x0000, @@ -5602,7 +5602,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x0000,0xE9AE,0xE9AF,0xE9B0,0x714F,0x7150,0x0000, 0xE9B1,0x7151,0x7152,0x0000,0xE9B2,0xE9B3,0x0000,0x0000, 0x7154,0xE9B4,0x0000,0x7153,0x0000,0xE9B5,0xE9B6,0x3D59, - + /* 9A00h */ 0x0000,0x7155,0xE9B7,0xE9B8,0xE9B9,0x7157,0x0000,0x0000, 0x0000,0x0000,0x0000,0xE9BA,0xE9BB,0x0000,0x3533,0x7156, @@ -5636,7 +5636,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xE9F2,0x4831,0x717A,0xE9F3,0x4926,0x717B,0x7179, 0x0000,0x717D,0xE9F4,0xE9F5,0x717C,0xE9F6,0x0000,0x717E, 0x0000,0xE9F7,0xE9F8,0x7221,0x0000,0xE9F9,0x0000,0xE9FA, - + /* 9B00h */ 0xE9FB,0xE9FC,0xE9FD,0xE9FE,0xEAA1,0xEAA2,0x7222,0x0000, 0xEAA3,0xEAA4,0x0000,0xEAA5,0xEAA6,0xEAA7,0xEAA8,0x0000, @@ -5670,7 +5670,7 @@ const unsigned short ucs_i_jis_table[] = { 0x375F,0x0000,0xEAF9,0xEAFA,0x0000,0x0000,0x0000,0xEAFB, 0x7250,0x724F,0x724E,0xEAFC,0x0000,0x3033,0x0000,0xEAFD, 0xEAFE,0xEBA1,0xEBA2,0x0000,0x0000,0xEBA3,0x0000,0xEBA4, - + /* 9C00h */ 0xEBA5,0x0000,0xEBA6,0x0000,0x725A,0x0000,0x7256,0x0000, 0x7257,0x7253,0x7259,0xEBA7,0x7255,0x3362,0x0000,0xEBA8, @@ -5704,7 +5704,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0x4837,0x0000,0x726F,0x726B,0x0000,0x0000,0x0000, 0x726C,0x0000,0xEBDA,0x4B31,0x4C44,0x0000,0x4650,0xEBDB, 0x0000,0xEBDC,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, - + /* 9D00h */ 0x0000,0x0000,0xEBDE,0x7270,0x0000,0x0000,0x7271,0x463E, 0x726E,0x726D,0x0000,0xEBDD,0x0000,0x0000,0x322A,0x0000, @@ -5738,7 +5738,7 @@ const unsigned short ucs_i_jis_table[] = { 0x0000,0xECC6,0x0000,0xECC7,0x0000,0x733D,0xECC8,0x733E, 0xECC9,0x0000,0x4F49,0xECCA,0xECCB,0x0000,0x0000,0x0000, 0x733B,0x426B,0x3A6D,0x0000,0x0000,0x733F,0xECCC,0x0000, - + /* 9E00h */ 0x0000,0x0000,0xECCE,0x0000,0x0000,0x0000,0x0000,0xECCF, 0x0000,0x0000,0xECCD,0x0000,0x0000,0x0000,0xECD0,0x0000, @@ -5772,7 +5772,7 @@ const unsigned short ucs_i_jis_table[] = { 0x735E,0x0000,0x0000,0x0000,0xECF8,0xECF9,0xECFA,0x735F, 0xECFB,0xECFC,0xECFD,0x0000,0x7360,0xECFE,0x7361,0x7362, 0xEDA1,0x7363,0x0000,0x7364,0x7365,0x7366,0x0000,0xEDA2, - + /* 9F00h */ 0x0000,0x0000,0xEDA3,0xEDA4,0x0000,0x0000,0x0000,0x7367, 0x7368,0xEDA5,0x0000,0x0000,0x0000,0x0000,0x4524,0xEDA6, diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h index cb6c445e75..327e2a1278 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -1748,7 +1748,7 @@ static const unsigned short ucs_a1_jisx0213_table[] = { // 0x0000 - 0x045f }; static const int ucs_a1_jisx0213_table_min = 0x0000; -static const int ucs_a1_jisx0213_table_max = 0x0000 + +static const int ucs_a1_jisx0213_table_max = 0x0000 + (sizeof(ucs_a1_jisx0213_table)/sizeof(unsigned short)); static const unsigned short ucs_hk_jisx0213_table[] = { // 0x3000 - 0x30ff @@ -4642,7 +4642,7 @@ static const unsigned short ucs_r2_jisx0213_table[] = { // 0xfa0f - 0xfa6a static const int ucs_r2_jisx0213_min = 0xFA0F; static const int ucs_r2_jisx0213_max = 0xFA6A; -/* +/* CJK Compatibility Ideographs: U+F900 - U+FAFF (separate mapping for U+F9XX) */ static const unsigned short ucs_r2b_jisx0213_cmap_key[] = { @@ -4651,7 +4651,7 @@ static const unsigned short ucs_r2b_jisx0213_cmap_key[] = { static const unsigned short ucs_r2b_jisx0213_cmap_val[] = { 0x763b,0x742e,0x754e,0x7b4f,0x7649,0x7e24,0x7d5d}; -static const int ucs_r2b_jisx0213_cmap_len = +static const int ucs_r2b_jisx0213_cmap_len = sizeof(ucs_r2b_jisx0213_cmap_key)/sizeof(unsigned short); /* @@ -5042,7 +5042,7 @@ static const unsigned short jisx0213_p2_ofst[] = { 1, 8, 3, 4, 5, 12, 13, 14, 15, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94}; -static const int jisx0213_p2_ofst_len = +static const int jisx0213_p2_ofst_len = sizeof(jisx0213_p2_ofst)/sizeof(unsigned short); static const int uni2jis_tbl_range[][2] = { diff --git a/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h b/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h index ad3a68cd3d..fc850e5685 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -27,21 +27,21 @@ /* KOI8-R (RFC1489) to Unicode */ static const unsigned short koi8r_ucs_table[] = { - 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, - 0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590, - 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, - 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, - 0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, - 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e, - 0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, - 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9, - 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, - 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, - 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, - 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, - 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, - 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, - 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, + 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, + 0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590, + 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, + 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, + 0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, + 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e, + 0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, + 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9, + 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, + 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, + 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, + 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, + 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, + 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, + 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a }; static const int koi8r_ucs_table_min = 0x80; diff --git a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h index f3a4e9de63..2674e0c9b8 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -27,133 +27,133 @@ /* KOI8-U (RFC2319) to Unicode */ static const unsigned short koi8u_ucs_table[] = { - 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */ - 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */ - 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ - 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */ - 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */ - 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */ - 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ - 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ - 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ - 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ - 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ - 0x2580, /* UPPER HALF BLOCK */ - 0x2584, /* LOWER HALF BLOCK */ - 0x2588, /* FULL BLOCK */ - 0x258C, /* LEFT HALF BLOCK */ - 0x2590, /* RIGHT HALF BLOCK */ - 0x2591, /* LIGHT SHADE */ - 0x2592, /* MEDIUM SHADE */ - 0x2593, /* DARK SHADE */ - 0x2320, /* TOP HALF INTEGRAL */ - 0x25A0, /* BLACK SQUARE */ - 0x2219, /* BULLET OPERATOR */ - 0x221A, /* SQUARE ROOT */ - 0x2248, /* ALMOST EQUAL TO */ - 0x2264, /* LESS THAN OR EQUAL TO */ - 0x2265, /* GREATER THAN OR EQUAL TO */ - 0x00A0, /* NO-BREAK SPACE */ - 0x2321, /* BOTTOM HALF INTEGRAL */ - 0x00B0, /* DEGREE SIGN */ - 0x00B2, /* SUPERSCRIPT TWO */ - 0x00B7, /* MIDDLE DOT */ - 0x00F7, /* DIVISION SIGN */ - 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */ - 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */ - 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ - 0x0451, /* CYRILLIC SMALL LETTER IO */ - 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ - 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ - 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ - 0x0457, /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */ - 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ - 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ - 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ - 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */ - 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ - 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ - 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */ - 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ - 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ - 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ - 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ - 0x0401, /* CYRILLIC CAPITAL LETTER IO */ - 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ - 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ - 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ - 0x0407, /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */ - 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ - 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ - 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ - 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ - 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ - 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ - 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ - 0x00A9, /* COPYRIGHT SIGN */ - 0x044E, /* CYRILLIC SMALL LETTER YU */ - 0x0430, /* CYRILLIC SMALL LETTER A */ - 0x0431, /* CYRILLIC SMALL LETTER BE */ - 0x0446, /* CYRILLIC SMALL LETTER TSE */ - 0x0434, /* CYRILLIC SMALL LETTER DE */ - 0x0435, /* CYRILLIC SMALL LETTER IE */ - 0x0444, /* CYRILLIC SMALL LETTER EF */ - 0x0433, /* CYRILLIC SMALL LETTER GHE */ - 0x0445, /* CYRILLIC SMALL LETTER KHA */ - 0x0438, /* CYRILLIC SMALL LETTER I */ - 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ - 0x043A, /* CYRILLIC SMALL LETTER KA */ - 0x043B, /* CYRILLIC SMALL LETTER EL */ - 0x043C, /* CYRILLIC SMALL LETTER EM */ - 0x043D, /* CYRILLIC SMALL LETTER EN */ - 0x043E, /* CYRILLIC SMALL LETTER O */ - 0x043F, /* CYRILLIC SMALL LETTER PE */ - 0x044F, /* CYRILLIC SMALL LETTER YA */ - 0x0440, /* CYRILLIC SMALL LETTER ER */ - 0x0441, /* CYRILLIC SMALL LETTER ES */ - 0x0442, /* CYRILLIC SMALL LETTER TE */ - 0x0443, /* CYRILLIC SMALL LETTER U */ - 0x0436, /* CYRILLIC SMALL LETTER ZHE */ - 0x0432, /* CYRILLIC SMALL LETTER VE */ - 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */ - 0x044B, /* CYRILLIC SMALL LETTER YERU */ - 0x0437, /* CYRILLIC SMALL LETTER ZE */ - 0x0448, /* CYRILLIC SMALL LETTER SHA */ - 0x044D, /* CYRILLIC SMALL LETTER E */ - 0x0449, /* CYRILLIC SMALL LETTER SHCHA */ - 0x0447, /* CYRILLIC SMALL LETTER CHE */ - 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */ - 0x042E, /* CYRILLIC CAPITAL LETTER YU */ - 0x0410, /* CYRILLIC CAPITAL LETTER A */ - 0x0411, /* CYRILLIC CAPITAL LETTER BE */ - 0x0426, /* CYRILLIC CAPITAL LETTER TSE */ - 0x0414, /* CYRILLIC CAPITAL LETTER DE */ - 0x0415, /* CYRILLIC CAPITAL LETTER IE */ - 0x0424, /* CYRILLIC CAPITAL LETTER EF */ - 0x0413, /* CYRILLIC CAPITAL LETTER GHE */ - 0x0425, /* CYRILLIC CAPITAL LETTER KHA */ - 0x0418, /* CYRILLIC CAPITAL LETTER I */ - 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ - 0x041A, /* CYRILLIC CAPITAL LETTER KA */ - 0x041B, /* CYRILLIC CAPITAL LETTER EL */ - 0x041C, /* CYRILLIC CAPITAL LETTER EM */ - 0x041D, /* CYRILLIC CAPITAL LETTER EN */ - 0x041E, /* CYRILLIC CAPITAL LETTER O */ - 0x041F, /* CYRILLIC CAPITAL LETTER PE */ - 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - 0x0420, /* CYRILLIC CAPITAL LETTER ER */ - 0x0421, /* CYRILLIC CAPITAL LETTER ES */ - 0x0422, /* CYRILLIC CAPITAL LETTER TE */ - 0x0423, /* CYRILLIC CAPITAL LETTER U */ - 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ - 0x0412, /* CYRILLIC CAPITAL LETTER VE */ - 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ - 0x042B, /* CYRILLIC CAPITAL LETTER YERU */ - 0x0417, /* CYRILLIC CAPITAL LETTER ZE */ - 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ - 0x042D, /* CYRILLIC CAPITAL LETTER E */ - 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */ - 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ + 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */ + 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */ + 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ + 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */ + 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */ + 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */ + 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ + 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ + 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ + 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ + 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ + 0x2580, /* UPPER HALF BLOCK */ + 0x2584, /* LOWER HALF BLOCK */ + 0x2588, /* FULL BLOCK */ + 0x258C, /* LEFT HALF BLOCK */ + 0x2590, /* RIGHT HALF BLOCK */ + 0x2591, /* LIGHT SHADE */ + 0x2592, /* MEDIUM SHADE */ + 0x2593, /* DARK SHADE */ + 0x2320, /* TOP HALF INTEGRAL */ + 0x25A0, /* BLACK SQUARE */ + 0x2219, /* BULLET OPERATOR */ + 0x221A, /* SQUARE ROOT */ + 0x2248, /* ALMOST EQUAL TO */ + 0x2264, /* LESS THAN OR EQUAL TO */ + 0x2265, /* GREATER THAN OR EQUAL TO */ + 0x00A0, /* NO-BREAK SPACE */ + 0x2321, /* BOTTOM HALF INTEGRAL */ + 0x00B0, /* DEGREE SIGN */ + 0x00B2, /* SUPERSCRIPT TWO */ + 0x00B7, /* MIDDLE DOT */ + 0x00F7, /* DIVISION SIGN */ + 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */ + 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */ + 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ + 0x0451, /* CYRILLIC SMALL LETTER IO */ + 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ + 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ + 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ + 0x0457, /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */ + 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ + 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ + 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ + 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */ + 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ + 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ + 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */ + 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ + 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ + 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ + 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ + 0x0401, /* CYRILLIC CAPITAL LETTER IO */ + 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ + 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ + 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ + 0x0407, /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */ + 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ + 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ + 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ + 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ + 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ + 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ + 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ + 0x00A9, /* COPYRIGHT SIGN */ + 0x044E, /* CYRILLIC SMALL LETTER YU */ + 0x0430, /* CYRILLIC SMALL LETTER A */ + 0x0431, /* CYRILLIC SMALL LETTER BE */ + 0x0446, /* CYRILLIC SMALL LETTER TSE */ + 0x0434, /* CYRILLIC SMALL LETTER DE */ + 0x0435, /* CYRILLIC SMALL LETTER IE */ + 0x0444, /* CYRILLIC SMALL LETTER EF */ + 0x0433, /* CYRILLIC SMALL LETTER GHE */ + 0x0445, /* CYRILLIC SMALL LETTER KHA */ + 0x0438, /* CYRILLIC SMALL LETTER I */ + 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ + 0x043A, /* CYRILLIC SMALL LETTER KA */ + 0x043B, /* CYRILLIC SMALL LETTER EL */ + 0x043C, /* CYRILLIC SMALL LETTER EM */ + 0x043D, /* CYRILLIC SMALL LETTER EN */ + 0x043E, /* CYRILLIC SMALL LETTER O */ + 0x043F, /* CYRILLIC SMALL LETTER PE */ + 0x044F, /* CYRILLIC SMALL LETTER YA */ + 0x0440, /* CYRILLIC SMALL LETTER ER */ + 0x0441, /* CYRILLIC SMALL LETTER ES */ + 0x0442, /* CYRILLIC SMALL LETTER TE */ + 0x0443, /* CYRILLIC SMALL LETTER U */ + 0x0436, /* CYRILLIC SMALL LETTER ZHE */ + 0x0432, /* CYRILLIC SMALL LETTER VE */ + 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */ + 0x044B, /* CYRILLIC SMALL LETTER YERU */ + 0x0437, /* CYRILLIC SMALL LETTER ZE */ + 0x0448, /* CYRILLIC SMALL LETTER SHA */ + 0x044D, /* CYRILLIC SMALL LETTER E */ + 0x0449, /* CYRILLIC SMALL LETTER SHCHA */ + 0x0447, /* CYRILLIC SMALL LETTER CHE */ + 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */ + 0x042E, /* CYRILLIC CAPITAL LETTER YU */ + 0x0410, /* CYRILLIC CAPITAL LETTER A */ + 0x0411, /* CYRILLIC CAPITAL LETTER BE */ + 0x0426, /* CYRILLIC CAPITAL LETTER TSE */ + 0x0414, /* CYRILLIC CAPITAL LETTER DE */ + 0x0415, /* CYRILLIC CAPITAL LETTER IE */ + 0x0424, /* CYRILLIC CAPITAL LETTER EF */ + 0x0413, /* CYRILLIC CAPITAL LETTER GHE */ + 0x0425, /* CYRILLIC CAPITAL LETTER KHA */ + 0x0418, /* CYRILLIC CAPITAL LETTER I */ + 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ + 0x041A, /* CYRILLIC CAPITAL LETTER KA */ + 0x041B, /* CYRILLIC CAPITAL LETTER EL */ + 0x041C, /* CYRILLIC CAPITAL LETTER EM */ + 0x041D, /* CYRILLIC CAPITAL LETTER EN */ + 0x041E, /* CYRILLIC CAPITAL LETTER O */ + 0x041F, /* CYRILLIC CAPITAL LETTER PE */ + 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + 0x0420, /* CYRILLIC CAPITAL LETTER ER */ + 0x0421, /* CYRILLIC CAPITAL LETTER ES */ + 0x0422, /* CYRILLIC CAPITAL LETTER TE */ + 0x0423, /* CYRILLIC CAPITAL LETTER U */ + 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ + 0x0412, /* CYRILLIC CAPITAL LETTER VE */ + 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ + 0x042B, /* CYRILLIC CAPITAL LETTER YERU */ + 0x0417, /* CYRILLIC CAPITAL LETTER ZE */ + 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ + 0x042D, /* CYRILLIC CAPITAL LETTER E */ + 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */ + 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ }; static const int koi8u_ucs_table_min = 0x80; diff --git a/ext/mbstring/libmbfl/filters/unicode_table_uhc.h b/ext/mbstring/libmbfl/filters/unicode_table_uhc.h index 6b98c65b6f..a205d1fedf 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_uhc.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_uhc.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -2354,7 +2354,7 @@ const unsigned short uhc3_ucs_table[] = { const int uhc3_ucs_table_size = (sizeof(uhc3_ucs_table)/sizeof(unsigned short)); /* UCS -> UHC */ -const unsigned short ucs_a1_uhc_table[] = { +const unsigned short ucs_a1_uhc_table[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000a,0x000b,0x000c,0x000d,0x000e,0x000f, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, diff --git a/ext/mbstring/libmbfl/mbfl/eaw_table.h b/ext/mbstring/libmbfl/mbfl/eaw_table.h index af310ea1d8..834b134dd4 100644 --- a/ext/mbstring/libmbfl/mbfl/eaw_table.h +++ b/ext/mbstring/libmbfl/mbfl/eaw_table.h @@ -40,5 +40,5 @@ static const struct { { 0x1f240, 0x1f248 }, { 0x1f250, 0x1f251 }, { 0x20000, 0x2fffd }, - { 0x30000, 0x3fffd } + { 0x30000, 0x3fffd } }; diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 3b14727d6b..27602d0227 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -72,7 +72,7 @@ * */ -/* +/* * Unicode support * * Portions copyright (c) 1999,2000,2001 by the PHP3 internationalization team. @@ -137,7 +137,7 @@ mbfl_buffer_converter_new( mbfl_buffer_converter * mbfl_buffer_converter_new2( const mbfl_encoding *from, - const mbfl_encoding *to, + const mbfl_encoding *to, int buf_initsz) { mbfl_buffer_converter *convd; @@ -339,7 +339,7 @@ mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result) } mbfl_string * -mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string, +mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string, mbfl_string *result) { if (convd == NULL || string == NULL || result == NULL) { @@ -535,7 +535,7 @@ const mbfl_encoding *mbfl_encoding_detector_judge2(mbfl_encoding_detector *ident } n--; } - + /* fallback judge */ if (!encoding) { n = identd->filter_list_size - 1; @@ -702,7 +702,7 @@ mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int el } } } - + /* cleanup */ /* dtors should be called in reverse order */ i = num; while (--i >= 0) { @@ -785,7 +785,7 @@ mbfl_identify_encoding2(mbfl_string *string, const mbfl_encoding **elist, int el } } } - + /* cleanup */ /* dtors should be called in reverse order */ i = num; while (--i >= 0) { @@ -844,7 +844,7 @@ mbfl_strlen(mbfl_string *string) } else { /* wchar filter */ mbfl_convert_filter *filter = mbfl_convert_filter_new( - string->no_encoding, + string->no_encoding, mbfl_no_encoding_wchar, filter_count_output, 0, &len); if (filter == NULL) { @@ -865,7 +865,7 @@ mbfl_strlen(mbfl_string *string) return len; } - + /* * strpos */ @@ -931,7 +931,7 @@ retry: /* * oddlen */ -int +int mbfl_oddlen(mbfl_string *string) { int len, n, m, k; @@ -1071,7 +1071,7 @@ mbfl_strpos( ++result; } else if ((c & 0xc0) != 0x80) { ++result; - } + } } goto out; } @@ -1116,7 +1116,7 @@ mbfl_strpos( qe = needle_u8_val + needle_u8_len; if (offset < 0) { if (-offset > needle_len) { - offset += needle_len; + offset += needle_len; while (offset < 0) { unsigned char c; if (p <= e) { @@ -1158,7 +1158,7 @@ mbfl_strpos( ++result; } else if ((c & 0xc0) != 0x80) { ++result; - } + } } goto out; } @@ -2024,7 +2024,7 @@ mbfl_ja_jp_hantozen( mbfl_no_encoding_wchar, (int(*)(int, void*))next_filter->filter_function, (int(*)(void*))next_filter->filter_flush, - next_filter); + next_filter); if (encoder == NULL) { goto out; } diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.h b/ext/mbstring/libmbfl/mbfl/mbfilter.h index 6108f93195..565ed3252d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.h @@ -71,7 +71,7 @@ * */ -/* +/* * Unicode support * * Portions copyright (c) 1999,2000,2001 by the PHP3 internationalization team. diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 9b19479ed6..ed79746f6a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h index a87c564616..acdf640fd7 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index b6da879b6e..b19432f76a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifdef HAVE_CONFIG_H diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h index 49d169c668..a1064b85bc 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ /* * The source code included in this files was separated from mbfilter.c * by moriyoshi koizumi <moriyoshi@php.net> on 4 dec 2002. - * + * */ #ifndef MBFL_MBFILTER_PASS_H @@ -33,7 +33,7 @@ #include "mbfl_defs.h" #include "mbfilter.h" -MBFLAPI extern const mbfl_encoding mbfl_encoding_pass; +MBFLAPI extern const mbfl_encoding mbfl_encoding_pass; MBFLAPI extern const struct mbfl_convert_vtbl vtbl_pass; MBFLAPI extern int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index 50f7629849..ace81b4c72 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h index 9e9396a77f..b412f4c907 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index be9d345b06..f52c94cf37 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -89,5 +89,5 @@ static void *__mbfl__calloc(unsigned int nelems, unsigned int szelem) static void __mbfl__free(void *ptr) { free(ptr); -} +} diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h index a1539f0f37..b2981c6f1f 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -38,12 +38,12 @@ typedef struct _mbfl_allocators { void *(*realloc)(void *, unsigned int); void *(*calloc)(unsigned int, unsigned int); void (*free)(void *); - void *(*pmalloc)(unsigned int); + void *(*pmalloc)(unsigned int); void *(*prealloc)(void *, unsigned int); void (*pfree)(void *); } mbfl_allocators; -MBFLAPI extern mbfl_allocators *__mbfl_allocators; +MBFLAPI extern mbfl_allocators *__mbfl_allocators; #define mbfl_malloc (__mbfl_allocators->malloc) #define mbfl_realloc (__mbfl_allocators->realloc) diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h index b11119a80b..cad99b0a66 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -41,7 +41,7 @@ #define MBFL_ENCTYPE_WCS4LE 0x00000200 #define MBFL_ENCTYPE_MWC4BE 0x00000400 #define MBFL_ENCTYPE_MWC4LE 0x00000800 -#define MBFL_ENCTYPE_SHFTCODE 0x00001000 +#define MBFL_ENCTYPE_SHFTCODE 0x00001000 #define MBFL_ENCTYPE_ENC_STRM 0x00002000 #define MBFL_ENCTYPE_GL_UNSAFE 0x00004000 @@ -74,9 +74,9 @@ #define MBFL_WCSPLANE_BIG5 0x70f40000 /* 2121h - 9898h */ #define MBFL_WCSPLANE_CNS11643 0x70f50000 /* 2121h - 9898h */ #define MBFL_WCSPLANE_UHC 0x70f60000 /* 8141h - fefeh */ -#define MBFL_WCSPLANE_CP1251 0x70f70000 -#define MBFL_WCSPLANE_CP866 0x70f80000 -#define MBFL_WCSPLANE_KOI8R 0x70f90000 +#define MBFL_WCSPLANE_CP1251 0x70f70000 +#define MBFL_WCSPLANE_CP866 0x70f80000 +#define MBFL_WCSPLANE_KOI8R 0x70f90000 #define MBFL_WCSPLANE_8859_16 0x70fa0000 /* 00h - FFh */ #define MBFL_WCSPLANE_ARMSCII8 0x70fb0000 #define MBFL_WCSPLANE_KOI8U 0x70fc0000 diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index ae8deb25fb..b553ad5d13 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -433,7 +433,7 @@ mbfl_convert_filter_copy( *dest = *src; } -int mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src) +int mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src) { int n; unsigned char *p; diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h index 8b5ba5bc19..ad0911723a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h index fcfac2b899..753724d7be 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -37,7 +37,7 @@ #else #define NULL (void *)(0L) #endif -#endif +#endif #ifdef WIN32 #ifdef MBFL_DLL_EXPORT diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index adf0c3ae87..e03c2acaff 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -116,7 +116,7 @@ #ifdef HAVE_STRICMP #define strcasecmp stricmp #endif -#endif +#endif static const char *mbfl_encoding_auto_aliases[] = {"unknown", NULL}; diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h index ca7717cb7b..d080f7b6a4 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c index 341047d5b0..c75c19ac19 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h index d477653d3e..eeae05ac9c 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index 4d6283f4f2..9f8e780769 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.h b/ext/mbstring/libmbfl/mbfl/mbfl_ident.h index 12d81cde8c..238132f6a7 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 4dd9726362..9ca2d59183 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, @@ -67,7 +67,7 @@ #ifdef HAVE_STRICMP #define strcasecmp stricmp #endif -#endif +#endif static const mbfl_language *mbfl_language_ptr_table[] = { &mbfl_language_uni, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.h b/ext/mbstring/libmbfl/mbfl/mbfl_language.h index af42a010cf..a0a73899ee 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c index 7509ef1a6a..29782f5931 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h index a2c1c4089f..0e8a82f0e8 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index e0351a437b..69f594350e 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.h b/ext/mbstring/libmbfl/mbfl/mbfl_string.h index d1121319a3..560944737e 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.h @@ -5,7 +5,7 @@ * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", - * which is distributed under the terms of GNU Lesser General Public + * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, diff --git a/ext/mbstring/libmbfl/tests/conv_encoding.c b/ext/mbstring/libmbfl/tests/conv_encoding.c index 9769964743..6dad37314b 100644 --- a/ext/mbstring/libmbfl/tests/conv_encoding.c +++ b/ext/mbstring/libmbfl/tests/conv_encoding.c @@ -98,7 +98,7 @@ int main(int argc, char **argv) mbfl_string_clear(&string); } while (!final); - mbfl_buffer_converter_delete(convd); + mbfl_buffer_converter_delete(convd); return EXIT_SUCCESS; } diff --git a/ext/mbstring/libmbfl/tests/emoji.c b/ext/mbstring/libmbfl/tests/emoji.c index 4f6a346576..c28a0f90bb 100644 --- a/ext/mbstring/libmbfl/tests/emoji.c +++ b/ext/mbstring/libmbfl/tests/emoji.c @@ -107,12 +107,12 @@ int main(int argc, char **argv) mbfl_string_init_set(&result, no_language, from_encoding); ret = mbfl_buffer_converter_feed_result(convd2, &string, &result); hexdump(&result); - mbfl_buffer_converter_delete(convd2); + mbfl_buffer_converter_delete(convd2); #endif mbfl_string_clear(&result); mbfl_string_clear(&string); - mbfl_buffer_converter_delete(convd); + mbfl_buffer_converter_delete(convd); return EXIT_SUCCESS; diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 86cbba4ded..98284e09cf 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -92,7 +92,7 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) break; } - if (arg == PARSE_POST) { + if (arg == PARSE_POST) { sapi_handle_post(&v_array); return; } @@ -132,7 +132,7 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) separator = ";\0"; break; } - + switch (arg) { case PARSE_POST: MBSTRG(http_input_identify_post) = NULL; @@ -149,12 +149,12 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) } info.data_type = arg; - info.separator = separator; + info.separator = separator; info.report_errors = 0; info.to_encoding = MBSTRG(internal_encoding); info.to_language = MBSTRG(language); info.from_encodings = MBSTRG(http_input_list); - info.num_from_encodings = MBSTRG(http_input_list_size); + info.num_from_encodings = MBSTRG(http_input_list_size); info.from_language = MBSTRG(language); MBSTRG(illegalchars) = 0; @@ -200,7 +200,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i size_t val_len, new_val_len; mbfl_string string, resvar, resval; const mbfl_encoding *from_encoding = NULL; - mbfl_encoding_detector *identd = NULL; + mbfl_encoding_detector *identd = NULL; mbfl_buffer_converter *convd = NULL; mbfl_string_init_set(&string, info->to_language, info->to_encoding->no_encoding); @@ -210,7 +210,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i if (!res || *res == '\0') { goto out; } - + /* count the variables(separators) contained in the "res". * separator may contain multiple separator chars. */ @@ -219,11 +219,11 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i for (s2=info->separator; *s2 != '\0'; s2++) { if (*s1 == *s2) { num++; - } + } } } num *= 2; /* need space for variable name and value */ - + val_list = (char **)ecalloc(num, sizeof(char *)); len_list = (int *)ecalloc(num, sizeof(int)); @@ -237,7 +237,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i len_list[n] = php_url_decode(var, val-var); val_list[n] = var; n++; - + *val++ = '\0'; val_list[n] = val; len_list[n] = php_url_decode(val, strlen(val)); @@ -245,13 +245,13 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i len_list[n] = php_url_decode(var, strlen(var)); val_list[n] = var; n++; - + val_list[n] = ""; len_list[n] = 0; } n++; var = php_strtok_r(NULL, info->separator, &strtok_buf); - } + } if (n > (PG(max_input_vars) * 2)) { php_error_docref(NULL, E_WARNING, "Input variables exceeded %pd. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); @@ -259,7 +259,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i } num = n; /* make sure to process initialized vars only */ - + /* initialize converter */ if (info->num_from_encodings <= 0) { from_encoding = &mbfl_encoding_pass; @@ -334,7 +334,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i php_register_variable_safe(var, val, new_val_len, array_ptr); } efree(val); - + if (convd != NULL){ mbfl_string_clear(&resvar); mbfl_string_clear(&resval); @@ -372,7 +372,7 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler) info.to_encoding = MBSTRG(internal_encoding); info.to_language = MBSTRG(language); info.from_encodings = MBSTRG(http_input_list); - info.num_from_encodings = MBSTRG(http_input_list_size); + info.num_from_encodings = MBSTRG(http_input_list_size); info.from_language = MBSTRG(language); php_stream_rewind(SG(request_info).request_body); diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 90a94d6594..9f69615895 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -212,7 +212,7 @@ static const struct mb_overload_def mb_ovld[] = { {MB_OVERLOAD_REGEX, "split", "mb_split", "mb_orig_split"}, #endif {0, NULL, NULL, NULL} -}; +}; /* }}} */ /* {{{ arginfo */ @@ -650,7 +650,7 @@ static void *_php_mb_allocators_calloc(unsigned int nelems, unsigned int szelem) static void _php_mb_allocators_free(void *ptr) { efree(ptr); -} +} static void *_php_mb_allocators_pmalloc(unsigned int sz) { @@ -665,7 +665,7 @@ static void *_php_mb_allocators_prealloc(void *ptr, unsigned int sz) static void _php_mb_allocators_pfree(void *ptr) { pefree(ptr, 1); -} +} static mbfl_allocators _php_mb_allocators = { _php_mb_allocators_malloc, @@ -688,7 +688,7 @@ static sapi_post_entry mbstr_post_entries[] = { /* {{{ static int php_mb_parse_encoding_list() * Return 0 if input contains any illegal encoding, otherwise 1. - * Even if any illegal encoding is detected the result may contain a list + * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ static int @@ -807,7 +807,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en /* {{{ static int php_mb_parse_encoding_array() * Return 0 if input contains any illegal encoding, otherwise 1. - * Even if any illegal encoding is detected the result may contain a list + * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ static int @@ -957,7 +957,7 @@ static size_t php_mb_zend_encoding_converter(unsigned char **to, size_t *to_leng if (!mbfl_buffer_converter_result(convd, &result)) { mbfl_buffer_converter_delete(convd); return (size_t)-1; - } + } *to = result.val; *to_length = result.len; @@ -1189,7 +1189,7 @@ static char *php_mb_rfc1867_basename(const zend_encoding *encoding, char *filena * to nill or problem is fixed this code must remain enabled for all systems. */ s = php_mb_safe_strrchr_ex(filename, '\\', filename_len, (const mbfl_encoding *)encoding); s2 = php_mb_safe_strrchr_ex(filename, '/', filename_len, (const mbfl_encoding *)encoding); - + if (s && s2) { if (s > s2) { return ++s; @@ -1472,13 +1472,13 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_output) STD_PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding, internal_encoding_name, zend_mbstring_globals, mbstring_globals) PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character) - STD_PHP_INI_ENTRY("mbstring.func_overload", "0", + STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM, OnUpdateLong, func_overload, zend_mbstring_globals, mbstring_globals) STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0", PHP_INI_SYSTEM | PHP_INI_PERDIR, - OnUpdate_mbstring_encoding_translation, - encoding_translation, zend_mbstring_globals, mbstring_globals) + OnUpdate_mbstring_encoding_translation, + encoding_translation, zend_mbstring_globals, mbstring_globals) PHP_INI_ENTRY("mbstring.http_output_conv_mimetypes", "^(text/|application/xhtml\\+xml)", PHP_INI_ALL, @@ -1624,14 +1624,14 @@ PHP_RINIT_FUNCTION(mbstring) /* override original function. */ if (MBSTRG(func_overload)){ p = &(mb_ovld[0]); - + CG(compiler_options) |= ZEND_COMPILE_NO_BUILTIN_STRLEN; while (p->type > 0) { - if ((MBSTRG(func_overload) & p->type) == p->type && + if ((MBSTRG(func_overload) & p->type) == p->type && !zend_hash_str_exists(EG(function_table), p->save_func, strlen(p->save_func)) ) { func = zend_hash_str_find_ptr(EG(function_table), p->ovld_func, strlen(p->ovld_func)); - + if ((orig = zend_hash_str_find_ptr(EG(function_table), p->orig_func, strlen(p->orig_func))) == NULL) { php_error_docref("ref.mbstring", E_WARNING, "mbstring couldn't find function %s.", p->orig_func); return FAILURE; @@ -1688,9 +1688,9 @@ PHP_RSHUTDOWN_FUNCTION(mbstring) if (MBSTRG(func_overload)){ p = &(mb_ovld[0]); while (p->type > 0) { - if ((MBSTRG(func_overload) & p->type) == p->type && + if ((MBSTRG(func_overload) & p->type) == p->type && (orig = zend_hash_str_find_ptr(EG(function_table), p->save_func, strlen(p->save_func)))) { - + zend_hash_str_update_mem(EG(function_table), p->orig_func, strlen(p->orig_func), orig, sizeof(zend_internal_function)); function_add_ref(orig); zend_hash_str_del(EG(function_table), p->save_func, strlen(p->save_func)); @@ -1714,7 +1714,7 @@ PHP_MINFO_FUNCTION(mbstring) php_info_print_table_start(); php_info_print_table_row(2, "Multibyte Support", "enabled"); php_info_print_table_row(2, "Multibyte string engine", "libmbfl"); - php_info_print_table_row(2, "HTTP input encoding translation", MBSTRG(encoding_translation) ? "enabled": "disabled"); + php_info_print_table_row(2, "HTTP input encoding translation", MBSTRG(encoding_translation) ? "enabled": "disabled"); { char tmp[256]; snprintf(tmp, sizeof(tmp), "%d.%d.%d", MBFL_VERSION_MAJOR, MBFL_VERSION_MINOR, MBFL_VERSION_TEENY); @@ -1849,7 +1849,7 @@ PHP_FUNCTION(mb_http_input) temp = list; spprintf(&list, 0, "%s,%s", temp, (*entry)->name); efree(temp); - if (!list) { + if (!list) { break; } } else { @@ -2082,12 +2082,12 @@ PHP_FUNCTION(mb_parse_str) encstr = estrndup(encstr, encstr_len); info.data_type = PARSE_STRING; - info.separator = PG(arg_separator).input; + info.separator = PG(arg_separator).input; info.report_errors = 1; info.to_encoding = MBSTRG(current_internal_encoding); info.to_language = MBSTRG(language); info.from_encodings = MBSTRG(http_input_list); - info.num_from_encodings = MBSTRG(http_input_list_size); + info.num_from_encodings = MBSTRG(http_input_list_size); info.from_language = MBSTRG(language); if (track_vars_array != NULL) { @@ -2097,7 +2097,7 @@ PHP_FUNCTION(mb_parse_str) zend_array *symbol_table = zend_rebuild_symbol_table(); ZVAL_ARR(&tmp, symbol_table); - detected = _php_mb_encoding_handler_ex(&info, &tmp, encstr); + detected = _php_mb_encoding_handler_ex(&info, &tmp, encstr); } MBSTRG(http_input_identify) = detected; @@ -2161,7 +2161,7 @@ PHP_FUNCTION(mb_output_handler) if (SG(sapi_headers).send_default_content_type || send_text_mimetype) { charset = encoding->mime_name; if (charset) { - len = spprintf( &p, 0, "Content-Type: %s; charset=%s", mimetype, charset ); + len = spprintf( &p, 0, "Content-Type: %s; charset=%s", mimetype, charset ); if (sapi_add_header(p, len, 0) != FAILURE) { SG(sapi_headers).send_default_content_type = 0; } @@ -2184,7 +2184,7 @@ PHP_FUNCTION(mb_output_handler) /* mode */ mbfl_buffer_converter_illegal_mode(MBSTRG(outconv), MBSTRG(current_filter_illegal_mode)); mbfl_buffer_converter_illegal_substchar(MBSTRG(outconv), MBSTRG(current_filter_illegal_substchar)); - + /* feed the string */ mbfl_string_init(&string); /* these are not needed. convd has encoding info. @@ -2196,13 +2196,13 @@ PHP_FUNCTION(mb_output_handler) mbfl_buffer_converter_feed(MBSTRG(outconv), &string); if (last_feed) { mbfl_buffer_converter_flush(MBSTRG(outconv)); - } + } /* get the converter output, and return it */ mbfl_buffer_converter_result(MBSTRG(outconv), &result); // TODO: avoid reallocation ??? RETVAL_STRINGL((char *)result.val, result.len); /* the string is already strdup()'ed */ efree(result.val); - + /* delete the converter if it is the last feed. */ if (last_feed) { MBSTRG(illegalchars) += mbfl_buffer_illegalchars(MBSTRG(outconv)); @@ -3173,7 +3173,7 @@ PHP_FUNCTION(mb_convert_case) // TODO: avoid reallocation ??? RETVAL_STRINGL(newstr, ret_len); efree(newstr); - } + } } /* }}} */ @@ -3560,7 +3560,7 @@ PHP_FUNCTION(mb_convert_variables) size_t elistsz; const mbfl_encoding **elist; char *to_enc; - void *ptmp; + void *ptmp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz+", &to_enc, &to_enc_len, &zfrom_enc, &args, &argc) == FAILURE) { return; @@ -3900,12 +3900,12 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t /* * C o n t e n t - T y p e : t e x t / h t m l \r\n - * ^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^^^^^ ^^^^ - * state 0 1 2 3 + * ^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^^^^^ ^^^^ + * state 0 1 2 3 * * C o n t e n t - T y p e : t e x t / h t m l \r\n - * ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^ - * crlf_state -1 0 1 -1 + * ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^ + * crlf_state -1 0 1 -1 * */ @@ -3970,7 +3970,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t token_pos = 0; state = 1; break; - + case 2: if (crlf_state != -1) { token = (char*)ps; @@ -4139,14 +4139,14 @@ PHP_FUNCTION(mb_send_mail) if ((param_name = php_strtok_r(p, "= ", &tmp)) != NULL) { if (strcasecmp(param_name, "charset") == 0) { enum mbfl_no_encoding _tran_cs = tran_cs; - + charset = php_strtok_r(NULL, "= \"", &tmp); if (charset != NULL) { _tran_cs = mbfl_name2no_encoding(charset); } if (_tran_cs == mbfl_no_encoding_invalid) { - php_error_docref(NULL, E_WARNING, "Unsupported charset \"%s\" - will be regarded as ascii", charset); + php_error_docref(NULL, E_WARNING, "Unsupported charset \"%s\" - will be regarded as ascii", charset); _tran_cs = mbfl_no_encoding_ascii; } tran_cs = _tran_cs; @@ -4169,7 +4169,7 @@ PHP_FUNCTION(mb_send_mail) break; default: - php_error_docref(NULL, E_WARNING, "Unsupported transfer encoding \"%s\" - will be regarded as 8bit", Z_STRVAL_P(s)); + php_error_docref(NULL, E_WARNING, "Unsupported transfer encoding \"%s\" - will be regarded as 8bit", Z_STRVAL_P(s)); body_enc = mbfl_no_encoding_8bit; break; } @@ -4302,7 +4302,7 @@ PHP_FUNCTION(mb_send_mail) extra_cmd = php_escape_shell_cmd(force_extra_parameters); } else if (extra_cmd) { extra_cmd = php_escape_shell_cmd(extra_cmd->val); - } + } if (!err && php_mail(to_r, subject, message, headers, extra_cmd ? extra_cmd->val : NULL)) { RETVAL_TRUE; @@ -4399,7 +4399,7 @@ PHP_FUNCTION(mb_get_info) } if ((name = (char *)mbfl_no_language2name(MBSTRG(language))) != NULL) { add_assoc_string(return_value, "language", name); - } + } n = MBSTRG(current_detect_order_list_size); entry = MBSTRG(current_detect_order_list); if (n > 0) { @@ -4428,15 +4428,15 @@ PHP_FUNCTION(mb_get_info) } else if (!strcasecmp("internal_encoding", typ)) { if (MBSTRG(current_internal_encoding)) { RETVAL_STRING((char *)MBSTRG(current_internal_encoding)->name); - } + } } else if (!strcasecmp("http_input", typ)) { if (MBSTRG(http_input_identify)) { RETVAL_STRING((char *)MBSTRG(http_input_identify)->name); - } + } } else if (!strcasecmp("http_output", typ)) { if (MBSTRG(current_http_output_encoding)) { RETVAL_STRING((char *)MBSTRG(current_http_output_encoding)->name); - } + } } else if (!strcasecmp("http_output_conv_mimetypes", typ)) { if ((name = (char *)zend_ini_string("mbstring.http_output_conv_mimetypes", sizeof("mbstring.http_output_conv_mimetypes") - 1, 0)) != NULL) { RETVAL_STRING(name); @@ -4479,7 +4479,7 @@ PHP_FUNCTION(mb_get_info) } else if (!strcasecmp("language", typ)) { if ((name = (char *)mbfl_no_language2name(MBSTRG(language))) != NULL) { RETVAL_STRING(name); - } + } } else if (!strcasecmp("detect_order", typ)) { n = MBSTRG(current_detect_order_list_size); entry = MBSTRG(current_detect_order_list); @@ -4546,9 +4546,9 @@ PHP_FUNCTION(mb_check_encoding) if (convd == NULL) { php_error_docref(NULL, E_WARNING, "Unable to create converter"); RETURN_FALSE; - } + } mbfl_buffer_converter_illegal_mode(convd, MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE); - mbfl_buffer_converter_illegal_substchar(convd, 0); + mbfl_buffer_converter_illegal_substchar(convd, 0); /* initialize string */ mbfl_string_init_set(&string, mbfl_no_language_neutral, encoding->no_encoding); @@ -4599,7 +4599,7 @@ static void php_mb_populate_current_detect_order_list(void) /* }}} */ /* {{{ static int php_mb_encoding_translation() */ -static int php_mb_encoding_translation(void) +static int php_mb_encoding_translation(void) { return MBSTRG(encoding_translation); } @@ -4725,7 +4725,7 @@ MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int { int haystack_char_len = mbfl_strlen(&haystack); - + if (mode) { if ((offset > 0 && offset > haystack_char_len) || (offset < 0 && -offset > haystack_char_len)) { diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 7f4b5dbafc..59c6a2f1a9 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -143,10 +143,10 @@ MBSTRING_API int php_mb_check_encoding_list(const char *encoding_list); MBSTRING_API size_t php_mb_mbchar_bytes_ex(const char *s, const mbfl_encoding *enc); MBSTRING_API size_t php_mb_mbchar_bytes(const char *s); -MBSTRING_API int php_mb_encoding_detector_ex(const char *arg_string, int arg_length, +MBSTRING_API int php_mb_encoding_detector_ex(const char *arg_string, int arg_length, char *arg_list); -MBSTRING_API int php_mb_encoding_converter_ex(char **str, int *len, const char *encoding_to, +MBSTRING_API int php_mb_encoding_converter_ex(char **str, int *len, const char *encoding_to, const char *encoding_from); MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding); diff --git a/ext/mbstring/oniguruma/enc/big5.c b/ext/mbstring/oniguruma/enc/big5.c index ca1e01b463..82a9e92c8d 100644 --- a/ext/mbstring/oniguruma/enc/big5.c +++ b/ext/mbstring/oniguruma/enc/big5.c @@ -126,7 +126,7 @@ big5_left_adjust_char_head(const UChar* start, const UChar* s) p++; break; } - } + } } len = enclen(ONIG_ENCODING_BIG5, p); if (p + len > s) return (UChar* )p; diff --git a/ext/mbstring/oniguruma/enc/euc_jp.c b/ext/mbstring/oniguruma/enc/euc_jp.c index f605297cc3..ed906a50e5 100644 --- a/ext/mbstring/oniguruma/enc/euc_jp.c +++ b/ext/mbstring/oniguruma/enc/euc_jp.c @@ -115,7 +115,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf) #if 1 if (enclen(ONIG_ENCODING_EUC_JP, buf) != (p - buf)) return ONIGERR_INVALID_CODE_POINT_VALUE; -#endif +#endif return p - buf; } diff --git a/ext/mbstring/oniguruma/enc/sjis.c b/ext/mbstring/oniguruma/enc/sjis.c index 7a54c9fb3a..902a869e76 100644 --- a/ext/mbstring/oniguruma/enc/sjis.c +++ b/ext/mbstring/oniguruma/enc/sjis.c @@ -155,7 +155,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { return onigenc_mbn_is_mbc_ambiguous(ONIG_ENCODING_SJIS, flag, pp, end); - + } #endif @@ -190,7 +190,7 @@ left_adjust_char_head(const UChar* start, const UChar* s) p++; break; } - } + } } len = enclen(ONIG_ENCODING_SJIS, p); if (p + len > s) return (UChar* )p; diff --git a/ext/mbstring/oniguruma/enc/unicode.c b/ext/mbstring/oniguruma/enc/unicode.c index af7a86e088..2b7225eed4 100644 --- a/ext/mbstring/oniguruma/enc/unicode.c +++ b/ext/mbstring/oniguruma/enc/unicode.c @@ -10986,7 +10986,7 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc, if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) { if (to->n == 1) { - return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold); + return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold); } #if 0 /* NO NEEDS TO CHECK */ @@ -11094,7 +11094,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag, for (j = 0; j < CaseUnfold_12[i].to.n; j++) { r = (*f)(CaseUnfold_12[i].to.code[j], (OnigCodePoint* )CaseUnfold_12[i].from, 2, arg); - if (r != 0) return r; + if (r != 0) return r; for (k = 0; k < CaseUnfold_12[i].to.n; k++) { if (k == j) continue; @@ -11115,7 +11115,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag, for (j = 0; j < CaseUnfold_12_Locale[i].to.n; j++) { r = (*f)(CaseUnfold_12_Locale[i].to.code[j], (OnigCodePoint* )CaseUnfold_12_Locale[i].from, 2, arg); - if (r != 0) return r; + if (r != 0) return r; for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) { if (k == j) continue; @@ -11136,7 +11136,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag, for (j = 0; j < CaseUnfold_13[i].to.n; j++) { r = (*f)(CaseUnfold_13[i].to.code[j], (OnigCodePoint* )CaseUnfold_13[i].from, 3, arg); - if (r != 0) return r; + if (r != 0) return r; for (k = 0; k < CaseUnfold_13[i].to.n; k++) { if (k == j) continue; diff --git a/ext/mbstring/oniguruma/oniguruma.h b/ext/mbstring/oniguruma/oniguruma.h index 00f39fe4fe..70c9d506d3 100644 --- a/ext/mbstring/oniguruma/oniguruma.h +++ b/ext/mbstring/oniguruma/oniguruma.h @@ -144,7 +144,7 @@ typedef struct { OnigCodePoint one_or_more_time; OnigCodePoint anychar_anytime; } OnigMetaCharTableType; - + typedef int (*OnigApplyAllCaseFoldFunc)(OnigCodePoint from, OnigCodePoint* to, int to_len, void* arg); typedef struct OnigEncodingTypeST { @@ -536,7 +536,7 @@ ONIG_EXTERN OnigSyntaxType* OnigDefaultSyntax; #define ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED -21 #define ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR -22 /* general error */ -#define ONIGERR_INVALID_ARGUMENT -30 +#define ONIGERR_INVALID_ARGUMENT -30 /* syntax error */ #define ONIGERR_END_PATTERN_AT_LEFT_BRACE -100 #define ONIGERR_END_PATTERN_AT_LEFT_BRACKET -101 diff --git a/ext/mbstring/oniguruma/regcomp.c b/ext/mbstring/oniguruma/regcomp.c index 995e1d8861..3df27f7690 100644 --- a/ext/mbstring/oniguruma/regcomp.c +++ b/ext/mbstring/oniguruma/regcomp.c @@ -2555,7 +2555,7 @@ is_not_included(Node* x, Node* y, regex_t* reg) } } break; - + default: break; } @@ -3293,7 +3293,7 @@ expand_case_fold_string_alt(int item_num, OnigCaseFoldCodeItem items[], for (i = 0; i < item_num; i++) { snode = onig_node_new_str(NULL, NULL); if (IS_NULL(snode)) goto mem_err; - + for (j = 0; j < items[i].code_len; j++) { len = ONIGENC_CODE_TO_MBC(reg->enc, items[i].code[j], buf); if (len < 0) { @@ -4003,15 +4003,15 @@ distance_value(MinMaxLen* mm) { /* 1000 / (min-max-dist + 1) */ static const short int dist_vals[] = { - 1000, 500, 333, 250, 200, 167, 143, 125, 111, 100, - 91, 83, 77, 71, 67, 63, 59, 56, 53, 50, - 48, 45, 43, 42, 40, 38, 37, 36, 34, 33, - 32, 31, 30, 29, 29, 28, 27, 26, 26, 25, - 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, - 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, - 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, - 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, - 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, + 1000, 500, 333, 250, 200, 167, 143, 125, 111, 100, + 91, 83, 77, 71, 67, 63, 59, 56, 53, 50, + 48, 45, 43, 42, 40, 38, 37, 36, 34, 33, + 32, 31, 30, 29, 29, 28, 27, 26, 26, 25, + 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, + 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, + 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, + 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, + 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10 }; @@ -4898,7 +4898,7 @@ set_optimize_exact_info(regex_t* reg, OptExactInfo* e) reg->exact = str_dup(e->s, e->s + e->len); CHECK_NULL_RETURN_MEMERR(reg->exact); reg->exact_end = reg->exact + e->len; - + allow_reverse = ONIGENC_IS_ALLOWED_REVERSE_MATCH(reg->enc, reg->exact, reg->exact_end); @@ -5880,7 +5880,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp, p_len_string(f, len, 1, bp); bp += len; break; - + case OP_EXACTMB2N1: p_string(f, 2, bp); bp += 2; break; case OP_EXACTMB2N2: @@ -5900,7 +5900,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp, case OP_EXACTMBN: { int mb_len; - + GET_LENGTH_INC(mb_len, bp); GET_LENGTH_INC(len, bp); fprintf(f, ":%d:%d:", mb_len, len); diff --git a/ext/mbstring/oniguruma/regenc.c b/ext/mbstring/oniguruma/regenc.c index 80903508b8..85f9eda110 100644 --- a/ext/mbstring/oniguruma/regenc.c +++ b/ext/mbstring/oniguruma/regenc.c @@ -112,7 +112,7 @@ onigenc_strlen(OnigEncoding enc, const UChar* p, const UChar* end) { int n = 0; UChar* q = (UChar* )p; - + while (q < end) { q += ONIGENC_MBC_ENC_LEN(enc, q); n++; @@ -125,7 +125,7 @@ onigenc_strlen_null(OnigEncoding enc, const UChar* s) { int n = 0; UChar* p = (UChar* )s; - + while (1) { if (*p == '\0') { UChar* q; diff --git a/ext/mbstring/oniguruma/regenc.h b/ext/mbstring/oniguruma/regenc.h index 40963280dc..da2e1aa05b 100644 --- a/ext/mbstring/oniguruma/regenc.h +++ b/ext/mbstring/oniguruma/regenc.h @@ -184,6 +184,6 @@ ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[]; #define ONIGENC_IS_ASCII_CODE_CASE_AMBIG(code) \ (ONIGENC_IS_ASCII_CODE_CTYPE(code, ONIGENC_CTYPE_UPPER) ||\ ONIGENC_IS_ASCII_CODE_CTYPE(code, ONIGENC_CTYPE_LOWER)) - + #endif /* REGENC_H */ diff --git a/ext/mbstring/oniguruma/regerror.c b/ext/mbstring/oniguruma/regerror.c index 385e560d98..1cedbbcac3 100644 --- a/ext/mbstring/oniguruma/regerror.c +++ b/ext/mbstring/oniguruma/regerror.c @@ -251,7 +251,7 @@ onig_error_code_to_str(UChar* s, int code, ...) onig_error_code_to_str(s, code, va_alist) UChar* s; int code; - va_dcl + va_dcl #endif { UChar *p, *q; diff --git a/ext/mbstring/oniguruma/regexec.c b/ext/mbstring/oniguruma/regexec.c index 7430d78514..936db02430 100644 --- a/ext/mbstring/oniguruma/regexec.c +++ b/ext/mbstring/oniguruma/regexec.c @@ -202,13 +202,13 @@ static int onig_region_resize_clear(OnigRegion* region, int n) { int r; - + r = onig_region_resize(region, n); if (r != 0) return r; onig_region_clear(region); return 0; } - + extern int onig_region_set(OnigRegion* region, int at, int beg, int end) { @@ -218,7 +218,7 @@ onig_region_set(OnigRegion* region, int at, int beg, int end) int r = onig_region_resize(region, at + 1); if (r < 0) return r; } - + region->beg[at] = beg; region->end[at] = end; return 0; @@ -2141,7 +2141,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, int len; UChar *pstart, *pend; - /* if you want to remove following line, + /* if you want to remove following line, you should check in parse and compile time. */ if (mem > num_mem) goto fail; if (mem_end_stk[mem] == INVALID_STACK_INDEX) goto fail; @@ -2173,7 +2173,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, int len; UChar *pstart, *pend; - /* if you want to remove following line, + /* if you want to remove following line, you should check in parse and compile time. */ if (mem > num_mem) goto fail; if (mem_end_stk[mem] == INVALID_STACK_INDEX) goto fail; @@ -2302,7 +2302,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, MOP_OUT; continue; } - + break; #endif @@ -2968,7 +2968,7 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end, static int set_bm_backward_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, int** skip) - + { int i, len; diff --git a/ext/mbstring/oniguruma/regparse.c b/ext/mbstring/oniguruma/regparse.c index bf72300caa..feba986118 100644 --- a/ext/mbstring/oniguruma/regparse.c +++ b/ext/mbstring/oniguruma/regparse.c @@ -51,7 +51,7 @@ OnigSyntaxType OnigSyntaxRuby = { ONIG_SYN_OP2_CCLASS_SET_OP | ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL | ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META | ONIG_SYN_OP2_ESC_V_VTAB | ONIG_SYN_OP2_ESC_H_XDIGIT ) - , ( SYN_GNU_REGEX_BV | + , ( SYN_GNU_REGEX_BV | ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV | ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND | ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP | @@ -2845,7 +2845,7 @@ find_str_position(OnigCodePoint s[], int n, UChar* from, UChar* to, OnigCodePoint x; UChar *q; UChar *p = from; - + while (p < to) { x = ONIGENC_MBC_TO_CODE(enc, p, to); q = p + enclen(enc, p); @@ -3406,7 +3406,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) goto skip_backref; } - if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_DECIMAL_BACKREF) && + if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_DECIMAL_BACKREF) && (num <= env->num_mem || num <= 9)) { /* This spec. from GNU regex */ if (IS_SYNTAX_BV(syn, ONIG_SYN_STRICT_CHECK_BACKREF)) { if (num > env->num_mem || IS_NULL(SCANENV_MEM_NODES(env)[num])) @@ -4384,7 +4384,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end, CC_ESC_WARN(env, (UChar* )"-"); goto range_end_val; } - + if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC)) { CC_ESC_WARN(env, (UChar* )"-"); goto sb_char; /* [0-9-a] is allowed as [0-9\-a] */ @@ -5067,7 +5067,7 @@ parse_exp(Node** np, OnigToken* tok, int term, r = parse_subexp(&target, tok, term, src, end, env); env->option = prev; if (r < 0) return r; - NENCLOSE(*np)->target = target; + NENCLOSE(*np)->target = target; return tok->type; } break; @@ -5235,7 +5235,7 @@ parse_exp(Node** np, OnigToken* tok, int term, xmemcpy(new_key, &key, sizeof(type_cclass_key)); onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key, (st_data_t )*np); - + THREAD_ATOMIC_END; } else { diff --git a/ext/mbstring/oniguruma/regparse.h b/ext/mbstring/oniguruma/regparse.h index 0c5c2c936c..af47461e56 100644 --- a/ext/mbstring/oniguruma/regparse.h +++ b/ext/mbstring/oniguruma/regparse.h @@ -192,7 +192,7 @@ typedef struct { AbsAddrType call_addr; /* for multiple call reference */ OnigDistance min_len; /* min length (byte) */ - OnigDistance max_len; /* max length (byte) */ + OnigDistance max_len; /* max length (byte) */ int char_len; /* character length */ int opt_count; /* referenced count in optimize_node_left() */ } EncloseNode; diff --git a/ext/mbstring/oniguruma/regsyntax.c b/ext/mbstring/oniguruma/regsyntax.c index ade5b55f77..1099fc8e16 100644 --- a/ext/mbstring/oniguruma/regsyntax.c +++ b/ext/mbstring/oniguruma/regsyntax.c @@ -67,8 +67,8 @@ OnigSyntaxType OnigSyntaxPosixExtended = { ONIG_SYN_OP_BRACE_INTERVAL | ONIG_SYN_OP_PLUS_ONE_INF | ONIG_SYN_OP_QMARK_ZERO_ONE | ONIG_SYN_OP_VBAR_ALT ) , 0 - , ( ONIG_SYN_CONTEXT_INDEP_ANCHORS | - ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS | ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS | + , ( ONIG_SYN_CONTEXT_INDEP_ANCHORS | + ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS | ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS | ONIG_SYN_ALLOW_UNMATCHED_CLOSE_SUBEXP | ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC ) , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_MULTILINE ) diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 6f3954e013..2d389996c4 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -32,7 +32,7 @@ #include "ext/standard/info.h" #include "php_mbregex.h" #include "mbstring.h" - + #include "php_onig_compat.h" /* must come prior to the oniguruma header */ #include <oniguruma.h> #undef UChar @@ -77,7 +77,7 @@ static int _php_mb_regex_globals_ctor(zend_mb_regex_globals *pglobals) /* }}} */ /* {{{ _php_mb_regex_globals_dtor */ -static void _php_mb_regex_globals_dtor(zend_mb_regex_globals *pglobals) +static void _php_mb_regex_globals_dtor(zend_mb_regex_globals *pglobals) { zend_hash_destroy(&pglobals->ht_rc); } @@ -464,7 +464,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl retval = rc; } out: - return retval; + return retval; } /* }}} */ @@ -481,7 +481,7 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT --len_left; *(p++) = 'i'; } - ++len_req; + ++len_req; } if ((option & ONIG_OPTION_EXTEND) != 0) { @@ -489,7 +489,7 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT --len_left; *(p++) = 'x'; } - ++len_req; + ++len_req; } if ((option & (ONIG_OPTION_MULTILINE | ONIG_OPTION_SINGLELINE)) == @@ -498,14 +498,14 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT --len_left; *(p++) = 'p'; } - ++len_req; + ++len_req; } else { if ((option & ONIG_OPTION_MULTILINE) != 0) { if (len_left > 0) { --len_left; *(p++) = 'm'; } - ++len_req; + ++len_req; } if ((option & ONIG_OPTION_SINGLELINE) != 0) { @@ -513,22 +513,22 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT --len_left; *(p++) = 's'; } - ++len_req; + ++len_req; } - } + } if ((option & ONIG_OPTION_FIND_LONGEST) != 0) { if (len_left > 0) { --len_left; *(p++) = 'l'; } - ++len_req; + ++len_req; } if ((option & ONIG_OPTION_FIND_NOT_EMPTY) != 0) { if (len_left > 0) { --len_left; *(p++) = 'n'; } - ++len_req; + ++len_req; } c = 0; @@ -564,7 +564,7 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT --len_left; *(p++) = '\0'; } - ++len_req; + ++len_req; if (len < len_req) { return len_req; } @@ -575,11 +575,11 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT /* {{{ _php_mb_regex_init_options */ static void -_php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, OnigSyntaxType **syntax, int *eval) +_php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, OnigSyntaxType **syntax, int *eval) { int n; char c; - int optm = 0; + int optm = 0; *syntax = ONIG_SYNTAX_RUBY; @@ -634,13 +634,13 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O *syntax = ONIG_SYNTAX_POSIX_EXTENDED; break; case 'e': - if (eval != NULL) *eval = 1; + if (eval != NULL) *eval = 1; break; default: break; } } - if (option != NULL) *option|=optm; + if (option != NULL) *option|=optm; } } /* }}} */ @@ -859,11 +859,11 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp } else { /* FIXME: this code is not multibyte aware! */ convert_to_long_ex(arg_pattern_zval); - pat_buf[0] = (char)Z_LVAL_P(arg_pattern_zval); + pat_buf[0] = (char)Z_LVAL_P(arg_pattern_zval); pat_buf[1] = '\0'; arg_pattern = pat_buf; - arg_pattern_len = 1; + arg_pattern_len = 1; } /* create regex pattern buffer */ re = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, options, MBREX(current_mbctype), syntax); @@ -933,7 +933,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp } } } - + if (eval) { zval v; /* null terminate buffer */ @@ -955,16 +955,16 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp zval args[1]; zval subpats, retval; int i; - + array_init(&subpats); for (i = 0; i < regs->num_regs; i++) { add_next_index_stringl(&subpats, string + regs->beg[i], regs->end[i] - regs->beg[i]); - } - + } + ZVAL_COPY_VALUE(&args[0], &subpats); /* null terminate buffer */ smart_str_0(&eval_buf); - + arg_replace_fci.param_count = 1; arg_replace_fci.params = args; arg_replace_fci.retval = &retval; @@ -990,7 +990,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp pos = (OnigUChar *)string + n; } else { if (pos < string_lim) { - smart_str_appendl(&out_buf, pos, 1); + smart_str_appendl(&out_buf, pos, 1); } pos++; } @@ -1012,7 +1012,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp smart_str_free(&eval_buf); if (err <= -2) { - smart_str_free(&out_buf); + smart_str_free(&out_buf); RETVAL_FALSE; } else if (out_buf.s) { smart_str_0(&out_buf); @@ -1064,7 +1064,7 @@ PHP_FUNCTION(mb_split) if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &arg_pattern, &arg_pattern_len, &string, &string_len, &count) == FAILURE) { RETURN_FALSE; - } + } if (count > 0) { count--; @@ -1318,7 +1318,7 @@ PHP_FUNCTION(mb_ereg_search_init) if (zend_parse_parameters(argc, "z|ss", &arg_str, &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) { return; } - + if (argc > 1 && arg_pattern_len == 0) { php_error_docref(NULL, E_WARNING, "Empty pattern"); RETURN_FALSE; @@ -1414,7 +1414,7 @@ PHP_FUNCTION(mb_ereg_search_setpos) /* }}} */ /* {{{ php_mb_regex_set_options */ -static void _php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *syntax, OnigOptionType *prev_options, OnigSyntaxType **prev_syntax) +static void _php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *syntax, OnigOptionType *prev_options, OnigSyntaxType **prev_syntax) { if (prev_options != NULL) { *prev_options = MBREX(regex_default_options); diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index c819f2c17c..716ced09a1 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -17,7 +17,7 @@ */ /* $Id$ */ - + #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index 75973c9b47..02364ab52b 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -16,16 +16,16 @@ +----------------------------------------------------------------------+ Based on code from ucdata-2.5, which has the following Copyright: - + Copyright 2001 Computing Research Labs, New Mexico State University - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ @@ -156,7 +156,7 @@ MBSTRING_API unsigned long php_turkish_tolower(unsigned long code, long l, long { if (code == 0x0049L) { return 0x0131L; - } + } return case_lookup(code, l, r, field); } @@ -279,12 +279,12 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s if (_src_encoding == mbfl_no_encoding_invalid) { php_error_docref(NULL, E_WARNING, "Unknown encoding \"%s\"", src_encoding); return NULL; - } + } unicode = php_mb_convert_encoding(srcstr, srclen, "UCS-4BE", src_encoding, &unicode_len); if (unicode == NULL) return NULL; - + unicode_ptr = (unsigned char *)unicode; switch(case_mode) { @@ -303,7 +303,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s break; case PHP_UNICODE_CASE_TITLE: { - int mode = 0; + int mode = 0; for (i = 0; i < unicode_len; i+=4) { int res = php_unicode_is_prop( @@ -315,7 +315,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s php_unicode_tolower(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding)); } else { mode = 0; - } + } } else { if (res) { mode = 1; @@ -327,7 +327,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s } break; } - + newstr = php_mb_convert_encoding(unicode, unicode_len, src_encoding, "UCS-4BE", ret_len); efree(unicode); diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h index 7bdeb86faa..628f13111c 100644 --- a/ext/mbstring/php_unicode.h +++ b/ext/mbstring/php_unicode.h @@ -16,16 +16,16 @@ +----------------------------------------------------------------------+ Based on code from ucdata-2.5, which has the following Copyright: - + Copyright 2001 Computing Research Labs, New Mexico State University - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ diff --git a/ext/mbstring/ucgendat/ucgendat.c b/ext/mbstring/ucgendat/ucgendat.c index 6fb1e095b2..8b735738b1 100644 --- a/ext/mbstring/ucgendat/ucgendat.c +++ b/ext/mbstring/ucgendat/ucgendat.c @@ -461,7 +461,7 @@ add_decomp(ac_uint4 code, short compat) pdecomps_used = &decomps_used; pdecomps_size = &decomps_size; } - + /* * Add the code to the composite property. */ @@ -965,7 +965,7 @@ read_cdata(FILE *in) i++; } for (e = s; *e && *e != ';'; e++) ; - + ordered_range_insert(code, s, e - s); /* @@ -1139,7 +1139,7 @@ find_decomp(ac_uint4 code, short compat) { long l, r, m; _decomp_t *decs; - + l = 0; r = (compat ? kdecomps_used : decomps_used) - 1; decs = compat ? kdecomps : decomps; @@ -1520,12 +1520,12 @@ write_cdata(char *opath) * Generate the composition data. * *****************************************************************/ - + /* * Create compositions from decomposition data */ create_comps(); - + #if HARDCODE_DATA fprintf(out, PREF "ac_uint4 _uccomp_size = %ld;\n\n", comps_used * 4L); @@ -1553,28 +1553,28 @@ write_cdata(char *opath) snprintf(path, sizeof path, "%s" LDAP_DIRSEP "comp.dat", opath); if ((out = fopen(path, "wb")) == 0) return; - + /* * Write the header. */ hdr[1] = (ac_uint2) comps_used * 4; fwrite((char *) hdr, sizeof(ac_uint2), 2, out); - + /* * Write out the byte count to maintain header size. */ bytes = comps_used * sizeof(_comp_t); fwrite((char *) &bytes, sizeof(ac_uint4), 1, out); - + /* * Now, if comps exist, write them out. */ if (comps_used > 0) fwrite((char *) comps, sizeof(_comp_t), comps_used, out); - + fclose(out); #endif - + /***************************************************************** * * Generate the decomposition data. diff --git a/ext/mbstring/unicode_data.h b/ext/mbstring/unicode_data.h index 1edec4c926..0516b54bb3 100644 --- a/ext/mbstring/unicode_data.h +++ b/ext/mbstring/unicode_data.h @@ -1,7 +1,7 @@ /* This file was generated from a modified version UCData's ucgendat. * * DO NOT EDIT THIS FILE! - * + * * Instead, compile ucgendat.c (bundled with PHP in ext/mbstring), download * the appropriate UnicodeData-x.x.x.txt and CompositionExclusions-x.x.x.txt * files from http://www.unicode.org/Public/ and run this program. |