diff options
8 files changed, 936 insertions, 939 deletions
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 0eec325d3634..1f77c3818b25 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -41,39 +41,39 @@ using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { OneToOneMappingTable_t IandE[] = { - MAKE_PAIR( 0x30A3, 0x0000 ), // KATAKANA LETTER SMALL I - MAKE_PAIR( 0x30A4, 0x0000 ), // KATAKANA LETTER I - MAKE_PAIR( 0x30A7, 0x0000 ), // KATAKANA LETTER SMALL E - MAKE_PAIR( 0x30A8, 0x0000 ), // KATAKANA LETTER E - MAKE_PAIR( 0x30AD, 0x0000 ), // KATAKANA LETTER KI - MAKE_PAIR( 0x30AE, 0x0000 ), // KATAKANA LETTER GI - MAKE_PAIR( 0x30B1, 0x0000 ), // KATAKANA LETTER KE - MAKE_PAIR( 0x30B2, 0x0000 ), // KATAKANA LETTER GE - MAKE_PAIR( 0x30B7, 0x0000 ), // KATAKANA LETTER SI - MAKE_PAIR( 0x30B8, 0x0000 ), // KATAKANA LETTER ZI - MAKE_PAIR( 0x30BB, 0x0000 ), // KATAKANA LETTER SE - MAKE_PAIR( 0x30BC, 0x0000 ), // KATAKANA LETTER ZE - MAKE_PAIR( 0x30C1, 0x0000 ), // KATAKANA LETTER TI - MAKE_PAIR( 0x30C2, 0x0000 ), // KATAKANA LETTER DI - MAKE_PAIR( 0x30C6, 0x0000 ), // KATAKANA LETTER TE - MAKE_PAIR( 0x30C7, 0x0000 ), // KATAKANA LETTER DE - MAKE_PAIR( 0x30CB, 0x0000 ), // KATAKANA LETTER NI - MAKE_PAIR( 0x30CD, 0x0000 ), // KATAKANA LETTER NE - MAKE_PAIR( 0x30D2, 0x0000 ), // KATAKANA LETTER HI - MAKE_PAIR( 0x30D3, 0x0000 ), // KATAKANA LETTER BI - MAKE_PAIR( 0x30D4, 0x0000 ), // KATAKANA LETTER PI - MAKE_PAIR( 0x30D8, 0x0000 ), // KATAKANA LETTER HE - MAKE_PAIR( 0x30D9, 0x0000 ), // KATAKANA LETTER BE - MAKE_PAIR( 0x30DA, 0x0000 ), // KATAKANA LETTER PE - MAKE_PAIR( 0x30DF, 0x0000 ), // KATAKANA LETTER MI - MAKE_PAIR( 0x30E1, 0x0000 ), // KATAKANA LETTER ME - MAKE_PAIR( 0x30EA, 0x0000 ), // KATAKANA LETTER RI - MAKE_PAIR( 0x30EC, 0x0000 ), // KATAKANA LETTER RE - MAKE_PAIR( 0x30F0, 0x0000 ), // KATAKANA LETTER WI - MAKE_PAIR( 0x30F1, 0x0000 ), // KATAKANA LETTER WE - MAKE_PAIR( 0x30F6, 0x0000 ), // KATAKANA LETTER SMALL KE - MAKE_PAIR( 0x30F8, 0x0000 ), // KATAKANA LETTER VI - MAKE_PAIR( 0x30F9, 0x0000 ) // KATAKANA LETTER VE + { 0x30A3, 0x0000 }, // KATAKANA LETTER SMALL I + { 0x30A4, 0x0000 }, // KATAKANA LETTER I + { 0x30A7, 0x0000 }, // KATAKANA LETTER SMALL E + { 0x30A8, 0x0000 }, // KATAKANA LETTER E + { 0x30AD, 0x0000 }, // KATAKANA LETTER KI + { 0x30AE, 0x0000 }, // KATAKANA LETTER GI + { 0x30B1, 0x0000 }, // KATAKANA LETTER KE + { 0x30B2, 0x0000 }, // KATAKANA LETTER GE + { 0x30B7, 0x0000 }, // KATAKANA LETTER SI + { 0x30B8, 0x0000 }, // KATAKANA LETTER ZI + { 0x30BB, 0x0000 }, // KATAKANA LETTER SE + { 0x30BC, 0x0000 }, // KATAKANA LETTER ZE + { 0x30C1, 0x0000 }, // KATAKANA LETTER TI + { 0x30C2, 0x0000 }, // KATAKANA LETTER DI + { 0x30C6, 0x0000 }, // KATAKANA LETTER TE + { 0x30C7, 0x0000 }, // KATAKANA LETTER DE + { 0x30CB, 0x0000 }, // KATAKANA LETTER NI + { 0x30CD, 0x0000 }, // KATAKANA LETTER NE + { 0x30D2, 0x0000 }, // KATAKANA LETTER HI + { 0x30D3, 0x0000 }, // KATAKANA LETTER BI + { 0x30D4, 0x0000 }, // KATAKANA LETTER PI + { 0x30D8, 0x0000 }, // KATAKANA LETTER HE + { 0x30D9, 0x0000 }, // KATAKANA LETTER BE + { 0x30DA, 0x0000 }, // KATAKANA LETTER PE + { 0x30DF, 0x0000 }, // KATAKANA LETTER MI + { 0x30E1, 0x0000 }, // KATAKANA LETTER ME + { 0x30EA, 0x0000 }, // KATAKANA LETTER RI + { 0x30EC, 0x0000 }, // KATAKANA LETTER RE + { 0x30F0, 0x0000 }, // KATAKANA LETTER WI + { 0x30F1, 0x0000 }, // KATAKANA LETTER WE + { 0x30F6, 0x0000 }, // KATAKANA LETTER SMALL KE + { 0x30F8, 0x0000 }, // KATAKANA LETTER VI + { 0x30F9, 0x0000 } // KATAKANA LETTER VE }; diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index bf2a8bff3f9e..e257ed9cc2b4 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -41,54 +41,54 @@ using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { OneToOneMappingTable_t ignoreIterationMark_ja_JP_mappingTable[] = { - MAKE_PAIR( 0x3046, 0x3094 ), // HIRAGANA LETTER U --> HIRAGANA LETTER VU - MAKE_PAIR( 0x304B, 0x304C ), // HIRAGANA LETTER KA --> HIRAGANA LETTER GA - MAKE_PAIR( 0x304D, 0x304E ), // HIRAGANA LETTER KI --> HIRAGANA LETTER GI - MAKE_PAIR( 0x304F, 0x3050 ), // HIRAGANA LETTER KU --> HIRAGANA LETTER GU - MAKE_PAIR( 0x3051, 0x3052 ), // HIRAGANA LETTER KE --> HIRAGANA LETTER GE - MAKE_PAIR( 0x3053, 0x3054 ), // HIRAGANA LETTER KO --> HIRAGANA LETTER GO - MAKE_PAIR( 0x3055, 0x3056 ), // HIRAGANA LETTER SA --> HIRAGANA LETTER ZA - MAKE_PAIR( 0x3057, 0x3058 ), // HIRAGANA LETTER SI --> HIRAGANA LETTER ZI - MAKE_PAIR( 0x3059, 0x305A ), // HIRAGANA LETTER SU --> HIRAGANA LETTER ZU - MAKE_PAIR( 0x305B, 0x305C ), // HIRAGANA LETTER SE --> HIRAGANA LETTER ZE - MAKE_PAIR( 0x305D, 0x305E ), // HIRAGANA LETTER SO --> HIRAGANA LETTER ZO - MAKE_PAIR( 0x305F, 0x3060 ), // HIRAGANA LETTER TA --> HIRAGANA LETTER DA - MAKE_PAIR( 0x3061, 0x3062 ), // HIRAGANA LETTER TI --> HIRAGANA LETTER DI - MAKE_PAIR( 0x3064, 0x3065 ), // HIRAGANA LETTER TU --> HIRAGANA LETTER DU - MAKE_PAIR( 0x3066, 0x3067 ), // HIRAGANA LETTER TE --> HIRAGANA LETTER DE - MAKE_PAIR( 0x3068, 0x3069 ), // HIRAGANA LETTER TO --> HIRAGANA LETTER DO - MAKE_PAIR( 0x306F, 0x3070 ), // HIRAGANA LETTER HA --> HIRAGANA LETTER BA - MAKE_PAIR( 0x3072, 0x3073 ), // HIRAGANA LETTER HI --> HIRAGANA LETTER BI - MAKE_PAIR( 0x3075, 0x3076 ), // HIRAGANA LETTER HU --> HIRAGANA LETTER BU - MAKE_PAIR( 0x3078, 0x3079 ), // HIRAGANA LETTER HE --> HIRAGANA LETTER BE - MAKE_PAIR( 0x307B, 0x307C ), // HIRAGANA LETTER HO --> HIRAGANA LETTER BO - MAKE_PAIR( 0x309D, 0x309E ), // HIRAGANA ITERATION MARK --> HIRAGANA VOICED ITERATION MARK - MAKE_PAIR( 0x30A6, 0x30F4 ), // KATAKANA LETTER U --> KATAKANA LETTER VU - MAKE_PAIR( 0x30AB, 0x30AC ), // KATAKANA LETTER KA --> KATAKANA LETTER GA - MAKE_PAIR( 0x30AD, 0x30AE ), // KATAKANA LETTER KI --> KATAKANA LETTER GI - MAKE_PAIR( 0x30AF, 0x30B0 ), // KATAKANA LETTER KU --> KATAKANA LETTER GU - MAKE_PAIR( 0x30B1, 0x30B2 ), // KATAKANA LETTER KE --> KATAKANA LETTER GE - MAKE_PAIR( 0x30B3, 0x30B4 ), // KATAKANA LETTER KO --> KATAKANA LETTER GO - MAKE_PAIR( 0x30B5, 0x30B6 ), // KATAKANA LETTER SA --> KATAKANA LETTER ZA - MAKE_PAIR( 0x30B7, 0x30B8 ), // KATAKANA LETTER SI --> KATAKANA LETTER ZI - MAKE_PAIR( 0x30B9, 0x30BA ), // KATAKANA LETTER SU --> KATAKANA LETTER ZU - MAKE_PAIR( 0x30BB, 0x30BC ), // KATAKANA LETTER SE --> KATAKANA LETTER ZE - MAKE_PAIR( 0x30BD, 0x30BE ), // KATAKANA LETTER SO --> KATAKANA LETTER ZO - MAKE_PAIR( 0x30BF, 0x30C0 ), // KATAKANA LETTER TA --> KATAKANA LETTER DA - MAKE_PAIR( 0x30C1, 0x30C2 ), // KATAKANA LETTER TI --> KATAKANA LETTER DI - MAKE_PAIR( 0x30C4, 0x30C5 ), // KATAKANA LETTER TU --> KATAKANA LETTER DU - MAKE_PAIR( 0x30C6, 0x30C7 ), // KATAKANA LETTER TE --> KATAKANA LETTER DE - MAKE_PAIR( 0x30C8, 0x30C9 ), // KATAKANA LETTER TO --> KATAKANA LETTER DO - MAKE_PAIR( 0x30CF, 0x30D0 ), // KATAKANA LETTER HA --> KATAKANA LETTER BA - MAKE_PAIR( 0x30D2, 0x30D3 ), // KATAKANA LETTER HI --> KATAKANA LETTER BI - MAKE_PAIR( 0x30D5, 0x30D6 ), // KATAKANA LETTER HU --> KATAKANA LETTER BU - MAKE_PAIR( 0x30D8, 0x30D9 ), // KATAKANA LETTER HE --> KATAKANA LETTER BE - MAKE_PAIR( 0x30DB, 0x30DC ), // KATAKANA LETTER HO --> KATAKANA LETTER BO - MAKE_PAIR( 0x30EF, 0x30F7 ), // KATAKANA LETTER WA --> KATAKANA LETTER VA - MAKE_PAIR( 0x30F0, 0x30F8 ), // KATAKANA LETTER WI --> KATAKANA LETTER VI - MAKE_PAIR( 0x30F1, 0x30F9 ), // KATAKANA LETTER WE --> KATAKANA LETTER VE - MAKE_PAIR( 0x30F2, 0x30FA ), // KATAKANA LETTER WO --> KATAKANA LETTER VO - MAKE_PAIR( 0x30FD, 0x30FE ) // KATAKANA ITERATION MARK --> KATAKANA VOICED ITERATION MARK + { 0x3046, 0x3094 }, // HIRAGANA LETTER U --> HIRAGANA LETTER VU + { 0x304B, 0x304C }, // HIRAGANA LETTER KA --> HIRAGANA LETTER GA + { 0x304D, 0x304E }, // HIRAGANA LETTER KI --> HIRAGANA LETTER GI + { 0x304F, 0x3050 }, // HIRAGANA LETTER KU --> HIRAGANA LETTER GU + { 0x3051, 0x3052 }, // HIRAGANA LETTER KE --> HIRAGANA LETTER GE + { 0x3053, 0x3054 }, // HIRAGANA LETTER KO --> HIRAGANA LETTER GO + { 0x3055, 0x3056 }, // HIRAGANA LETTER SA --> HIRAGANA LETTER ZA + { 0x3057, 0x3058 }, // HIRAGANA LETTER SI --> HIRAGANA LETTER ZI + { 0x3059, 0x305A }, // HIRAGANA LETTER SU --> HIRAGANA LETTER ZU + { 0x305B, 0x305C }, // HIRAGANA LETTER SE --> HIRAGANA LETTER ZE + { 0x305D, 0x305E }, // HIRAGANA LETTER SO --> HIRAGANA LETTER ZO + { 0x305F, 0x3060 }, // HIRAGANA LETTER TA --> HIRAGANA LETTER DA + { 0x3061, 0x3062 }, // HIRAGANA LETTER TI --> HIRAGANA LETTER DI + { 0x3064, 0x3065 }, // HIRAGANA LETTER TU --> HIRAGANA LETTER DU + { 0x3066, 0x3067 }, // HIRAGANA LETTER TE --> HIRAGANA LETTER DE + { 0x3068, 0x3069 }, // HIRAGANA LETTER TO --> HIRAGANA LETTER DO + { 0x306F, 0x3070 }, // HIRAGANA LETTER HA --> HIRAGANA LETTER BA + { 0x3072, 0x3073 }, // HIRAGANA LETTER HI --> HIRAGANA LETTER BI + { 0x3075, 0x3076 }, // HIRAGANA LETTER HU --> HIRAGANA LETTER BU + { 0x3078, 0x3079 }, // HIRAGANA LETTER HE --> HIRAGANA LETTER BE + { 0x307B, 0x307C }, // HIRAGANA LETTER HO --> HIRAGANA LETTER BO + { 0x309D, 0x309E }, // HIRAGANA ITERATION MARK --> HIRAGANA VOICED ITERATION MARK + { 0x30A6, 0x30F4 }, // KATAKANA LETTER U --> KATAKANA LETTER VU + { 0x30AB, 0x30AC }, // KATAKANA LETTER KA --> KATAKANA LETTER GA + { 0x30AD, 0x30AE }, // KATAKANA LETTER KI --> KATAKANA LETTER GI + { 0x30AF, 0x30B0 }, // KATAKANA LETTER KU --> KATAKANA LETTER GU + { 0x30B1, 0x30B2 }, // KATAKANA LETTER KE --> KATAKANA LETTER GE + { 0x30B3, 0x30B4 }, // KATAKANA LETTER KO --> KATAKANA LETTER GO + { 0x30B5, 0x30B6 }, // KATAKANA LETTER SA --> KATAKANA LETTER ZA + { 0x30B7, 0x30B8 }, // KATAKANA LETTER SI --> KATAKANA LETTER ZI + { 0x30B9, 0x30BA }, // KATAKANA LETTER SU --> KATAKANA LETTER ZU + { 0x30BB, 0x30BC }, // KATAKANA LETTER SE --> KATAKANA LETTER ZE + { 0x30BD, 0x30BE }, // KATAKANA LETTER SO --> KATAKANA LETTER ZO + { 0x30BF, 0x30C0 }, // KATAKANA LETTER TA --> KATAKANA LETTER DA + { 0x30C1, 0x30C2 }, // KATAKANA LETTER TI --> KATAKANA LETTER DI + { 0x30C4, 0x30C5 }, // KATAKANA LETTER TU --> KATAKANA LETTER DU + { 0x30C6, 0x30C7 }, // KATAKANA LETTER TE --> KATAKANA LETTER DE + { 0x30C8, 0x30C9 }, // KATAKANA LETTER TO --> KATAKANA LETTER DO + { 0x30CF, 0x30D0 }, // KATAKANA LETTER HA --> KATAKANA LETTER BA + { 0x30D2, 0x30D3 }, // KATAKANA LETTER HI --> KATAKANA LETTER BI + { 0x30D5, 0x30D6 }, // KATAKANA LETTER HU --> KATAKANA LETTER BU + { 0x30D8, 0x30D9 }, // KATAKANA LETTER HE --> KATAKANA LETTER BE + { 0x30DB, 0x30DC }, // KATAKANA LETTER HO --> KATAKANA LETTER BO + { 0x30EF, 0x30F7 }, // KATAKANA LETTER WA --> KATAKANA LETTER VA + { 0x30F0, 0x30F8 }, // KATAKANA LETTER WI --> KATAKANA LETTER VI + { 0x30F1, 0x30F9 }, // KATAKANA LETTER WE --> KATAKANA LETTER VE + { 0x30F2, 0x30FA }, // KATAKANA LETTER WO --> KATAKANA LETTER VO + { 0x30FD, 0x30FE } // KATAKANA ITERATION MARK --> KATAKANA VOICED ITERATION MARK }; diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx index 0a9a3323a1b3..84b7685eb5a6 100644 --- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx @@ -36,79 +36,79 @@ namespace com { namespace sun { namespace star { namespace i18n { OneToOneMappingTable_t ignoreSeparatorTable[] = { - MAKE_PAIR( 0x0021, 0xFFFF ), // EXCLAMATION MARK - MAKE_PAIR( 0x0023, 0xFFFF ), // NUMBER SIGN - MAKE_PAIR( 0x0024, 0xFFFF ), // DOLLAR SIGN - MAKE_PAIR( 0x0025, 0xFFFF ), // PERCENT SIGN - MAKE_PAIR( 0x0026, 0xFFFF ), // AMPERSAND - MAKE_PAIR( 0x002A, 0xFFFF ), // ASTERISK - MAKE_PAIR( 0x002B, 0xFFFF ), // PLUS SIGN - MAKE_PAIR( 0x002C, 0xFFFF ), // COMMA - MAKE_PAIR( 0x002D, 0xFFFF ), // HYPHEN-MINUS - MAKE_PAIR( 0x002E, 0xFFFF ), // FULL STOP - MAKE_PAIR( 0x002F, 0xFFFF ), // SOLIDUS - MAKE_PAIR( 0x003A, 0xFFFF ), // COLON - MAKE_PAIR( 0x003B, 0xFFFF ), // SEMICOLON - MAKE_PAIR( 0x003C, 0xFFFF ), // LESS-THAN SIGN - MAKE_PAIR( 0x003D, 0xFFFF ), // EQUALS SIGN - MAKE_PAIR( 0x003E, 0xFFFF ), // GREATER-THAN SIGN - MAKE_PAIR( 0x005C, 0xFFFF ), // REVERSE SOLIDUS - MAKE_PAIR( 0x005F, 0xFFFF ), // LOW LINE - MAKE_PAIR( 0x007B, 0xFFFF ), // LEFT CURLY BRACKET - MAKE_PAIR( 0x007C, 0xFFFF ), // VERTICAL LINE - MAKE_PAIR( 0x007D, 0xFFFF ), // RIGHT CURLY BRACKET - MAKE_PAIR( 0x007E, 0xFFFF ), // TILDE - MAKE_PAIR( 0x00A5, 0xFFFF ), // YEN SIGN - MAKE_PAIR( 0x3001, 0xFFFF ), // IDEOGRAPHIC COMMA - MAKE_PAIR( 0x3002, 0xFFFF ), // IDEOGRAPHIC FULL STOP - MAKE_PAIR( 0x3008, 0xFFFF ), // LEFT ANGLE BRACKET - MAKE_PAIR( 0x3009, 0xFFFF ), // RIGHT ANGLE BRACKET - MAKE_PAIR( 0x300A, 0xFFFF ), // LEFT DOUBLE ANGLE BRACKET - MAKE_PAIR( 0x300B, 0xFFFF ), // RIGHT DOUBLE ANGLE BRACKET - MAKE_PAIR( 0x300C, 0xFFFF ), // LEFT CORNER BRACKET - MAKE_PAIR( 0x300D, 0xFFFF ), // RIGHT CORNER BRACKET - MAKE_PAIR( 0x300E, 0xFFFF ), // LEFT WHITE CORNER BRACKET - MAKE_PAIR( 0x300F, 0xFFFF ), // RIGHT WHITE CORNER BRACKET - MAKE_PAIR( 0x3010, 0xFFFF ), // LEFT BLACK LENTICULAR BRACKET - MAKE_PAIR( 0x3011, 0xFFFF ), // RIGHT BLACK LENTICULAR BRACKET - MAKE_PAIR( 0x3014, 0xFFFF ), // LEFT TORTOISE SHELL BRACKET - MAKE_PAIR( 0x3015, 0xFFFF ), // RIGHT TORTOISE SHELL BRACKET - MAKE_PAIR( 0x3016, 0xFFFF ), // LEFT WHITE LENTICULAR BLACKET - MAKE_PAIR( 0x3017, 0xFFFF ), // RIGHT WHITE LENTICULAR BLACKET - MAKE_PAIR( 0x3018, 0xFFFF ), // LEFT WHITETORTOISE SHELL BLACKET - MAKE_PAIR( 0x3019, 0xFFFF ), // RIGHT WHITETORTOISE SHELL BLACKET - MAKE_PAIR( 0x301A, 0xFFFF ), // LEFT WHITE SQUARE BRACKET - MAKE_PAIR( 0x301B, 0xFFFF ), // RIGHT WHITE SQUARE BRACKET - MAKE_PAIR( 0x301C, 0xFFFF ), // WAVE DASH - MAKE_PAIR( 0x301D, 0xFFFF ), // REVERSED DOUBLE PRIME - MAKE_PAIR( 0x301E, 0xFFFF ), // DOUBLE PRIME QUOTATION MARK - MAKE_PAIR( 0x301F, 0xFFFF ), // LOW DOUBLE PRIME QUOTATION MARK - MAKE_PAIR( 0x3030, 0xFFFF ), // WAVY DASH - MAKE_PAIR( 0x30FB, 0xFFFF ), // KATAKANA MIDDLE DOT - MAKE_PAIR( 0x30FC, 0xFFFF ), // KATAKANA-HIRAHANA PROLONGED SOUND MARK - MAKE_PAIR( 0xFF01, 0xFFFF ), // FULLWIDTH EXCLAMATION MARK - MAKE_PAIR( 0xFF03, 0xFFFF ), // FULLWIDTH NUMBER SIGN - MAKE_PAIR( 0xFF04, 0xFFFF ), // FULLWIDTH DOLLAR SIGN - MAKE_PAIR( 0xFF05, 0xFFFF ), // FULLWIDTH PERCENT SIGN - MAKE_PAIR( 0xFF06, 0xFFFF ), // FULLWIDTH AMPERSAND - MAKE_PAIR( 0xFF0A, 0xFFFF ), // FULLWIDTH ASTERISK - MAKE_PAIR( 0xFF0B, 0xFFFF ), // FULLWIDTH PLUS SIGN - MAKE_PAIR( 0xFF0C, 0xFFFF ), // FULLWIDTH COMMA - MAKE_PAIR( 0xFF0D, 0xFFFF ), // FULLWIDTH HYPHEN-MINUS - MAKE_PAIR( 0xFF0E, 0xFFFF ), // FULLWIDTH FULL STOP - MAKE_PAIR( 0xFF0F, 0xFFFF ), // FULLWIDTH SOLIDUS - MAKE_PAIR( 0xFF1A, 0xFFFF ), // FULLWIDTH COLON - MAKE_PAIR( 0xFF1B, 0xFFFF ), // FULLWIDTH SEMICOLON - MAKE_PAIR( 0xFF1C, 0xFFFF ), // FULLWIDTH LESS-THAN SIGN - MAKE_PAIR( 0xFF1D, 0xFFFF ), // FULLWIDTH EQUALS SIGN - MAKE_PAIR( 0xFF1E, 0xFFFF ), // FULLWIDTH GREATER-THAN SIGN - MAKE_PAIR( 0xFF3C, 0xFFFF ), // FULLWIDTH REVERSE SOLIDUS - MAKE_PAIR( 0xFF3F, 0xFFFF ), // FULLWIDTH LOW LINE - MAKE_PAIR( 0xFF5B, 0xFFFF ), // FULLWIDTH LEFT CURLY BRACKET - MAKE_PAIR( 0xFF5C, 0xFFFF ), // FULLWIDTH VERTICAL LINE - MAKE_PAIR( 0xFF5D, 0xFFFF ), // FULLWIDTH RIGHT CURLY BRACKET - MAKE_PAIR( 0xFF5E, 0xFFFF ), // FULLWIDTH TILDE - MAKE_PAIR( 0xFFE5, 0xFFFF ), // FULLWIDTH YEN SIGN + { 0x0021, 0xFFFF }, // EXCLAMATION MARK + { 0x0023, 0xFFFF }, // NUMBER SIGN + { 0x0024, 0xFFFF }, // DOLLAR SIGN + { 0x0025, 0xFFFF }, // PERCENT SIGN + { 0x0026, 0xFFFF }, // AMPERSAND + { 0x002A, 0xFFFF }, // ASTERISK + { 0x002B, 0xFFFF }, // PLUS SIGN + { 0x002C, 0xFFFF }, // COMMA + { 0x002D, 0xFFFF }, // HYPHEN-MINUS + { 0x002E, 0xFFFF }, // FULL STOP + { 0x002F, 0xFFFF }, // SOLIDUS + { 0x003A, 0xFFFF }, // COLON + { 0x003B, 0xFFFF }, // SEMICOLON + { 0x003C, 0xFFFF }, // LESS-THAN SIGN + { 0x003D, 0xFFFF }, // EQUALS SIGN + { 0x003E, 0xFFFF }, // GREATER-THAN SIGN + { 0x005C, 0xFFFF }, // REVERSE SOLIDUS + { 0x005F, 0xFFFF }, // LOW LINE + { 0x007B, 0xFFFF }, // LEFT CURLY BRACKET + { 0x007C, 0xFFFF }, // VERTICAL LINE + { 0x007D, 0xFFFF }, // RIGHT CURLY BRACKET + { 0x007E, 0xFFFF }, // TILDE + { 0x00A5, 0xFFFF }, // YEN SIGN + { 0x3001, 0xFFFF }, // IDEOGRAPHIC COMMA + { 0x3002, 0xFFFF }, // IDEOGRAPHIC FULL STOP + { 0x3008, 0xFFFF }, // LEFT ANGLE BRACKET + { 0x3009, 0xFFFF }, // RIGHT ANGLE BRACKET + { 0x300A, 0xFFFF }, // LEFT DOUBLE ANGLE BRACKET + { 0x300B, 0xFFFF }, // RIGHT DOUBLE ANGLE BRACKET + { 0x300C, 0xFFFF }, // LEFT CORNER BRACKET + { 0x300D, 0xFFFF }, // RIGHT CORNER BRACKET + { 0x300E, 0xFFFF }, // LEFT WHITE CORNER BRACKET + { 0x300F, 0xFFFF }, // RIGHT WHITE CORNER BRACKET + { 0x3010, 0xFFFF }, // LEFT BLACK LENTICULAR BRACKET + { 0x3011, 0xFFFF }, // RIGHT BLACK LENTICULAR BRACKET + { 0x3014, 0xFFFF }, // LEFT TORTOISE SHELL BRACKET + { 0x3015, 0xFFFF }, // RIGHT TORTOISE SHELL BRACKET + { 0x3016, 0xFFFF }, // LEFT WHITE LENTICULAR BLACKET + { 0x3017, 0xFFFF }, // RIGHT WHITE LENTICULAR BLACKET + { 0x3018, 0xFFFF }, // LEFT WHITETORTOISE SHELL BLACKET + { 0x3019, 0xFFFF }, // RIGHT WHITETORTOISE SHELL BLACKET + { 0x301A, 0xFFFF }, // LEFT WHITE SQUARE BRACKET + { 0x301B, 0xFFFF }, // RIGHT WHITE SQUARE BRACKET + { 0x301C, 0xFFFF }, // WAVE DASH + { 0x301D, 0xFFFF }, // REVERSED DOUBLE PRIME + { 0x301E, 0xFFFF }, // DOUBLE PRIME QUOTATION MARK + { 0x301F, 0xFFFF }, // LOW DOUBLE PRIME QUOTATION MARK + { 0x3030, 0xFFFF }, // WAVY DASH + { 0x30FB, 0xFFFF }, // KATAKANA MIDDLE DOT + { 0x30FC, 0xFFFF }, // KATAKANA-HIRAHANA PROLONGED SOUND MARK + { 0xFF01, 0xFFFF }, // FULLWIDTH EXCLAMATION MARK + { 0xFF03, 0xFFFF }, // FULLWIDTH NUMBER SIGN + { 0xFF04, 0xFFFF }, // FULLWIDTH DOLLAR SIGN + { 0xFF05, 0xFFFF }, // FULLWIDTH PERCENT SIGN + { 0xFF06, 0xFFFF }, // FULLWIDTH AMPERSAND + { 0xFF0A, 0xFFFF }, // FULLWIDTH ASTERISK + { 0xFF0B, 0xFFFF }, // FULLWIDTH PLUS SIGN + { 0xFF0C, 0xFFFF }, // FULLWIDTH COMMA + { 0xFF0D, 0xFFFF }, // FULLWIDTH HYPHEN-MINUS + { 0xFF0E, 0xFFFF }, // FULLWIDTH FULL STOP + { 0xFF0F, 0xFFFF }, // FULLWIDTH SOLIDUS + { 0xFF1A, 0xFFFF }, // FULLWIDTH COLON + { 0xFF1B, 0xFFFF }, // FULLWIDTH SEMICOLON + { 0xFF1C, 0xFFFF }, // FULLWIDTH LESS-THAN SIGN + { 0xFF1D, 0xFFFF }, // FULLWIDTH EQUALS SIGN + { 0xFF1E, 0xFFFF }, // FULLWIDTH GREATER-THAN SIGN + { 0xFF3C, 0xFFFF }, // FULLWIDTH REVERSE SOLIDUS + { 0xFF3F, 0xFFFF }, // FULLWIDTH LOW LINE + { 0xFF5B, 0xFFFF }, // FULLWIDTH LEFT CURLY BRACKET + { 0xFF5C, 0xFFFF }, // FULLWIDTH VERTICAL LINE + { 0xFF5D, 0xFFFF }, // FULLWIDTH RIGHT CURLY BRACKET + { 0xFF5E, 0xFFFF }, // FULLWIDTH TILDE + { 0xFFE5, 0xFFFF }, // FULLWIDTH YEN SIGN }; ignoreSeparator_ja_JP::ignoreSeparator_ja_JP() diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx index 140a8f0660fc..617c54042d6c 100644 --- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx @@ -36,21 +36,21 @@ namespace com { namespace sun { namespace star { namespace i18n { OneToOneMappingTable_t ignoreSpace_ja_JP_mappingTable[] = { - MAKE_PAIR( 0x0020, 0xffff ), // SPACE - MAKE_PAIR( 0x00A0, 0xffff ), // NO-BREAK SPACE - MAKE_PAIR( 0x2002, 0xffff ), // EN SPACE - MAKE_PAIR( 0x2003, 0xffff ), // EM SPACE - MAKE_PAIR( 0x2004, 0xffff ), // THREE-PER-EM SPACE - MAKE_PAIR( 0x2005, 0xffff ), // FOUR-PER-EM SPACE - MAKE_PAIR( 0x2006, 0xffff ), // SIX-PER-EM SPACE - MAKE_PAIR( 0x2007, 0xffff ), // FIGURE SPACE - MAKE_PAIR( 0x2008, 0xffff ), // PUNCTUATION SPACE - MAKE_PAIR( 0x2009, 0xffff ), // THIN SPACE - MAKE_PAIR( 0x200A, 0xffff ), // HAIR SPACE - MAKE_PAIR( 0x200B, 0xffff ), // ZERO WIDTH SPACE - MAKE_PAIR( 0x202F, 0xffff ), // NARROW NO-BREAK SPACE - MAKE_PAIR( 0x3000, 0xffff ), // IDEOGRAPHIC SPACE - MAKE_PAIR( 0x303F, 0xffff ) // IDEOGRAPHIC HALF FILL SPACE + { 0x0020, 0xffff }, // SPACE + { 0x00A0, 0xffff }, // NO-BREAK SPACE + { 0x2002, 0xffff }, // EN SPACE + { 0x2003, 0xffff }, // EM SPACE + { 0x2004, 0xffff }, // THREE-PER-EM SPACE + { 0x2005, 0xffff }, // FOUR-PER-EM SPACE + { 0x2006, 0xffff }, // SIX-PER-EM SPACE + { 0x2007, 0xffff }, // FIGURE SPACE + { 0x2008, 0xffff }, // PUNCTUATION SPACE + { 0x2009, 0xffff }, // THIN SPACE + { 0x200A, 0xffff }, // HAIR SPACE + { 0x200B, 0xffff }, // ZERO WIDTH SPACE + { 0x202F, 0xffff }, // NARROW NO-BREAK SPACE + { 0x3000, 0xffff }, // IDEOGRAPHIC SPACE + { 0x303F, 0xffff } // IDEOGRAPHIC HALF FILL SPACE }; diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx index 85a9df56641b..abce67a22112 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx @@ -37,700 +37,700 @@ namespace com { namespace sun { namespace star { namespace i18n { // traditional Kanji characters --> modern Kanji characters OneToOneMappingTable_t traditionalKanji2updateKanji[] = { - MAKE_PAIR( 0x4E17, 0x4E16 ), - MAKE_PAIR( 0x4E55, 0x864E ), - MAKE_PAIR( 0x4E58, 0x4E57 ), - MAKE_PAIR( 0x4E82, 0x4E71 ), - MAKE_PAIR( 0x4E8A, 0x4E8B ), - MAKE_PAIR( 0x4E98, 0x4E99 ), - MAKE_PAIR( 0x4E9F, 0x6975 ), - MAKE_PAIR( 0x4EB0, 0x4EAC ), - MAKE_PAIR( 0x4EC2, 0x50CD ), - MAKE_PAIR( 0x4ECE, 0x5F93 ), - MAKE_PAIR( 0x4EED, 0x4EDE ), - MAKE_PAIR( 0x4F1C, 0x5005 ), - MAKE_PAIR( 0x4F5B, 0x4ECF ), - MAKE_PAIR( 0x4F86, 0x6765 ), - MAKE_PAIR( 0x4FAB, 0x4F5E ), - MAKE_PAIR( 0x5047, 0x4EEE ), - MAKE_PAIR( 0x509A, 0x52B9 ), - MAKE_PAIR( 0x50B3, 0x4F1D ), - MAKE_PAIR( 0x50DE, 0x507D ), - MAKE_PAIR( 0x50E3, 0x50ED ), - MAKE_PAIR( 0x50F9, 0x4FA1 ), - MAKE_PAIR( 0x5109, 0x5039 ), - MAKE_PAIR( 0x5118, 0x4FAD ), - MAKE_PAIR( 0x5152, 0x5150 ), - MAKE_PAIR( 0x5154, 0x514E ), - MAKE_PAIR( 0x5169, 0x4E21 ), - MAKE_PAIR( 0x518C, 0x518A ), - MAKE_PAIR( 0x5190, 0x5192 ), - MAKE_PAIR( 0x51A8, 0x5BCC ), - MAKE_PAIR( 0x51A9, 0x5199 ), - MAKE_PAIR( 0x51B0, 0x6C37 ), - MAKE_PAIR( 0x51B1, 0x51B4 ), - MAKE_PAIR( 0x51B2, 0x6C96 ), - MAKE_PAIR( 0x51B3, 0x6C7A ), - MAKE_PAIR( 0x51B5, 0x6CC1 ), - MAKE_PAIR( 0x51C9, 0x6DBC ), - MAKE_PAIR( 0x51D6, 0x6E96 ), - MAKE_PAIR( 0x51DC, 0x51DB ), - MAKE_PAIR( 0x51FE, 0x51FD ), - MAKE_PAIR( 0x5204, 0x5203 ), - MAKE_PAIR( 0x5227, 0x52AB ), - MAKE_PAIR( 0x5269, 0x5270 ), - MAKE_PAIR( 0x5271, 0x5263 ), - MAKE_PAIR( 0x5283, 0x753B ), - MAKE_PAIR( 0x528D, 0x5263 ), - MAKE_PAIR( 0x5291, 0x5264 ), - MAKE_PAIR( 0x5292, 0x5263 ), - MAKE_PAIR( 0x5294, 0x5263 ), - MAKE_PAIR( 0x52B5, 0x5238 ), - MAKE_PAIR( 0x52DE, 0x52B4 ), - MAKE_PAIR( 0x52F3, 0x52F2 ), - MAKE_PAIR( 0x52F5, 0x52B1 ), - MAKE_PAIR( 0x52F8, 0x52E7 ), - MAKE_PAIR( 0x5340, 0x533A ), - MAKE_PAIR( 0x5346, 0x5352 ), - MAKE_PAIR( 0x5377, 0x5DFB ), - MAKE_PAIR( 0x537B, 0x5374 ), - MAKE_PAIR( 0x53B0, 0x5EE0 ), - MAKE_PAIR( 0x53C3, 0x53C2 ), - MAKE_PAIR( 0x548F, 0x8A60 ), - MAKE_PAIR( 0x5492, 0x546A ), - MAKE_PAIR( 0x54AF, 0x5580 ), - MAKE_PAIR( 0x54E5, 0x6B4C ), - MAKE_PAIR( 0x5557, 0x5556 ), - MAKE_PAIR( 0x55AE, 0x5358 ), - MAKE_PAIR( 0x5650, 0x5668 ), - MAKE_PAIR( 0x5680, 0x5BE7 ), - MAKE_PAIR( 0x568F, 0x5694 ), - MAKE_PAIR( 0x56B4, 0x53B3 ), - MAKE_PAIR( 0x56D1, 0x5631 ), - MAKE_PAIR( 0x56D8, 0x56DE ), - MAKE_PAIR( 0x5708, 0x570F ), - MAKE_PAIR( 0x570B, 0x56FD ), - MAKE_PAIR( 0x570D, 0x56F2 ), - MAKE_PAIR( 0x5713, 0x5186 ), - MAKE_PAIR( 0x5716, 0x56F3 ), - MAKE_PAIR( 0x5718, 0x56E3 ), - MAKE_PAIR( 0x57C0, 0x5782 ), - MAKE_PAIR( 0x57D3, 0x57D2 ), - MAKE_PAIR( 0x57FC, 0x5D0E ), - MAKE_PAIR( 0x582F, 0x5C2D ), - MAKE_PAIR( 0x5872, 0x5834 ), - MAKE_PAIR( 0x58AE, 0x5815 ), - MAKE_PAIR( 0x58D3, 0x5727 ), - MAKE_PAIR( 0x58D8, 0x5841 ), - MAKE_PAIR( 0x58DE, 0x58CA ), - MAKE_PAIR( 0x58E4, 0x58CC ), - MAKE_PAIR( 0x58EF, 0x58EE ), - MAKE_PAIR( 0x58F1, 0x4E00 ), - MAKE_PAIR( 0x58F9, 0x4E00 ), - MAKE_PAIR( 0x58FA, 0x58F7 ), - MAKE_PAIR( 0x58FB, 0x5A7F ), - MAKE_PAIR( 0x58FD, 0x5BFF ), - MAKE_PAIR( 0x5918, 0x536F ), - MAKE_PAIR( 0x591B, 0x591A ), - MAKE_PAIR( 0x5932, 0x672C ), - MAKE_PAIR( 0x5967, 0x5965 ), - MAKE_PAIR( 0x5969, 0x5333 ), - MAKE_PAIR( 0x596C, 0x5968 ), - MAKE_PAIR( 0x59D9, 0x598A ), - MAKE_PAIR( 0x5A6C, 0x6DEB ), - MAKE_PAIR( 0x5AD0, 0x5B32 ), - MAKE_PAIR( 0x5AFB, 0x5AFA ), - MAKE_PAIR( 0x5B43, 0x5B22 ), - MAKE_PAIR( 0x5B78, 0x5B66 ), - // MAKE_PAIR( 0x5B9D, 0x73CD ), - MAKE_PAIR( 0x5BC3, 0x51A4 ), - MAKE_PAIR( 0x5BC7, 0x51A6 ), - MAKE_PAIR( 0x5BC9, 0x9DB4 ), - MAKE_PAIR( 0x5BE2, 0x5BDD ), - MAKE_PAIR( 0x5BE6, 0x5B9F ), - MAKE_PAIR( 0x5BEB, 0x5199 ), - //MAKE_PAIR( 0x5BF3, 0x73CD ), - MAKE_PAIR( 0x5BF3, 0x5B9D ), - //MAKE_PAIR( 0x5BF6, 0x73CD ), - MAKE_PAIR( 0x5BF6, 0x5B9D ), - MAKE_PAIR( 0x5C05, 0x524B ), - MAKE_PAIR( 0x5C07, 0x5C06 ), - MAKE_PAIR( 0x5C08, 0x5C02 ), - MAKE_PAIR( 0x5C0D, 0x5BFE ), - MAKE_PAIR( 0x5C13, 0x723E ), - MAKE_PAIR( 0x5C46, 0x5C4A ), - MAKE_PAIR( 0x5C6C, 0x5C5E ), - MAKE_PAIR( 0x5CE9, 0x5CE8 ), - MAKE_PAIR( 0x5CEF, 0x5CF0 ), - MAKE_PAIR( 0x5CFD, 0x5CE1 ), - MAKE_PAIR( 0x5D15, 0x5D16 ), - MAKE_PAIR( 0x5D17, 0x5CA1 ), - MAKE_PAIR( 0x5D18, 0x5D19 ), - MAKE_PAIR( 0x5D5C, 0x5D0E ), - MAKE_PAIR( 0x5D73, 0x5D6F ), - MAKE_PAIR( 0x5D8B, 0x5CF6 ), - MAKE_PAIR( 0x5D8C, 0x5CF6 ), - MAKE_PAIR( 0x5DBD, 0x5CB3 ), - MAKE_PAIR( 0x5DD6, 0x5DCC ), - MAKE_PAIR( 0x5DDB, 0x5DDD ), - MAKE_PAIR( 0x5DF5, 0x536E ), - MAKE_PAIR( 0x5E0B, 0x7D19 ), - MAKE_PAIR( 0x5E36, 0x5E2F ), - MAKE_PAIR( 0x5E64, 0x5E63 ), - MAKE_PAIR( 0x5EC1, 0x53A0 ), - MAKE_PAIR( 0x5EC8, 0x53A6 ), - MAKE_PAIR( 0x5ECF, 0x53A9 ), - MAKE_PAIR( 0x5ED0, 0x53A9 ), - MAKE_PAIR( 0x5EDA, 0x53A8 ), - MAKE_PAIR( 0x5EDD, 0x53AE ), - MAKE_PAIR( 0x5EE2, 0x5EC3 ), - MAKE_PAIR( 0x5EE3, 0x5E83 ), - MAKE_PAIR( 0x5EF0, 0x5E81 ), - MAKE_PAIR( 0x5EF3, 0x5E81 ), - MAKE_PAIR( 0x5F03, 0x68C4 ), - MAKE_PAIR( 0x5F09, 0x5958 ), - MAKE_PAIR( 0x5F0C, 0x4E00 ), - MAKE_PAIR( 0x5F0D, 0x4E8C ), - MAKE_PAIR( 0x5F10, 0x4E8C ), - MAKE_PAIR( 0x5F2F, 0x6E7E ), - MAKE_PAIR( 0x5F48, 0x5F3E ), - MAKE_PAIR( 0x5F4C, 0x5F25 ), - MAKE_PAIR( 0x5F4E, 0x6E7E ), - MAKE_PAIR( 0x5F5C, 0x5F5D ), - MAKE_PAIR( 0x5F83, 0x5F80 ), - MAKE_PAIR( 0x5F91, 0x5F84 ), - MAKE_PAIR( 0x5F9E, 0x5F93 ), - MAKE_PAIR( 0x5FA0, 0x6765 ), - MAKE_PAIR( 0x5FF0, 0x60B4 ), - MAKE_PAIR( 0x5FFB, 0x6B23 ), - MAKE_PAIR( 0x6046, 0x6052 ), - MAKE_PAIR( 0x604A, 0x5354 ), - MAKE_PAIR( 0x6060, 0x602A ), - MAKE_PAIR( 0x60B3, 0x5FB3 ), - MAKE_PAIR( 0x60E0, 0x6075 ), - MAKE_PAIR( 0x60E1, 0x60AA ), - MAKE_PAIR( 0x60F1, 0x60A9 ), - MAKE_PAIR( 0x613C, 0x614E ), - MAKE_PAIR( 0x613D, 0x535A ), - MAKE_PAIR( 0x6158, 0x60E8 ), - MAKE_PAIR( 0x615A, 0x6159 ), - MAKE_PAIR( 0x6187, 0x61A9 ), - MAKE_PAIR( 0x61C9, 0x5FDC ), - MAKE_PAIR( 0x61F4, 0x61FA ), - MAKE_PAIR( 0x61F7, 0x61D0 ), - MAKE_PAIR( 0x6200, 0x604B ), - MAKE_PAIR( 0x621D, 0x8CA1 ), - MAKE_PAIR( 0x621E, 0x621B ), - MAKE_PAIR( 0x6230, 0x6226 ), - MAKE_PAIR( 0x6232, 0x622F ), - MAKE_PAIR( 0x6268, 0x6260 ), - MAKE_PAIR( 0x62AC, 0x64E1 ), - MAKE_PAIR( 0x62C2, 0x6255 ), - MAKE_PAIR( 0x62D4, 0x629C ), - MAKE_PAIR( 0x62DC, 0x62DD ), - MAKE_PAIR( 0x633E, 0x631F ), - MAKE_PAIR( 0x63D2, 0x633F ), - MAKE_PAIR( 0x6416, 0x63FA ), - MAKE_PAIR( 0x641C, 0x635C ), - MAKE_PAIR( 0x64C7, 0x629E ), - MAKE_PAIR( 0x64D4, 0x62C5 ), - MAKE_PAIR( 0x64DA, 0x62E0 ), - MAKE_PAIR( 0x64E7, 0x6319 ), - MAKE_PAIR( 0x64F4, 0x62E1 ), - MAKE_PAIR( 0x651C, 0x643A ), - MAKE_PAIR( 0x651D, 0x6442 ), - MAKE_PAIR( 0x652A, 0x64B9 ), - MAKE_PAIR( 0x6536, 0x53CE ), - MAKE_PAIR( 0x6548, 0x52B9 ), - MAKE_PAIR( 0x654D, 0x53D9 ), - MAKE_PAIR( 0x6555, 0x52C5 ), - MAKE_PAIR( 0x6558, 0x53D9 ), - MAKE_PAIR( 0x6578, 0x6570 ), - MAKE_PAIR( 0x6588, 0x5B66 ), - MAKE_PAIR( 0x6589, 0x658E ), - MAKE_PAIR( 0x65B7, 0x65AD ), - MAKE_PAIR( 0x65D9, 0x65DB ), - MAKE_PAIR( 0x663F, 0x66E0 ), - MAKE_PAIR( 0x6644, 0x6643 ), - MAKE_PAIR( 0x6649, 0x664B ), - MAKE_PAIR( 0x665D, 0x663C ), - MAKE_PAIR( 0x668E, 0x6620 ), - MAKE_PAIR( 0x66B8, 0x77AD ), - MAKE_PAIR( 0x66C9, 0x6681 ), - MAKE_PAIR( 0x66F0, 0x4E91 ), - MAKE_PAIR( 0x66F5, 0x66F3 ), - MAKE_PAIR( 0x66FD, 0x66FE ), - MAKE_PAIR( 0x6703, 0x4F1A ), - MAKE_PAIR( 0x6716, 0x6717 ), - MAKE_PAIR( 0x671E, 0x671F ), - MAKE_PAIR( 0x6764, 0x6803 ), - MAKE_PAIR( 0x67A1, 0x685D ), - MAKE_PAIR( 0x67A6, 0x6AE8 ), - MAKE_PAIR( 0x67A9, 0x677E ), - MAKE_PAIR( 0x67CF, 0x6822 ), - MAKE_PAIR( 0x6816, 0x68F2 ), - MAKE_PAIR( 0x6840, 0x685D ), - MAKE_PAIR( 0x689D, 0x6761 ), - MAKE_PAIR( 0x68A6, 0x5922 ), - MAKE_PAIR( 0x68CA, 0x68CB ), - MAKE_PAIR( 0x68E7, 0x685F ), - MAKE_PAIR( 0x6936, 0x68D5 ), - MAKE_PAIR( 0x695D, 0x68DF ), - MAKE_PAIR( 0x6973, 0x6885 ), - MAKE_PAIR( 0x69AE, 0x6804 ), - MAKE_PAIR( 0x69C7, 0x69D9 ), - MAKE_PAIR( 0x6A02, 0x697D ), - MAKE_PAIR( 0x6A13, 0x697C ), - MAKE_PAIR( 0x6A1E, 0x67A2 ), - MAKE_PAIR( 0x6A23, 0x69D8 ), - MAKE_PAIR( 0x6A62, 0x6955 ), - MAKE_PAIR( 0x6A9C, 0x6867 ), - MAKE_PAIR( 0x6AA2, 0x691C ), - MAKE_PAIR( 0x6AAA, 0x6ADF ), - MAKE_PAIR( 0x6AAE, 0x68BC ), - MAKE_PAIR( 0x6AB3, 0x68B9 ), - MAKE_PAIR( 0x6AC1, 0x6A12 ), - MAKE_PAIR( 0x6AFB, 0x685C ), - MAKE_PAIR( 0x6B0A, 0x6A29 ), - MAKE_PAIR( 0x6B50, 0x6B27 ), - MAKE_PAIR( 0x6B61, 0x6B53 ), - MAKE_PAIR( 0x6B78, 0x5E30 ), - MAKE_PAIR( 0x6B7F, 0x6CA1 ), - MAKE_PAIR( 0x6B98, 0x6B8B ), - MAKE_PAIR( 0x6BB1, 0x6BB2 ), - MAKE_PAIR( 0x6BBC, 0x6BBB ), - MAKE_PAIR( 0x6BC6, 0x6BB4 ), - MAKE_PAIR( 0x6BCB, 0x6BCD ), - MAKE_PAIR( 0x6BD3, 0x80B2 ), - MAKE_PAIR( 0x6C23, 0x6C17 ), - MAKE_PAIR( 0x6C8D, 0x51B4 ), - MAKE_PAIR( 0x6C92, 0x6CA1 ), - MAKE_PAIR( 0x6CEA, 0x6D99 ), - MAKE_PAIR( 0x6D0C, 0x51BD ), - MAKE_PAIR( 0x6D35, 0x5F87 ), - MAKE_PAIR( 0x6D79, 0x5CE1 ), - MAKE_PAIR( 0x6D8C, 0x6E67 ), - MAKE_PAIR( 0x6DB8, 0x51C5 ), - MAKE_PAIR( 0x6DD2, 0x51C4 ), - MAKE_PAIR( 0x6DE8, 0x6D44 ), - MAKE_PAIR( 0x6DFA, 0x6D45 ), - MAKE_PAIR( 0x6E0A, 0x6DF5 ), - MAKE_PAIR( 0x6E15, 0x6DF5 ), - MAKE_PAIR( 0x6EAA, 0x6E13 ), - MAKE_PAIR( 0x6EAF, 0x9061 ), - MAKE_PAIR( 0x6EEF, 0x6EDE ), - MAKE_PAIR( 0x6EFF, 0x6E80 ), - MAKE_PAIR( 0x6F5B, 0x6F5C ), - MAKE_PAIR( 0x6F74, 0x7026 ), - MAKE_PAIR( 0x6F80, 0x6E0B ), - MAKE_PAIR( 0x6F81, 0x6E0B ), - MAKE_PAIR( 0x6F82, 0x6F84 ), - MAKE_PAIR( 0x6F91, 0x6E9C ), - MAKE_PAIR( 0x6FA4, 0x6CA2 ), - MAKE_PAIR( 0x6FD5, 0x6E7F ), - MAKE_PAIR( 0x6FDF, 0x6E08 ), - MAKE_PAIR( 0x6FE4, 0x6D9B ), - MAKE_PAIR( 0x6FF1, 0x6D5C ), - MAKE_PAIR( 0x6FF3, 0x6F5C ), - MAKE_PAIR( 0x6FF6, 0x95CA ), - MAKE_PAIR( 0x7027, 0x6EDD ), - MAKE_PAIR( 0x7030, 0x6FD4 ), - MAKE_PAIR( 0x704C, 0x6F45 ), - MAKE_PAIR( 0x7063, 0x6E7E ), - MAKE_PAIR( 0x70CB, 0x6077 ), - MAKE_PAIR( 0x70DF, 0x7159 ), - MAKE_PAIR( 0x70F1, 0x70AF ), - MAKE_PAIR( 0x7188, 0x7155 ), - MAKE_PAIR( 0x7199, 0x7155 ), - MAKE_PAIR( 0x71C8, 0x706F ), - MAKE_PAIR( 0x71D2, 0x713C ), - MAKE_PAIR( 0x71DF, 0x55B6 ), - MAKE_PAIR( 0x71FB, 0x718F ), - MAKE_PAIR( 0x71FF, 0x8000 ), - MAKE_PAIR( 0x7210, 0x7089 ), - MAKE_PAIR( 0x722D, 0x4E89 ), - MAKE_PAIR( 0x7232, 0x70BA ), - MAKE_PAIR( 0x723C, 0x4FCE ), - MAKE_PAIR( 0x7246, 0x58BB ), - MAKE_PAIR( 0x7281, 0x7282 ), - MAKE_PAIR( 0x72A7, 0x72A0 ), - MAKE_PAIR( 0x72E2, 0x72F8 ), - MAKE_PAIR( 0x72F9, 0x72ED ), - MAKE_PAIR( 0x734E, 0x5968 ), - MAKE_PAIR( 0x7368, 0x72EC ), - MAKE_PAIR( 0x7375, 0x731F ), - MAKE_PAIR( 0x7378, 0x7363 ), - MAKE_PAIR( 0x737B, 0x732E ), - MAKE_PAIR( 0x73CE, 0x73CD ), - MAKE_PAIR( 0x73F1, 0x74D4 ), - MAKE_PAIR( 0x7464, 0x7476 ), - MAKE_PAIR( 0x746F, 0x7405 ), - MAKE_PAIR( 0x74A2, 0x7460 ), - MAKE_PAIR( 0x74E3, 0x5F01 ), - MAKE_PAIR( 0x751E, 0x5617 ), - MAKE_PAIR( 0x753C, 0x753A ), - MAKE_PAIR( 0x7544, 0x7559 ), - MAKE_PAIR( 0x7546, 0x755D ), - MAKE_PAIR( 0x754A, 0x8015 ), - MAKE_PAIR( 0x754D, 0x754C ), - MAKE_PAIR( 0x7567, 0x7565 ), - MAKE_PAIR( 0x756B, 0x753B ), - MAKE_PAIR( 0x7574, 0x7587 ), - MAKE_PAIR( 0x7576, 0x5F53 ), - MAKE_PAIR( 0x7582, 0x7573 ), - MAKE_PAIR( 0x7589, 0x7573 ), - MAKE_PAIR( 0x758A, 0x7573 ), - MAKE_PAIR( 0x7609, 0x7652 ), - MAKE_PAIR( 0x7661, 0x75F4 ), - MAKE_PAIR( 0x767C, 0x767A ), - MAKE_PAIR( 0x7683, 0x8C8C ), - MAKE_PAIR( 0x7688, 0x5E30 ), - MAKE_PAIR( 0x768B, 0x7690 ), - MAKE_PAIR( 0x7693, 0x6667 ), - MAKE_PAIR( 0x76B7, 0x9F13 ), - MAKE_PAIR( 0x76B9, 0x76B8 ), - MAKE_PAIR( 0x76C3, 0x676F ), - MAKE_PAIR( 0x76D6, 0x84CB ), - MAKE_PAIR( 0x76DC, 0x76D7 ), - MAKE_PAIR( 0x76E1, 0x5C3D ), - MAKE_PAIR( 0x771E, 0x771F ), - MAKE_PAIR( 0x7726, 0x7725 ), - MAKE_PAIR( 0x777F, 0x53E1 ), - MAKE_PAIR( 0x783F, 0x9271 ), - MAKE_PAIR( 0x7845, 0x73EA ), - MAKE_PAIR( 0x788E, 0x7815 ), - MAKE_PAIR( 0x7895, 0x5D0E ), - MAKE_PAIR( 0x78AF, 0x7459 ), - MAKE_PAIR( 0x7919, 0x788D ), - MAKE_PAIR( 0x7926, 0x9271 ), - MAKE_PAIR( 0x792A, 0x783A ), - MAKE_PAIR( 0x7955, 0x79D8 ), - MAKE_PAIR( 0x7962, 0x79B0 ), - MAKE_PAIR( 0x797F, 0x7984 ), - MAKE_PAIR( 0x7980, 0x7A1F ), - MAKE_PAIR( 0x79AA, 0x7985 ), - MAKE_PAIR( 0x79AE, 0x793C ), - MAKE_PAIR( 0x79CB, 0x7A50 ), - MAKE_PAIR( 0x7A31, 0x79F0 ), - MAKE_PAIR( 0x7A3B, 0x7A32 ), - MAKE_PAIR( 0x7A3E, 0x7A3F ), - MAKE_PAIR( 0x7A49, 0x7A1A ), - MAKE_PAIR( 0x7A57, 0x7A42 ), - MAKE_PAIR( 0x7A69, 0x7A4F ), - MAKE_PAIR( 0x7A70, 0x7A63 ), - MAKE_PAIR( 0x7A97, 0x7A93 ), - MAKE_PAIR( 0x7AB0, 0x7AAF ), - MAKE_PAIR( 0x7AC8, 0x7AC3 ), - MAKE_PAIR( 0x7ACA, 0x7A83 ), - MAKE_PAIR( 0x7AD2, 0x5947 ), - MAKE_PAIR( 0x7ADD, 0x4E26 ), - MAKE_PAIR( 0x7B0B, 0x7B4D ), - MAKE_PAIR( 0x7B11, 0x54B2 ), - MAKE_PAIR( 0x7B5D, 0x7B8F ), - MAKE_PAIR( 0x7B71, 0x7BE0 ), - MAKE_PAIR( 0x7B7A, 0x7B50 ), - MAKE_PAIR( 0x7B8B, 0x724B ), - MAKE_PAIR( 0x7B9A, 0x5273 ), - MAKE_PAIR( 0x7B9F, 0x7B98 ), - MAKE_PAIR( 0x7BCF, 0x5D4C ), - MAKE_PAIR( 0x7BE6, 0x7B86 ), - MAKE_PAIR( 0x7C11, 0x84D1 ), - MAKE_PAIR( 0x7C14, 0x84D1 ), - MAKE_PAIR( 0x7C54, 0x85AE ), - MAKE_PAIR( 0x7C56, 0x7C64 ), - MAKE_PAIR( 0x7C58, 0x7C50 ), - MAKE_PAIR( 0x7C60, 0x7BED ), - MAKE_PAIR( 0x7CAE, 0x7CE7 ), - MAKE_PAIR( 0x7CB9, 0x7C8B ), - MAKE_PAIR( 0x7CE2, 0x6A21 ), - MAKE_PAIR( 0x7CFA, 0x7CFE ), - MAKE_PAIR( 0x7D4F, 0x7D32 ), - MAKE_PAIR( 0x7D72, 0x7CF8 ), - MAKE_PAIR( 0x7D89, 0x7E4D ), - MAKE_PAIR( 0x7D93, 0x7D4C ), - MAKE_PAIR( 0x7DAB, 0x7DDA ), - MAKE_PAIR( 0x7DD5, 0x7E83 ), - MAKE_PAIR( 0x7DDC, 0x7DBF ), - MAKE_PAIR( 0x7DE8, 0x7BC7 ), - MAKE_PAIR( 0x7E23, 0x770C ), - MAKE_PAIR( 0x7E31, 0x7E26 ), - MAKE_PAIR( 0x7E3D, 0x7DCF ), - MAKE_PAIR( 0x7E69, 0x7E04 ), - MAKE_PAIR( 0x7E6A, 0x7D75 ), - MAKE_PAIR( 0x7E7C, 0x7D99 ), - MAKE_PAIR( 0x7E8C, 0x7D9A ), - MAKE_PAIR( 0x7E8E, 0x7E4A ), - MAKE_PAIR( 0x7E92, 0x7E8F ), - MAKE_PAIR( 0x7E96, 0x7E4A ), - MAKE_PAIR( 0x7F3A, 0x6B20 ), - MAKE_PAIR( 0x7F4E, 0x58DC ), - MAKE_PAIR( 0x7F50, 0x7F36 ), - MAKE_PAIR( 0x7F78, 0x7F70 ), - MAKE_PAIR( 0x7F83, 0x51AA ), - MAKE_PAIR( 0x7F87, 0x7F88 ), - MAKE_PAIR( 0x7FA3, 0x7FA4 ), - MAKE_PAIR( 0x7FAE, 0x7FB9 ), - MAKE_PAIR( 0x7FC6, 0x7FE0 ), - MAKE_PAIR( 0x803B, 0x6065 ), - MAKE_PAIR( 0x805F, 0x5A7F ), - MAKE_PAIR( 0x8068, 0x806F ), - MAKE_PAIR( 0x8070, 0x8061 ), - MAKE_PAIR( 0x8072, 0x58F0 ), - MAKE_PAIR( 0x807D, 0x8074 ), - MAKE_PAIR( 0x8085, 0x7C9B ), - MAKE_PAIR( 0x8089, 0x5B8D ), - MAKE_PAIR( 0x80AC, 0x75A3 ), - MAKE_PAIR( 0x80CC, 0x810A ), - MAKE_PAIR( 0x80EF, 0x8DE8 ), - MAKE_PAIR( 0x8109, 0x8108 ), - MAKE_PAIR( 0x8123, 0x5507 ), - MAKE_PAIR( 0x815F, 0x81A3 ), - MAKE_PAIR( 0x8166, 0x8133 ), - MAKE_PAIR( 0x8193, 0x8178 ), - MAKE_PAIR( 0x81B8, 0x9AC4 ), - MAKE_PAIR( 0x81BD, 0x80C6 ), - MAKE_PAIR( 0x81C8, 0x81D8 ), - MAKE_PAIR( 0x81DF, 0x81D3 ), - MAKE_PAIR( 0x81FA, 0x53F0 ), - MAKE_PAIR( 0x8207, 0x4E0E ), - MAKE_PAIR( 0x8209, 0x6319 ), - MAKE_PAIR( 0x820A, 0x65E7 ), - MAKE_PAIR( 0x820D, 0x820E ), - MAKE_PAIR( 0x8216, 0x8217 ), - MAKE_PAIR( 0x8218, 0x9928 ), - MAKE_PAIR( 0x8229, 0x8239 ), - MAKE_PAIR( 0x822E, 0x826B ), - MAKE_PAIR( 0x8235, 0x67C1 ), - MAKE_PAIR( 0x8277, 0x8276 ), - MAKE_PAIR( 0x82C5, 0x5208 ), - MAKE_PAIR( 0x8358, 0x5E84 ), - MAKE_PAIR( 0x8373, 0x8C46 ), - MAKE_PAIR( 0x838A, 0x5E84 ), - MAKE_PAIR( 0x8393, 0x82FA ), - MAKE_PAIR( 0x8396, 0x830E ), - MAKE_PAIR( 0x83B5, 0x514E ), - MAKE_PAIR( 0x83DF, 0x514E ), - MAKE_PAIR( 0x83F4, 0x5EB5 ), - MAKE_PAIR( 0x8420, 0x840C ), - MAKE_PAIR( 0x842C, 0x4E07 ), - MAKE_PAIR( 0x8462, 0x84CB ), - MAKE_PAIR( 0x84AD, 0x82BB ), - MAKE_PAIR( 0x854B, 0x854A ), - MAKE_PAIR( 0x855A, 0x843C ), - MAKE_PAIR( 0x8597, 0x5712 ), - MAKE_PAIR( 0x85C1, 0x7A3F ), - MAKE_PAIR( 0x85CF, 0x8535 ), - MAKE_PAIR( 0x85DD, 0x82B8 ), - MAKE_PAIR( 0x85E5, 0x85AC ), - MAKE_PAIR( 0x85EA, 0x85AE ), - MAKE_PAIR( 0x8602, 0x854A ), - MAKE_PAIR( 0x8606, 0x82A6 ), - MAKE_PAIR( 0x8613, 0x8607 ), - MAKE_PAIR( 0x8617, 0x6A97 ), - MAKE_PAIR( 0x862F, 0x76EA ), - MAKE_PAIR( 0x8655, 0x51E6 ), - MAKE_PAIR( 0x865F, 0x53F7 ), - MAKE_PAIR( 0x8768, 0x8671 ), - MAKE_PAIR( 0x87A2, 0x86CD ), - MAKE_PAIR( 0x87C6, 0x87C7 ), - MAKE_PAIR( 0x87D2, 0x880E ), - MAKE_PAIR( 0x87F2, 0x866B ), - MAKE_PAIR( 0x8805, 0x877F ), - MAKE_PAIR( 0x880F, 0x87F9 ), - MAKE_PAIR( 0x8823, 0x86CE ), - MAKE_PAIR( 0x8827, 0x8839 ), - MAKE_PAIR( 0x8836, 0x8695 ), - MAKE_PAIR( 0x883B, 0x86EE ), - MAKE_PAIR( 0x8842, 0x8844 ), - MAKE_PAIR( 0x885E, 0x885B ), - MAKE_PAIR( 0x88B5, 0x887D ), - MAKE_PAIR( 0x88DD, 0x88C5 ), - MAKE_PAIR( 0x88E1, 0x88CF ), - MAKE_PAIR( 0x891D, 0x894C ), - MAKE_PAIR( 0x8943, 0x8912 ), - MAKE_PAIR( 0x894D, 0x96D1 ), - MAKE_PAIR( 0x898A, 0x7F88 ), - MAKE_PAIR( 0x89BA, 0x899A ), - MAKE_PAIR( 0x89BD, 0x89A7 ), - MAKE_PAIR( 0x89C0, 0x89B3 ), - MAKE_PAIR( 0x89E7, 0x89E3 ), - MAKE_PAIR( 0x89F8, 0x89E6 ), - MAKE_PAIR( 0x8A00, 0x4E91 ), - MAKE_PAIR( 0x8A3B, 0x6CE8 ), - MAKE_PAIR( 0x8AE1, 0x8B1A ), - MAKE_PAIR( 0x8AEB, 0x8ACC ), - MAKE_PAIR( 0x8B0C, 0x6B4C ), - MAKE_PAIR( 0x8B20, 0x8B21 ), - MAKE_PAIR( 0x8B41, 0x5629 ), - MAKE_PAIR( 0x8B49, 0x8A3C ), - MAKE_PAIR( 0x8B5B, 0x8B56 ), - MAKE_PAIR( 0x8B5F, 0x566A ), - MAKE_PAIR( 0x8B6F, 0x8A33 ), - MAKE_PAIR( 0x8B71, 0x5584 ), - MAKE_PAIR( 0x8B7D, 0x8A89 ), - MAKE_PAIR( 0x8B80, 0x8AAD ), - MAKE_PAIR( 0x8B8A, 0x5909 ), - MAKE_PAIR( 0x8B8E, 0x8B90 ), - MAKE_PAIR( 0x8B93, 0x8B72 ), - MAKE_PAIR( 0x8B9A, 0x8B83 ), - MAKE_PAIR( 0x8C3F, 0x6E13 ), - MAKE_PAIR( 0x8C4E, 0x7AEA ), - MAKE_PAIR( 0x8C50, 0x8C4A ), - MAKE_PAIR( 0x8C6B, 0x4E88 ), - MAKE_PAIR( 0x8C6C, 0x732A ), - MAKE_PAIR( 0x8C7A, 0x72B2 ), - MAKE_PAIR( 0x8C7C, 0x8C94 ), - MAKE_PAIR( 0x8C89, 0x72F8 ), - MAKE_PAIR( 0x8C8D, 0x72F8 ), - MAKE_PAIR( 0x8C8E, 0x730A ), - MAKE_PAIR( 0x8C98, 0x734F ), - MAKE_PAIR( 0x8CAD, 0x8CEA ), - MAKE_PAIR( 0x8CAE, 0x4E8C ), - MAKE_PAIR( 0x8CB3, 0x4E8C ), - MAKE_PAIR( 0x8CCD, 0x81D3 ), - MAKE_PAIR( 0x8CE3, 0x58F2 ), - MAKE_PAIR( 0x8CE4, 0x8CCE ), - MAKE_PAIR( 0x8D0A, 0x8CDB ), - MAKE_PAIR( 0x8D13, 0x81D3 ), - MAKE_PAIR( 0x8D71, 0x8D70 ), - MAKE_PAIR( 0x8E08, 0x758E ), - MAKE_PAIR( 0x8E10, 0x8DF5 ), - MAKE_PAIR( 0x8E34, 0x8E0A ), - MAKE_PAIR( 0x8E48, 0x8E0F ), - MAKE_PAIR( 0x8E87, 0x58B8 ), - MAKE_PAIR( 0x8EAA, 0x8E99 ), - MAKE_PAIR( 0x8EB0, 0x4F53 ), - MAKE_PAIR( 0x8EC6, 0x4F53 ), - MAKE_PAIR( 0x8EE3, 0x8F5F ), - MAKE_PAIR( 0x8F0C, 0x4E21 ), - MAKE_PAIR( 0x8F15, 0x8EFD ), - MAKE_PAIR( 0x8F19, 0x8F12 ), - MAKE_PAIR( 0x8F1B, 0x4E21 ), - MAKE_PAIR( 0x8F49, 0x8EE2 ), - MAKE_PAIR( 0x8FA7, 0x5F01 ), - MAKE_PAIR( 0x8FA8, 0x5F01 ), - MAKE_PAIR( 0x8FAD, 0x8F9E ), - MAKE_PAIR( 0x8FAF, 0x5F01 ), - MAKE_PAIR( 0x8FEA, 0x5EF8 ), - MAKE_PAIR( 0x8FEF, 0x9003 ), - MAKE_PAIR( 0x8FF4, 0x5EFB ), - MAKE_PAIR( 0x8FFA, 0x5EFC ), - MAKE_PAIR( 0x900E, 0x9052 ), - MAKE_PAIR( 0x9015, 0x5F84 ), - MAKE_PAIR( 0x9023, 0x806F ), - MAKE_PAIR( 0x9039, 0x9054 ), - MAKE_PAIR( 0x9059, 0x9065 ), - MAKE_PAIR( 0x905E, 0x9013 ), - MAKE_PAIR( 0x9072, 0x9045 ), - MAKE_PAIR( 0x9087, 0x8FE9 ), - MAKE_PAIR( 0x9089, 0x8FBA ), - MAKE_PAIR( 0x908A, 0x8FBA ), - MAKE_PAIR( 0x90B1, 0x4E18 ), - MAKE_PAIR( 0x9130, 0x96A3 ), - MAKE_PAIR( 0x9189, 0x9154 ), - MAKE_PAIR( 0x918B, 0x9162 ), - MAKE_PAIR( 0x91AB, 0x533B ), - MAKE_PAIR( 0x91BA, 0x718F ), - MAKE_PAIR( 0x91C0, 0x91B8 ), - MAKE_PAIR( 0x91CB, 0x91C8 ), - MAKE_PAIR( 0x91E1, 0x91DC ), - MAKE_PAIR( 0x91FC, 0x5263 ), - MAKE_PAIR( 0x9214, 0x6284 ), - MAKE_PAIR( 0x9229, 0x946A ), - MAKE_PAIR( 0x922C, 0x9438 ), - MAKE_PAIR( 0x9248, 0x91F6 ), - MAKE_PAIR( 0x9264, 0x920E ), - MAKE_PAIR( 0x9295, 0x9244 ), - MAKE_PAIR( 0x92EA, 0x8217 ), - MAKE_PAIR( 0x9322, 0x92AD ), - MAKE_PAIR( 0x9394, 0x7194 ), - MAKE_PAIR( 0x93AD, 0x93AE ), - MAKE_PAIR( 0x941A, 0x930F ), - MAKE_PAIR( 0x9421, 0x9244 ), - MAKE_PAIR( 0x9435, 0x9244 ), - MAKE_PAIR( 0x9444, 0x92F3 ), - MAKE_PAIR( 0x9452, 0x9451 ), - MAKE_PAIR( 0x945A, 0x947D ), - MAKE_PAIR( 0x945B, 0x9271 ), - MAKE_PAIR( 0x9587, 0x9589 ), - MAKE_PAIR( 0x95A0, 0x958F ), - MAKE_PAIR( 0x95DC, 0x95A2 ), - MAKE_PAIR( 0x962A, 0x5742 ), - MAKE_PAIR( 0x962F, 0x5740 ), - MAKE_PAIR( 0x9644, 0x4ED8 ), - MAKE_PAIR( 0x9670, 0x852D ), - MAKE_PAIR( 0x9677, 0x9665 ), - MAKE_PAIR( 0x96A8, 0x968F ), - MAKE_PAIR( 0x96AA, 0x967A ), - MAKE_PAIR( 0x96B1, 0x852D ), - MAKE_PAIR( 0x96B8, 0x96B7 ), - MAKE_PAIR( 0x96C6, 0x8F2F ), - MAKE_PAIR( 0x96D9, 0x53CC ), - MAKE_PAIR( 0x96DC, 0x96D1 ), - MAKE_PAIR( 0x9738, 0x8987 ), - MAKE_PAIR( 0x9748, 0x970A ), - MAKE_PAIR( 0x975C, 0x9759 ), - MAKE_PAIR( 0x976B, 0x976D ), - MAKE_PAIR( 0x9771, 0x976D ), - MAKE_PAIR( 0x97ED, 0x97EE ), - MAKE_PAIR( 0x97F2, 0x9F4F ), - MAKE_PAIR( 0x97F5, 0x97FB ), - MAKE_PAIR( 0x9834, 0x7A4E ), - MAKE_PAIR( 0x9838, 0x981A ), - MAKE_PAIR( 0x984B, 0x816E ), - MAKE_PAIR( 0x984F, 0x9854 ), - MAKE_PAIR( 0x986F, 0x9855 ), - MAKE_PAIR( 0x98B1, 0x53F0 ), - MAKE_PAIR( 0x98C3, 0x98C4 ), - MAKE_PAIR( 0x98DC, 0x7FFB ), - MAKE_PAIR( 0x98EE, 0x98F2 ), - MAKE_PAIR( 0x9918, 0x4F59 ), - MAKE_PAIR( 0x991D, 0x98FE ), - MAKE_PAIR( 0x9920, 0x9905 ), - MAKE_PAIR( 0x99C8, 0x99C6 ), - MAKE_PAIR( 0x99F2, 0x99B4 ), - MAKE_PAIR( 0x9A37, 0x9A12 ), - MAKE_PAIR( 0x9A45, 0x99C6 ), - MAKE_PAIR( 0x9A57, 0x9A13 ), - MAKE_PAIR( 0x9A5B, 0x99C5 ), - MAKE_PAIR( 0x9AD3, 0x9AC4 ), - MAKE_PAIR( 0x9AD4, 0x4F53 ), - MAKE_PAIR( 0x9AEE, 0x9AEA ), - MAKE_PAIR( 0x9AF4, 0x5F7F ), - MAKE_PAIR( 0x9B27, 0x9599 ), - MAKE_PAIR( 0x9B28, 0x95A7 ), - MAKE_PAIR( 0x9B2A, 0x95D8 ), - MAKE_PAIR( 0x9B31, 0x6B1D ), - MAKE_PAIR( 0x9B3B, 0x7CA5 ), - MAKE_PAIR( 0x9C1B, 0x9C2E ), - MAKE_PAIR( 0x9C3A, 0x9BF5 ), - MAKE_PAIR( 0x9CEB, 0x96C1 ), - MAKE_PAIR( 0x9CEC, 0x9CE7 ), - MAKE_PAIR( 0x9D08, 0x96C1 ), - MAKE_PAIR( 0x9D44, 0x9D1F ), - MAKE_PAIR( 0x9D5E, 0x9D5D ), - MAKE_PAIR( 0x9DAB, 0x9D87 ), - MAKE_PAIR( 0x9DAF, 0x9D2C ), - MAKE_PAIR( 0x9DC4, 0x9D8F ), - MAKE_PAIR( 0x9DCF, 0x9DC6 ), - MAKE_PAIR( 0x9E7D, 0x5869 ), - MAKE_PAIR( 0x9EA5, 0x9EA6 ), - MAKE_PAIR( 0x9EAA, 0x9EBA ), - MAKE_PAIR( 0x9EB8, 0x9EA9 ), - MAKE_PAIR( 0x9ED8, 0x9ED9 ), - MAKE_PAIR( 0x9EDE, 0x70B9 ), - MAKE_PAIR( 0x9EE8, 0x515A ), - MAKE_PAIR( 0x9F07, 0x9C32 ), - MAKE_PAIR( 0x9F21, 0x9F20 ), - MAKE_PAIR( 0x9F4A, 0x658E ), - MAKE_PAIR( 0x9F4B, 0x658E ), - MAKE_PAIR( 0x9F52, 0x6B6F ), - MAKE_PAIR( 0x9F61, 0x9F62 ), - MAKE_PAIR( 0x9F67, 0x56D3 ), - MAKE_PAIR( 0x9F8D, 0x7ADC ), - MAKE_PAIR( 0x9F9C, 0x4E80 ), - MAKE_PAIR( 0x9F9D, 0x7A50 ), - MAKE_PAIR( 0xFEFF, 0x4E9C ) + { 0x4E17, 0x4E16 }, + { 0x4E55, 0x864E }, + { 0x4E58, 0x4E57 }, + { 0x4E82, 0x4E71 }, + { 0x4E8A, 0x4E8B }, + { 0x4E98, 0x4E99 }, + { 0x4E9F, 0x6975 }, + { 0x4EB0, 0x4EAC }, + { 0x4EC2, 0x50CD }, + { 0x4ECE, 0x5F93 }, + { 0x4EED, 0x4EDE }, + { 0x4F1C, 0x5005 }, + { 0x4F5B, 0x4ECF }, + { 0x4F86, 0x6765 }, + { 0x4FAB, 0x4F5E }, + { 0x5047, 0x4EEE }, + { 0x509A, 0x52B9 }, + { 0x50B3, 0x4F1D }, + { 0x50DE, 0x507D }, + { 0x50E3, 0x50ED }, + { 0x50F9, 0x4FA1 }, + { 0x5109, 0x5039 }, + { 0x5118, 0x4FAD }, + { 0x5152, 0x5150 }, + { 0x5154, 0x514E }, + { 0x5169, 0x4E21 }, + { 0x518C, 0x518A }, + { 0x5190, 0x5192 }, + { 0x51A8, 0x5BCC }, + { 0x51A9, 0x5199 }, + { 0x51B0, 0x6C37 }, + { 0x51B1, 0x51B4 }, + { 0x51B2, 0x6C96 }, + { 0x51B3, 0x6C7A }, + { 0x51B5, 0x6CC1 }, + { 0x51C9, 0x6DBC }, + { 0x51D6, 0x6E96 }, + { 0x51DC, 0x51DB }, + { 0x51FE, 0x51FD }, + { 0x5204, 0x5203 }, + { 0x5227, 0x52AB }, + { 0x5269, 0x5270 }, + { 0x5271, 0x5263 }, + { 0x5283, 0x753B }, + { 0x528D, 0x5263 }, + { 0x5291, 0x5264 }, + { 0x5292, 0x5263 }, + { 0x5294, 0x5263 }, + { 0x52B5, 0x5238 }, + { 0x52DE, 0x52B4 }, + { 0x52F3, 0x52F2 }, + { 0x52F5, 0x52B1 }, + { 0x52F8, 0x52E7 }, + { 0x5340, 0x533A }, + { 0x5346, 0x5352 }, + { 0x5377, 0x5DFB }, + { 0x537B, 0x5374 }, + { 0x53B0, 0x5EE0 }, + { 0x53C3, 0x53C2 }, + { 0x548F, 0x8A60 }, + { 0x5492, 0x546A }, + { 0x54AF, 0x5580 }, + { 0x54E5, 0x6B4C }, + { 0x5557, 0x5556 }, + { 0x55AE, 0x5358 }, + { 0x5650, 0x5668 }, + { 0x5680, 0x5BE7 }, + { 0x568F, 0x5694 }, + { 0x56B4, 0x53B3 }, + { 0x56D1, 0x5631 }, + { 0x56D8, 0x56DE }, + { 0x5708, 0x570F }, + { 0x570B, 0x56FD }, + { 0x570D, 0x56F2 }, + { 0x5713, 0x5186 }, + { 0x5716, 0x56F3 }, + { 0x5718, 0x56E3 }, + { 0x57C0, 0x5782 }, + { 0x57D3, 0x57D2 }, + { 0x57FC, 0x5D0E }, + { 0x582F, 0x5C2D }, + { 0x5872, 0x5834 }, + { 0x58AE, 0x5815 }, + { 0x58D3, 0x5727 }, + { 0x58D8, 0x5841 }, + { 0x58DE, 0x58CA }, + { 0x58E4, 0x58CC }, + { 0x58EF, 0x58EE }, + { 0x58F1, 0x4E00 }, + { 0x58F9, 0x4E00 }, + { 0x58FA, 0x58F7 }, + { 0x58FB, 0x5A7F }, + { 0x58FD, 0x5BFF }, + { 0x5918, 0x536F }, + { 0x591B, 0x591A }, + { 0x5932, 0x672C }, + { 0x5967, 0x5965 }, + { 0x5969, 0x5333 }, + { 0x596C, 0x5968 }, + { 0x59D9, 0x598A }, + { 0x5A6C, 0x6DEB }, + { 0x5AD0, 0x5B32 }, + { 0x5AFB, 0x5AFA }, + { 0x5B43, 0x5B22 }, + { 0x5B78, 0x5B66 }, + // { 0x5B9D, 0x73CD }, + { 0x5BC3, 0x51A4 }, + { 0x5BC7, 0x51A6 }, + { 0x5BC9, 0x9DB4 }, + { 0x5BE2, 0x5BDD }, + { 0x5BE6, 0x5B9F }, + { 0x5BEB, 0x5199 }, + //{ 0x5BF3, 0x73CD }, + { 0x5BF3, 0x5B9D }, + //{ 0x5BF6, 0x73CD }, + { 0x5BF6, 0x5B9D }, + { 0x5C05, 0x524B }, + { 0x5C07, 0x5C06 }, + { 0x5C08, 0x5C02 }, + { 0x5C0D, 0x5BFE }, + { 0x5C13, 0x723E }, + { 0x5C46, 0x5C4A }, + { 0x5C6C, 0x5C5E }, + { 0x5CE9, 0x5CE8 }, + { 0x5CEF, 0x5CF0 }, + { 0x5CFD, 0x5CE1 }, + { 0x5D15, 0x5D16 }, + { 0x5D17, 0x5CA1 }, + { 0x5D18, 0x5D19 }, + { 0x5D5C, 0x5D0E }, + { 0x5D73, 0x5D6F }, + { 0x5D8B, 0x5CF6 }, + { 0x5D8C, 0x5CF6 }, + { 0x5DBD, 0x5CB3 }, + { 0x5DD6, 0x5DCC }, + { 0x5DDB, 0x5DDD }, + { 0x5DF5, 0x536E }, + { 0x5E0B, 0x7D19 }, + { 0x5E36, 0x5E2F }, + { 0x5E64, 0x5E63 }, + { 0x5EC1, 0x53A0 }, + { 0x5EC8, 0x53A6 }, + { 0x5ECF, 0x53A9 }, + { 0x5ED0, 0x53A9 }, + { 0x5EDA, 0x53A8 }, + { 0x5EDD, 0x53AE }, + { 0x5EE2, 0x5EC3 }, + { 0x5EE3, 0x5E83 }, + { 0x5EF0, 0x5E81 }, + { 0x5EF3, 0x5E81 }, + { 0x5F03, 0x68C4 }, + { 0x5F09, 0x5958 }, + { 0x5F0C, 0x4E00 }, + { 0x5F0D, 0x4E8C }, + { 0x5F10, 0x4E8C }, + { 0x5F2F, 0x6E7E }, + { 0x5F48, 0x5F3E }, + { 0x5F4C, 0x5F25 }, + { 0x5F4E, 0x6E7E }, + { 0x5F5C, 0x5F5D }, + { 0x5F83, 0x5F80 }, + { 0x5F91, 0x5F84 }, + { 0x5F9E, 0x5F93 }, + { 0x5FA0, 0x6765 }, + { 0x5FF0, 0x60B4 }, + { 0x5FFB, 0x6B23 }, + { 0x6046, 0x6052 }, + { 0x604A, 0x5354 }, + { 0x6060, 0x602A }, + { 0x60B3, 0x5FB3 }, + { 0x60E0, 0x6075 }, + { 0x60E1, 0x60AA }, + { 0x60F1, 0x60A9 }, + { 0x613C, 0x614E }, + { 0x613D, 0x535A }, + { 0x6158, 0x60E8 }, + { 0x615A, 0x6159 }, + { 0x6187, 0x61A9 }, + { 0x61C9, 0x5FDC }, + { 0x61F4, 0x61FA }, + { 0x61F7, 0x61D0 }, + { 0x6200, 0x604B }, + { 0x621D, 0x8CA1 }, + { 0x621E, 0x621B }, + { 0x6230, 0x6226 }, + { 0x6232, 0x622F }, + { 0x6268, 0x6260 }, + { 0x62AC, 0x64E1 }, + { 0x62C2, 0x6255 }, + { 0x62D4, 0x629C }, + { 0x62DC, 0x62DD }, + { 0x633E, 0x631F }, + { 0x63D2, 0x633F }, + { 0x6416, 0x63FA }, + { 0x641C, 0x635C }, + { 0x64C7, 0x629E }, + { 0x64D4, 0x62C5 }, + { 0x64DA, 0x62E0 }, + { 0x64E7, 0x6319 }, + { 0x64F4, 0x62E1 }, + { 0x651C, 0x643A }, + { 0x651D, 0x6442 }, + { 0x652A, 0x64B9 }, + { 0x6536, 0x53CE }, + { 0x6548, 0x52B9 }, + { 0x654D, 0x53D9 }, + { 0x6555, 0x52C5 }, + { 0x6558, 0x53D9 }, + { 0x6578, 0x6570 }, + { 0x6588, 0x5B66 }, + { 0x6589, 0x658E }, + { 0x65B7, 0x65AD }, + { 0x65D9, 0x65DB }, + { 0x663F, 0x66E0 }, + { 0x6644, 0x6643 }, + { 0x6649, 0x664B }, + { 0x665D, 0x663C }, + { 0x668E, 0x6620 }, + { 0x66B8, 0x77AD }, + { 0x66C9, 0x6681 }, + { 0x66F0, 0x4E91 }, + { 0x66F5, 0x66F3 }, + { 0x66FD, 0x66FE }, + { 0x6703, 0x4F1A }, + { 0x6716, 0x6717 }, + { 0x671E, 0x671F }, + { 0x6764, 0x6803 }, + { 0x67A1, 0x685D }, + { 0x67A6, 0x6AE8 }, + { 0x67A9, 0x677E }, + { 0x67CF, 0x6822 }, + { 0x6816, 0x68F2 }, + { 0x6840, 0x685D }, + { 0x689D, 0x6761 }, + { 0x68A6, 0x5922 }, + { 0x68CA, 0x68CB }, + { 0x68E7, 0x685F }, + { 0x6936, 0x68D5 }, + { 0x695D, 0x68DF }, + { 0x6973, 0x6885 }, + { 0x69AE, 0x6804 }, + { 0x69C7, 0x69D9 }, + { 0x6A02, 0x697D }, + { 0x6A13, 0x697C }, + { 0x6A1E, 0x67A2 }, + { 0x6A23, 0x69D8 }, + { 0x6A62, 0x6955 }, + { 0x6A9C, 0x6867 }, + { 0x6AA2, 0x691C }, + { 0x6AAA, 0x6ADF }, + { 0x6AAE, 0x68BC }, + { 0x6AB3, 0x68B9 }, + { 0x6AC1, 0x6A12 }, + { 0x6AFB, 0x685C }, + { 0x6B0A, 0x6A29 }, + { 0x6B50, 0x6B27 }, + { 0x6B61, 0x6B53 }, + { 0x6B78, 0x5E30 }, + { 0x6B7F, 0x6CA1 }, + { 0x6B98, 0x6B8B }, + { 0x6BB1, 0x6BB2 }, + { 0x6BBC, 0x6BBB }, + { 0x6BC6, 0x6BB4 }, + { 0x6BCB, 0x6BCD }, + { 0x6BD3, 0x80B2 }, + { 0x6C23, 0x6C17 }, + { 0x6C8D, 0x51B4 }, + { 0x6C92, 0x6CA1 }, + { 0x6CEA, 0x6D99 }, + { 0x6D0C, 0x51BD }, + { 0x6D35, 0x5F87 }, + { 0x6D79, 0x5CE1 }, + { 0x6D8C, 0x6E67 }, + { 0x6DB8, 0x51C5 }, + { 0x6DD2, 0x51C4 }, + { 0x6DE8, 0x6D44 }, + { 0x6DFA, 0x6D45 }, + { 0x6E0A, 0x6DF5 }, + { 0x6E15, 0x6DF5 }, + { 0x6EAA, 0x6E13 }, + { 0x6EAF, 0x9061 }, + { 0x6EEF, 0x6EDE }, + { 0x6EFF, 0x6E80 }, + { 0x6F5B, 0x6F5C }, + { 0x6F74, 0x7026 }, + { 0x6F80, 0x6E0B }, + { 0x6F81, 0x6E0B }, + { 0x6F82, 0x6F84 }, + { 0x6F91, 0x6E9C }, + { 0x6FA4, 0x6CA2 }, + { 0x6FD5, 0x6E7F }, + { 0x6FDF, 0x6E08 }, + { 0x6FE4, 0x6D9B }, + { 0x6FF1, 0x6D5C }, + { 0x6FF3, 0x6F5C }, + { 0x6FF6, 0x95CA }, + { 0x7027, 0x6EDD }, + { 0x7030, 0x6FD4 }, + { 0x704C, 0x6F45 }, + { 0x7063, 0x6E7E }, + { 0x70CB, 0x6077 }, + { 0x70DF, 0x7159 }, + { 0x70F1, 0x70AF }, + { 0x7188, 0x7155 }, + { 0x7199, 0x7155 }, + { 0x71C8, 0x706F }, + { 0x71D2, 0x713C }, + { 0x71DF, 0x55B6 }, + { 0x71FB, 0x718F }, + { 0x71FF, 0x8000 }, + { 0x7210, 0x7089 }, + { 0x722D, 0x4E89 }, + { 0x7232, 0x70BA }, + { 0x723C, 0x4FCE }, + { 0x7246, 0x58BB }, + { 0x7281, 0x7282 }, + { 0x72A7, 0x72A0 }, + { 0x72E2, 0x72F8 }, + { 0x72F9, 0x72ED }, + { 0x734E, 0x5968 }, + { 0x7368, 0x72EC }, + { 0x7375, 0x731F }, + { 0x7378, 0x7363 }, + { 0x737B, 0x732E }, + { 0x73CE, 0x73CD }, + { 0x73F1, 0x74D4 }, + { 0x7464, 0x7476 }, + { 0x746F, 0x7405 }, + { 0x74A2, 0x7460 }, + { 0x74E3, 0x5F01 }, + { 0x751E, 0x5617 }, + { 0x753C, 0x753A }, + { 0x7544, 0x7559 }, + { 0x7546, 0x755D }, + { 0x754A, 0x8015 }, + { 0x754D, 0x754C }, + { 0x7567, 0x7565 }, + { 0x756B, 0x753B }, + { 0x7574, 0x7587 }, + { 0x7576, 0x5F53 }, + { 0x7582, 0x7573 }, + { 0x7589, 0x7573 }, + { 0x758A, 0x7573 }, + { 0x7609, 0x7652 }, + { 0x7661, 0x75F4 }, + { 0x767C, 0x767A }, + { 0x7683, 0x8C8C }, + { 0x7688, 0x5E30 }, + { 0x768B, 0x7690 }, + { 0x7693, 0x6667 }, + { 0x76B7, 0x9F13 }, + { 0x76B9, 0x76B8 }, + { 0x76C3, 0x676F }, + { 0x76D6, 0x84CB }, + { 0x76DC, 0x76D7 }, + { 0x76E1, 0x5C3D }, + { 0x771E, 0x771F }, + { 0x7726, 0x7725 }, + { 0x777F, 0x53E1 }, + { 0x783F, 0x9271 }, + { 0x7845, 0x73EA }, + { 0x788E, 0x7815 }, + { 0x7895, 0x5D0E }, + { 0x78AF, 0x7459 }, + { 0x7919, 0x788D }, + { 0x7926, 0x9271 }, + { 0x792A, 0x783A }, + { 0x7955, 0x79D8 }, + { 0x7962, 0x79B0 }, + { 0x797F, 0x7984 }, + { 0x7980, 0x7A1F }, + { 0x79AA, 0x7985 }, + { 0x79AE, 0x793C }, + { 0x79CB, 0x7A50 }, + { 0x7A31, 0x79F0 }, + { 0x7A3B, 0x7A32 }, + { 0x7A3E, 0x7A3F }, + { 0x7A49, 0x7A1A }, + { 0x7A57, 0x7A42 }, + { 0x7A69, 0x7A4F }, + { 0x7A70, 0x7A63 }, + { 0x7A97, 0x7A93 }, + { 0x7AB0, 0x7AAF }, + { 0x7AC8, 0x7AC3 }, + { 0x7ACA, 0x7A83 }, + { 0x7AD2, 0x5947 }, + { 0x7ADD, 0x4E26 }, + { 0x7B0B, 0x7B4D }, + { 0x7B11, 0x54B2 }, + { 0x7B5D, 0x7B8F }, + { 0x7B71, 0x7BE0 }, + { 0x7B7A, 0x7B50 }, + { 0x7B8B, 0x724B }, + { 0x7B9A, 0x5273 }, + { 0x7B9F, 0x7B98 }, + { 0x7BCF, 0x5D4C }, + { 0x7BE6, 0x7B86 }, + { 0x7C11, 0x84D1 }, + { 0x7C14, 0x84D1 }, + { 0x7C54, 0x85AE }, + { 0x7C56, 0x7C64 }, + { 0x7C58, 0x7C50 }, + { 0x7C60, 0x7BED }, + { 0x7CAE, 0x7CE7 }, + { 0x7CB9, 0x7C8B }, + { 0x7CE2, 0x6A21 }, + { 0x7CFA, 0x7CFE }, + { 0x7D4F, 0x7D32 }, + { 0x7D72, 0x7CF8 }, + { 0x7D89, 0x7E4D }, + { 0x7D93, 0x7D4C }, + { 0x7DAB, 0x7DDA }, + { 0x7DD5, 0x7E83 }, + { 0x7DDC, 0x7DBF }, + { 0x7DE8, 0x7BC7 }, + { 0x7E23, 0x770C }, + { 0x7E31, 0x7E26 }, + { 0x7E3D, 0x7DCF }, + { 0x7E69, 0x7E04 }, + { 0x7E6A, 0x7D75 }, + { 0x7E7C, 0x7D99 }, + { 0x7E8C, 0x7D9A }, + { 0x7E8E, 0x7E4A }, + { 0x7E92, 0x7E8F }, + { 0x7E96, 0x7E4A }, + { 0x7F3A, 0x6B20 }, + { 0x7F4E, 0x58DC }, + { 0x7F50, 0x7F36 }, + { 0x7F78, 0x7F70 }, + { 0x7F83, 0x51AA }, + { 0x7F87, 0x7F88 }, + { 0x7FA3, 0x7FA4 }, + { 0x7FAE, 0x7FB9 }, + { 0x7FC6, 0x7FE0 }, + { 0x803B, 0x6065 }, + { 0x805F, 0x5A7F }, + { 0x8068, 0x806F }, + { 0x8070, 0x8061 }, + { 0x8072, 0x58F0 }, + { 0x807D, 0x8074 }, + { 0x8085, 0x7C9B }, + { 0x8089, 0x5B8D }, + { 0x80AC, 0x75A3 }, + { 0x80CC, 0x810A }, + { 0x80EF, 0x8DE8 }, + { 0x8109, 0x8108 }, + { 0x8123, 0x5507 }, + { 0x815F, 0x81A3 }, + { 0x8166, 0x8133 }, + { 0x8193, 0x8178 }, + { 0x81B8, 0x9AC4 }, + { 0x81BD, 0x80C6 }, + { 0x81C8, 0x81D8 }, + { 0x81DF, 0x81D3 }, + { 0x81FA, 0x53F0 }, + { 0x8207, 0x4E0E }, + { 0x8209, 0x6319 }, + { 0x820A, 0x65E7 }, + { 0x820D, 0x820E }, + { 0x8216, 0x8217 }, + { 0x8218, 0x9928 }, + { 0x8229, 0x8239 }, + { 0x822E, 0x826B }, + { 0x8235, 0x67C1 }, + { 0x8277, 0x8276 }, + { 0x82C5, 0x5208 }, + { 0x8358, 0x5E84 }, + { 0x8373, 0x8C46 }, + { 0x838A, 0x5E84 }, + { 0x8393, 0x82FA }, + { 0x8396, 0x830E }, + { 0x83B5, 0x514E }, + { 0x83DF, 0x514E }, + { 0x83F4, 0x5EB5 }, + { 0x8420, 0x840C }, + { 0x842C, 0x4E07 }, + { 0x8462, 0x84CB }, + { 0x84AD, 0x82BB }, + { 0x854B, 0x854A }, + { 0x855A, 0x843C }, + { 0x8597, 0x5712 }, + { 0x85C1, 0x7A3F }, + { 0x85CF, 0x8535 }, + { 0x85DD, 0x82B8 }, + { 0x85E5, 0x85AC }, + { 0x85EA, 0x85AE }, + { 0x8602, 0x854A }, + { 0x8606, 0x82A6 }, + { 0x8613, 0x8607 }, + { 0x8617, 0x6A97 }, + { 0x862F, 0x76EA }, + { 0x8655, 0x51E6 }, + { 0x865F, 0x53F7 }, + { 0x8768, 0x8671 }, + { 0x87A2, 0x86CD }, + { 0x87C6, 0x87C7 }, + { 0x87D2, 0x880E }, + { 0x87F2, 0x866B }, + { 0x8805, 0x877F }, + { 0x880F, 0x87F9 }, + { 0x8823, 0x86CE }, + { 0x8827, 0x8839 }, + { 0x8836, 0x8695 }, + { 0x883B, 0x86EE }, + { 0x8842, 0x8844 }, + { 0x885E, 0x885B }, + { 0x88B5, 0x887D }, + { 0x88DD, 0x88C5 }, + { 0x88E1, 0x88CF }, + { 0x891D, 0x894C }, + { 0x8943, 0x8912 }, + { 0x894D, 0x96D1 }, + { 0x898A, 0x7F88 }, + { 0x89BA, 0x899A }, + { 0x89BD, 0x89A7 }, + { 0x89C0, 0x89B3 }, + { 0x89E7, 0x89E3 }, + { 0x89F8, 0x89E6 }, + { 0x8A00, 0x4E91 }, + { 0x8A3B, 0x6CE8 }, + { 0x8AE1, 0x8B1A }, + { 0x8AEB, 0x8ACC }, + { 0x8B0C, 0x6B4C }, + { 0x8B20, 0x8B21 }, + { 0x8B41, 0x5629 }, + { 0x8B49, 0x8A3C }, + { 0x8B5B, 0x8B56 }, + { 0x8B5F, 0x566A }, + { 0x8B6F, 0x8A33 }, + { 0x8B71, 0x5584 }, + { 0x8B7D, 0x8A89 }, + { 0x8B80, 0x8AAD }, + { 0x8B8A, 0x5909 }, + { 0x8B8E, 0x8B90 }, + { 0x8B93, 0x8B72 }, + { 0x8B9A, 0x8B83 }, + { 0x8C3F, 0x6E13 }, + { 0x8C4E, 0x7AEA }, + { 0x8C50, 0x8C4A }, + { 0x8C6B, 0x4E88 }, + { 0x8C6C, 0x732A }, + { 0x8C7A, 0x72B2 }, + { 0x8C7C, 0x8C94 }, + { 0x8C89, 0x72F8 }, + { 0x8C8D, 0x72F8 }, + { 0x8C8E, 0x730A }, + { 0x8C98, 0x734F }, + { 0x8CAD, 0x8CEA }, + { 0x8CAE, 0x4E8C }, + { 0x8CB3, 0x4E8C }, + { 0x8CCD, 0x81D3 }, + { 0x8CE3, 0x58F2 }, + { 0x8CE4, 0x8CCE }, + { 0x8D0A, 0x8CDB }, + { 0x8D13, 0x81D3 }, + { 0x8D71, 0x8D70 }, + { 0x8E08, 0x758E }, + { 0x8E10, 0x8DF5 }, + { 0x8E34, 0x8E0A }, + { 0x8E48, 0x8E0F }, + { 0x8E87, 0x58B8 }, + { 0x8EAA, 0x8E99 }, + { 0x8EB0, 0x4F53 }, + { 0x8EC6, 0x4F53 }, + { 0x8EE3, 0x8F5F }, + { 0x8F0C, 0x4E21 }, + { 0x8F15, 0x8EFD }, + { 0x8F19, 0x8F12 }, + { 0x8F1B, 0x4E21 }, + { 0x8F49, 0x8EE2 }, + { 0x8FA7, 0x5F01 }, + { 0x8FA8, 0x5F01 }, + { 0x8FAD, 0x8F9E }, + { 0x8FAF, 0x5F01 }, + { 0x8FEA, 0x5EF8 }, + { 0x8FEF, 0x9003 }, + { 0x8FF4, 0x5EFB }, + { 0x8FFA, 0x5EFC }, + { 0x900E, 0x9052 }, + { 0x9015, 0x5F84 }, + { 0x9023, 0x806F }, + { 0x9039, 0x9054 }, + { 0x9059, 0x9065 }, + { 0x905E, 0x9013 }, + { 0x9072, 0x9045 }, + { 0x9087, 0x8FE9 }, + { 0x9089, 0x8FBA }, + { 0x908A, 0x8FBA }, + { 0x90B1, 0x4E18 }, + { 0x9130, 0x96A3 }, + { 0x9189, 0x9154 }, + { 0x918B, 0x9162 }, + { 0x91AB, 0x533B }, + { 0x91BA, 0x718F }, + { 0x91C0, 0x91B8 }, + { 0x91CB, 0x91C8 }, + { 0x91E1, 0x91DC }, + { 0x91FC, 0x5263 }, + { 0x9214, 0x6284 }, + { 0x9229, 0x946A }, + { 0x922C, 0x9438 }, + { 0x9248, 0x91F6 }, + { 0x9264, 0x920E }, + { 0x9295, 0x9244 }, + { 0x92EA, 0x8217 }, + { 0x9322, 0x92AD }, + { 0x9394, 0x7194 }, + { 0x93AD, 0x93AE }, + { 0x941A, 0x930F }, + { 0x9421, 0x9244 }, + { 0x9435, 0x9244 }, + { 0x9444, 0x92F3 }, + { 0x9452, 0x9451 }, + { 0x945A, 0x947D }, + { 0x945B, 0x9271 }, + { 0x9587, 0x9589 }, + { 0x95A0, 0x958F }, + { 0x95DC, 0x95A2 }, + { 0x962A, 0x5742 }, + { 0x962F, 0x5740 }, + { 0x9644, 0x4ED8 }, + { 0x9670, 0x852D }, + { 0x9677, 0x9665 }, + { 0x96A8, 0x968F }, + { 0x96AA, 0x967A }, + { 0x96B1, 0x852D }, + { 0x96B8, 0x96B7 }, + { 0x96C6, 0x8F2F }, + { 0x96D9, 0x53CC }, + { 0x96DC, 0x96D1 }, + { 0x9738, 0x8987 }, + { 0x9748, 0x970A }, + { 0x975C, 0x9759 }, + { 0x976B, 0x976D }, + { 0x9771, 0x976D }, + { 0x97ED, 0x97EE }, + { 0x97F2, 0x9F4F }, + { 0x97F5, 0x97FB }, + { 0x9834, 0x7A4E }, + { 0x9838, 0x981A }, + { 0x984B, 0x816E }, + { 0x984F, 0x9854 }, + { 0x986F, 0x9855 }, + { 0x98B1, 0x53F0 }, + { 0x98C3, 0x98C4 }, + { 0x98DC, 0x7FFB }, + { 0x98EE, 0x98F2 }, + { 0x9918, 0x4F59 }, + { 0x991D, 0x98FE }, + { 0x9920, 0x9905 }, + { 0x99C8, 0x99C6 }, + { 0x99F2, 0x99B4 }, + { 0x9A37, 0x9A12 }, + { 0x9A45, 0x99C6 }, + { 0x9A57, 0x9A13 }, + { 0x9A5B, 0x99C5 }, + { 0x9AD3, 0x9AC4 }, + { 0x9AD4, 0x4F53 }, + { 0x9AEE, 0x9AEA }, + { 0x9AF4, 0x5F7F }, + { 0x9B27, 0x9599 }, + { 0x9B28, 0x95A7 }, + { 0x9B2A, 0x95D8 }, + { 0x9B31, 0x6B1D }, + { 0x9B3B, 0x7CA5 }, + { 0x9C1B, 0x9C2E }, + { 0x9C3A, 0x9BF5 }, + { 0x9CEB, 0x96C1 }, + { 0x9CEC, 0x9CE7 }, + { 0x9D08, 0x96C1 }, + { 0x9D44, 0x9D1F }, + { 0x9D5E, 0x9D5D }, + { 0x9DAB, 0x9D87 }, + { 0x9DAF, 0x9D2C }, + { 0x9DC4, 0x9D8F }, + { 0x9DCF, 0x9DC6 }, + { 0x9E7D, 0x5869 }, + { 0x9EA5, 0x9EA6 }, + { 0x9EAA, 0x9EBA }, + { 0x9EB8, 0x9EA9 }, + { 0x9ED8, 0x9ED9 }, + { 0x9EDE, 0x70B9 }, + { 0x9EE8, 0x515A }, + { 0x9F07, 0x9C32 }, + { 0x9F21, 0x9F20 }, + { 0x9F4A, 0x658E }, + { 0x9F4B, 0x658E }, + { 0x9F52, 0x6B6F }, + { 0x9F61, 0x9F62 }, + { 0x9F67, 0x56D3 }, + { 0x9F8D, 0x7ADC }, + { 0x9F9C, 0x4E80 }, + { 0x9F9D, 0x7A50 }, + { 0xFEFF, 0x4E9C } }; ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP() diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx index bd9f253c3cf0..daf831f1e19c 100644 --- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx +++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx @@ -46,37 +46,37 @@ namespace com { namespace sun { namespace star { namespace i18n { // http://charts.unicode.org/Web/UFF00.html OneToOneMappingTable_t large2small[] = { - MAKE_PAIR( 0x3041, 0x3042 ), // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A - MAKE_PAIR( 0x3043, 0x3044 ), // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I - MAKE_PAIR( 0x3045, 0x3046 ), // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U - MAKE_PAIR( 0x3047, 0x3048 ), // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E - MAKE_PAIR( 0x3049, 0x304A ), // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O - MAKE_PAIR( 0x3063, 0x3064 ), // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU - MAKE_PAIR( 0x3083, 0x3084 ), // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA - MAKE_PAIR( 0x3085, 0x3086 ), // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU - MAKE_PAIR( 0x3087, 0x3088 ), // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO - MAKE_PAIR( 0x308E, 0x308F ), // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA - MAKE_PAIR( 0x30A1, 0x30A2 ), // KATAKANA LETTER SMALL A --> KATAKANA LETTER A - MAKE_PAIR( 0x30A3, 0x30A4 ), // KATAKANA LETTER SMALL I --> KATAKANA LETTER I - MAKE_PAIR( 0x30A5, 0x30A6 ), // KATAKANA LETTER SMALL U --> KATAKANA LETTER U - MAKE_PAIR( 0x30A7, 0x30A8 ), // KATAKANA LETTER SMALL E --> KATAKANA LETTER E - MAKE_PAIR( 0x30A9, 0x30AA ), // KATAKANA LETTER SMALL O --> KATAKANA LETTER O - MAKE_PAIR( 0x30C3, 0x30C4 ), // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU - MAKE_PAIR( 0x30E3, 0x30E4 ), // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA - MAKE_PAIR( 0x30E5, 0x30E6 ), // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU - MAKE_PAIR( 0x30E7, 0x30E8 ), // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO - MAKE_PAIR( 0x30EE, 0x30EF ), // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA - MAKE_PAIR( 0x30F5, 0x30AB ), // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA - MAKE_PAIR( 0x30F6, 0x30B1 ), // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE - MAKE_PAIR( 0xFF67, 0xFF71 ), // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A - MAKE_PAIR( 0xFF68, 0xFF72 ), // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I - MAKE_PAIR( 0xFF69, 0xFF73 ), // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U - MAKE_PAIR( 0xFF6A, 0xFF74 ), // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E - MAKE_PAIR( 0xFF6B, 0xFF75 ), // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O - MAKE_PAIR( 0xFF6C, 0xFF94 ), // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA - MAKE_PAIR( 0xFF6D, 0xFF95 ), // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU - MAKE_PAIR( 0xFF6E, 0xFF96 ), // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO - MAKE_PAIR( 0xFF6F, 0xFF82 ) // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU + { 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A + { 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I + { 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U + { 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E + { 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O + { 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU + { 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA + { 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU + { 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO + { 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA + { 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A + { 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I + { 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U + { 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E + { 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O + { 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU + { 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA + { 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU + { 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO + { 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA + { 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA + { 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE + { 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A + { 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I + { 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U + { 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E + { 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O + { 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA + { 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU + { 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO + { 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU }; largeToSmall_ja_JP::largeToSmall_ja_JP() diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx index cb470d8f2b9e..69f110a79b7c 100644 --- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx +++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx @@ -46,37 +46,37 @@ namespace com { namespace sun { namespace star { namespace i18n { // http://charts.unicode.org/Web/UFF00.html OneToOneMappingTable_t small2large[] = { - MAKE_PAIR( 0x3041, 0x3042 ), // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A - MAKE_PAIR( 0x3043, 0x3044 ), // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I - MAKE_PAIR( 0x3045, 0x3046 ), // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U - MAKE_PAIR( 0x3047, 0x3048 ), // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E - MAKE_PAIR( 0x3049, 0x304A ), // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O - MAKE_PAIR( 0x3063, 0x3064 ), // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU - MAKE_PAIR( 0x3083, 0x3084 ), // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA - MAKE_PAIR( 0x3085, 0x3086 ), // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU - MAKE_PAIR( 0x3087, 0x3088 ), // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO - MAKE_PAIR( 0x308E, 0x308F ), // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA - MAKE_PAIR( 0x30A1, 0x30A2 ), // KATAKANA LETTER SMALL A --> KATAKANA LETTER A - MAKE_PAIR( 0x30A3, 0x30A4 ), // KATAKANA LETTER SMALL I --> KATAKANA LETTER I - MAKE_PAIR( 0x30A5, 0x30A6 ), // KATAKANA LETTER SMALL U --> KATAKANA LETTER U - MAKE_PAIR( 0x30A7, 0x30A8 ), // KATAKANA LETTER SMALL E --> KATAKANA LETTER E - MAKE_PAIR( 0x30A9, 0x30AA ), // KATAKANA LETTER SMALL O --> KATAKANA LETTER O - MAKE_PAIR( 0x30C3, 0x30C4 ), // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU - MAKE_PAIR( 0x30E3, 0x30E4 ), // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA - MAKE_PAIR( 0x30E5, 0x30E6 ), // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU - MAKE_PAIR( 0x30E7, 0x30E8 ), // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO - MAKE_PAIR( 0x30EE, 0x30EF ), // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA - MAKE_PAIR( 0x30F5, 0x30AB ), // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA - MAKE_PAIR( 0x30F6, 0x30B1 ), // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE - MAKE_PAIR( 0xFF67, 0xFF71 ), // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A - MAKE_PAIR( 0xFF68, 0xFF72 ), // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I - MAKE_PAIR( 0xFF69, 0xFF73 ), // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U - MAKE_PAIR( 0xFF6A, 0xFF74 ), // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E - MAKE_PAIR( 0xFF6B, 0xFF75 ), // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O - MAKE_PAIR( 0xFF6C, 0xFF94 ), // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA - MAKE_PAIR( 0xFF6D, 0xFF95 ), // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU - MAKE_PAIR( 0xFF6E, 0xFF96 ), // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO - MAKE_PAIR( 0xFF6F, 0xFF82 ) // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU + { 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A + { 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I + { 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U + { 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E + { 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O + { 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU + { 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA + { 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU + { 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO + { 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA + { 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A + { 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I + { 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U + { 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E + { 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O + { 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU + { 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA + { 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU + { 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO + { 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA + { 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA + { 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE + { 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A + { 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I + { 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U + { 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E + { 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O + { 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA + { 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU + { 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO + { 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU }; smallToLarge_ja_JP::smallToLarge_ja_JP() diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx index d40dd1d42cc4..cbb675617463 100644 --- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx +++ b/i18nutil/inc/i18nutil/oneToOneMapping.hxx @@ -28,7 +28,6 @@ #ifndef INCLUDED_I18NUTIL_TRANSLITERATION_ONETOONEMAPPING_HXX #define INCLUDED_I18NUTIL_TRANSLITERATION_ONETOONEMAPPING_HXX -#include <utility> #include <boost/noncopyable.hpp> #include <rtl/ustring.hxx> #include "i18nutildllapi.h" @@ -37,24 +36,22 @@ namespace com { namespace sun { namespace star { namespace i18n { class widthfolding; -typedef std::pair< sal_Unicode, sal_Unicode > OneToOneMappingTable_t; - -#define MAKE_PAIR(item1,item2) std::make_pair< sal_Unicode, sal_Unicode >((sal_Unicode)item1,(sal_Unicode)item2) +struct OneToOneMappingTable_t +{ + sal_Unicode first; + sal_Unicode second; +}; typedef sal_Int8 UnicodePairFlag; -typedef struct _UnicodePairWithFlag +struct UnicodePairWithFlag { - sal_Unicode first; - sal_Unicode second; + sal_Unicode first; + sal_Unicode second; UnicodePairFlag flag; -} UnicodePairWithFlag; +}; -class I18NUTIL_DLLPUBLIC oneToOneMapping +class I18NUTIL_DLLPUBLIC oneToOneMapping : private boost::noncopyable { -private: - // no copy, no substitution - I18NUTIL_DLLPRIVATE oneToOneMapping( const oneToOneMapping& ); - I18NUTIL_DLLPRIVATE oneToOneMapping& operator=( const oneToOneMapping& ); public: oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) ); virtual ~oneToOneMapping(); @@ -70,7 +67,7 @@ protected: size_t mnSize; }; -class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : private boost::noncopyable, public oneToOneMapping +class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping { friend class widthfolding; |