From b70b571820c74b3619e388006c6754b33a68fd3f Mon Sep 17 00:00:00 2001 From: dimitr Date: Mon, 13 Sep 2010 15:02:40 +0000 Subject: [PATCH] Fixed CORE-3131: WIN1257_LV (Latvian) collation is wrong for 4 letters: A E I U. --- src/intl/collations/win1257_lv.h | 206 +++++++++++++++---------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/src/intl/collations/win1257_lv.h b/src/intl/collations/win1257_lv.h index 7b2bdf0d15c..ecea7afd15a 100644 --- a/src/intl/collations/win1257_lv.h +++ b/src/intl/collations/win1257_lv.h @@ -5,7 +5,7 @@ const int UPPERCASE_LEN = 256; const int NOCASESORT_LEN = 256; const int LDRV_TIEBREAK = 0; // TODO -const int MAX_NCO_PRIMARY = 168; +const int MAX_NCO_PRIMARY = 170; const int MAX_NCO_SECONDARY = 5; const int MAX_NCO_TERTIARY = 1; const int MAX_NCO_IGNORE = 0; @@ -605,27 +605,27 @@ static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = { { FIRST_PRIMARY + 134, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 67 C */ { FIRST_PRIMARY + 136, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 68 D */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 69 E */ - { FIRST_PRIMARY + 138, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 70 F */ - { FIRST_PRIMARY + 139, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 71 G */ - { FIRST_PRIMARY + 141, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 72 H */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 73 I */ - { FIRST_PRIMARY + 143, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 74 J */ - { FIRST_PRIMARY + 144, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 75 K */ - { FIRST_PRIMARY + 146, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 76 L */ - { FIRST_PRIMARY + 148, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 77 M */ - { FIRST_PRIMARY + 149, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 78 N */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 79 O */ - { FIRST_PRIMARY + 152, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 80 P */ - { FIRST_PRIMARY + 153, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 81 Q */ - { FIRST_PRIMARY + 154, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 82 R */ - { FIRST_PRIMARY + 155, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 83 S */ - { FIRST_PRIMARY + 158, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 84 T */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 85 U */ - { FIRST_PRIMARY + 161, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 86 V */ - { FIRST_PRIMARY + 162, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 87 W */ - { FIRST_PRIMARY + 163, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 88 X */ - { FIRST_PRIMARY + 164, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 89 Y */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 90 Z */ + { FIRST_PRIMARY + 139, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 70 F */ + { FIRST_PRIMARY + 140, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 71 G */ + { FIRST_PRIMARY + 142, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 72 H */ + { FIRST_PRIMARY + 143, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 73 I */ + { FIRST_PRIMARY + 145, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 74 J */ + { FIRST_PRIMARY + 146, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 75 K */ + { FIRST_PRIMARY + 148, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 76 L */ + { FIRST_PRIMARY + 150, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 77 M */ + { FIRST_PRIMARY + 151, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 78 N */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 79 O */ + { FIRST_PRIMARY + 154, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 80 P */ + { FIRST_PRIMARY + 155, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 81 Q */ + { FIRST_PRIMARY + 156, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 82 R */ + { FIRST_PRIMARY + 157, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 83 S */ + { FIRST_PRIMARY + 159, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 84 T */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 85 U */ + { FIRST_PRIMARY + 163, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 86 V */ + { FIRST_PRIMARY + 164, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 87 W */ + { FIRST_PRIMARY + 165, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 88 X */ + { FIRST_PRIMARY + 166, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 89 Y */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 90 Z */ { FIRST_PRIMARY + 66, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 91 [ */ { FIRST_PRIMARY + 67, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 92 \ */ { FIRST_PRIMARY + 68, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 93 ] */ @@ -637,27 +637,27 @@ static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = { { FIRST_PRIMARY + 134, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 99 c */ { FIRST_PRIMARY + 136, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 100 d */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 101 e */ - { FIRST_PRIMARY + 138, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 102 f */ - { FIRST_PRIMARY + 139, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 103 g */ - { FIRST_PRIMARY + 141, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 104 h */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 105 i */ - { FIRST_PRIMARY + 143, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 106 j */ - { FIRST_PRIMARY + 144, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 107 k */ - { FIRST_PRIMARY + 146, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 108 l */ - { FIRST_PRIMARY + 148, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 109 m */ - { FIRST_PRIMARY + 149, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 110 n */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 111 o */ - { FIRST_PRIMARY + 152, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 112 p */ - { FIRST_PRIMARY + 153, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 113 q */ - { FIRST_PRIMARY + 154, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 114 r */ - { FIRST_PRIMARY + 155, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 115 s */ - { FIRST_PRIMARY + 158, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 116 t */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 117 u */ - { FIRST_PRIMARY + 161, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 118 v */ - { FIRST_PRIMARY + 162, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 119 w */ - { FIRST_PRIMARY + 163, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 120 x */ - { FIRST_PRIMARY + 164, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 121 y */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 122 z */ + { FIRST_PRIMARY + 139, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 102 f */ + { FIRST_PRIMARY + 140, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 103 g */ + { FIRST_PRIMARY + 142, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 104 h */ + { FIRST_PRIMARY + 143, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 105 i */ + { FIRST_PRIMARY + 145, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 106 j */ + { FIRST_PRIMARY + 146, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 107 k */ + { FIRST_PRIMARY + 148, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 108 l */ + { FIRST_PRIMARY + 150, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 109 m */ + { FIRST_PRIMARY + 151, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 110 n */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 111 o */ + { FIRST_PRIMARY + 154, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 112 p */ + { FIRST_PRIMARY + 155, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 113 q */ + { FIRST_PRIMARY + 156, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 114 r */ + { FIRST_PRIMARY + 157, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 115 s */ + { FIRST_PRIMARY + 159, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 116 t */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 117 u */ + { FIRST_PRIMARY + 163, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 118 v */ + { FIRST_PRIMARY + 164, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 119 w */ + { FIRST_PRIMARY + 165, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 120 x */ + { FIRST_PRIMARY + 166, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 121 y */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 122 z */ { FIRST_PRIMARY + 72, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 123 { */ { FIRST_PRIMARY + 73, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 124 | */ { FIRST_PRIMARY + 74, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 125 } */ @@ -688,7 +688,7 @@ static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = { { FIRST_PRIMARY + 41, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 150 – */ { FIRST_PRIMARY + 42, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 151 — */ { FIRST_PRIMARY + 34, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 152 ˜ */ - { FIRST_PRIMARY + 159, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 153 ™ */ + { FIRST_PRIMARY + 160, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 153 ™ */ { FIRST_PRIMARY + 35, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 154 š */ { FIRST_PRIMARY + 91, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 155 › */ { FIRST_PRIMARY + 36, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 156 œ */ @@ -696,21 +696,21 @@ static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = { { FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 158 ž */ { FIRST_PRIMARY + 37, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 159 Ÿ */ { FIRST_PRIMARY + 44, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 160   */ - { FIRST_PRIMARY + 167, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 161 ¡ */ + { FIRST_PRIMARY + 169, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 161 ¡ */ { FIRST_PRIMARY + 101, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 162 ¢ */ { FIRST_PRIMARY + 102, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 163 £ */ { FIRST_PRIMARY + 103, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 164 ¤ */ - { FIRST_PRIMARY + 168, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 165 ¥ */ + { FIRST_PRIMARY + 170, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 165 ¥ */ { FIRST_PRIMARY + 76, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 166 ¦ */ { FIRST_PRIMARY + 104, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 167 § */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 5, FIRST_TERTIARY + 1, 0, 0 }, /* 168 ¨ */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 5, FIRST_TERTIARY + 1, 0, 0 }, /* 168 ¨ */ { FIRST_PRIMARY + 105, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 169 © */ - { FIRST_PRIMARY + 154, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 170 ª */ + { FIRST_PRIMARY + 156, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 170 ª */ { FIRST_PRIMARY + 97, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 171 « */ { FIRST_PRIMARY + 106, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 172 ¬ */ { FIRST_PRIMARY + 40, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 173 ­ */ { FIRST_PRIMARY + 107, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 174 ® */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 5, FIRST_TERTIARY + 1, 1, 0 }, /* 175 ¯ */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 4, FIRST_TERTIARY + 1, 1, 0 }, /* 175 ¯ */ { FIRST_PRIMARY + 108, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 176 ° */ { FIRST_PRIMARY + 96, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 177 ± */ { FIRST_PRIMARY + 123, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 178 ² */ @@ -719,77 +719,77 @@ static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = { { FIRST_PRIMARY + 109, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 181 µ */ { FIRST_PRIMARY + 110, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 182 ¶ */ { FIRST_PRIMARY + 111, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 183 · */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 5, FIRST_TERTIARY + 0, 0, 0 }, /* 184 ¸ */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 5, FIRST_TERTIARY + 0, 0, 0 }, /* 184 ¸ */ { FIRST_PRIMARY + 122, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 185 ¹ */ - { FIRST_PRIMARY + 154, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 186 º */ + { FIRST_PRIMARY + 156, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 186 º */ { FIRST_PRIMARY + 98, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 187 » */ { FIRST_PRIMARY + 119, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 188 ¼ */ { FIRST_PRIMARY + 120, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 189 ½ */ { FIRST_PRIMARY + 121, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 190 ¾ */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 5, FIRST_TERTIARY + 0, 1, 0 }, /* 191 ¿ */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 4, FIRST_TERTIARY + 1, 0, 0 }, /* 192 À */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 193 Á */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 194  */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 4, FIRST_TERTIARY + 0, 1, 0 }, /* 191 ¿ */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 192 À */ + { FIRST_PRIMARY + 143, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 193 Á */ + { FIRST_PRIMARY + 132, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 194  */ { FIRST_PRIMARY + 134, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 195 à */ { FIRST_PRIMARY + 131, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 196 Ä */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 197 Å */ - { FIRST_PRIMARY + 137, FIRST_SECONDARY + 4, FIRST_TERTIARY + 1, 0, 0 }, /* 198 Æ */ - { FIRST_PRIMARY + 137, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 199 Ç */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 197 Å */ + { FIRST_PRIMARY + 137, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 198 Æ */ + { FIRST_PRIMARY + 138, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 199 Ç */ { FIRST_PRIMARY + 135, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 200 È */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 201 É */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 202 Ê */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 202 Ê */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 203 Ë */ - { FIRST_PRIMARY + 140, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 204 Ì */ - { FIRST_PRIMARY + 145, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 205 Í */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 206 Î */ - { FIRST_PRIMARY + 147, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 207 Ï */ - { FIRST_PRIMARY + 157, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 208 Ð */ - { FIRST_PRIMARY + 149, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 209 Ñ */ - { FIRST_PRIMARY + 150, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 210 Ò */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 211 Ó */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 212 Ô */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 4, FIRST_TERTIARY + 1, 0, 0 }, /* 213 Õ */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 214 Ö */ + { FIRST_PRIMARY + 141, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 204 Ì */ + { FIRST_PRIMARY + 147, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 205 Í */ + { FIRST_PRIMARY + 144, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 206 Î */ + { FIRST_PRIMARY + 149, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 207 Ï */ + { FIRST_PRIMARY + 158, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 208 Ð */ + { FIRST_PRIMARY + 151, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 209 Ñ */ + { FIRST_PRIMARY + 152, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 210 Ò */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 211 Ó */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 212 Ô */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 4, FIRST_TERTIARY + 1, 0, 0 }, /* 213 Õ */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 214 Ö */ { FIRST_PRIMARY + 99, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 215 × */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 3, FIRST_TERTIARY + 1, 0, 0 }, /* 216 Ø */ - { FIRST_PRIMARY + 146, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 217 Ù */ - { FIRST_PRIMARY + 155, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 218 Ú */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 219 Û */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 220 Ü */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 221 Ý */ - { FIRST_PRIMARY + 166, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 222 Þ */ - { FIRST_PRIMARY + 155, FIRST_SECONDARY + 2, NULL_TERTIARY, 1, 0 }, /* 223 ß */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 4, FIRST_TERTIARY + 0, 0, 0 }, /* 224 à */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 225 á */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 226 â */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 216 Ø */ + { FIRST_PRIMARY + 148, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 217 Ù */ + { FIRST_PRIMARY + 157, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 218 Ú */ + { FIRST_PRIMARY + 162, FIRST_SECONDARY + 0, FIRST_TERTIARY + 1, 0, 0 }, /* 219 Û */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 1, FIRST_TERTIARY + 1, 0, 0 }, /* 220 Ü */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 2, FIRST_TERTIARY + 1, 0, 0 }, /* 221 Ý */ + { FIRST_PRIMARY + 168, NULL_SECONDARY, FIRST_TERTIARY + 1, 0, 0 }, /* 222 Þ */ + { FIRST_PRIMARY + 157, FIRST_SECONDARY + 2, NULL_TERTIARY, 1, 0 }, /* 223 ß */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 224 à */ + { FIRST_PRIMARY + 143, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 225 á */ + { FIRST_PRIMARY + 132, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 226 â */ { FIRST_PRIMARY + 134, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 227 ã */ { FIRST_PRIMARY + 131, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 228 ä */ - { FIRST_PRIMARY + 131, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 229 å */ - { FIRST_PRIMARY + 137, FIRST_SECONDARY + 4, FIRST_TERTIARY + 0, 0, 0 }, /* 230 æ */ - { FIRST_PRIMARY + 137, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 231 ç */ + { FIRST_PRIMARY + 131, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 229 å */ + { FIRST_PRIMARY + 137, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 230 æ */ + { FIRST_PRIMARY + 138, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 231 ç */ { FIRST_PRIMARY + 135, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 232 è */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 233 é */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 234 ê */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 234 ê */ { FIRST_PRIMARY + 137, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 235 ë */ - { FIRST_PRIMARY + 140, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 236 ì */ - { FIRST_PRIMARY + 145, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 237 í */ - { FIRST_PRIMARY + 142, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 238 î */ - { FIRST_PRIMARY + 147, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 239 ï */ - { FIRST_PRIMARY + 157, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 240 ð */ - { FIRST_PRIMARY + 149, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 241 ñ */ - { FIRST_PRIMARY + 150, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 242 ò */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 243 ó */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 244 ô */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 4, FIRST_TERTIARY + 0, 0, 0 }, /* 245 õ */ - { FIRST_PRIMARY + 151, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 246 ö */ + { FIRST_PRIMARY + 141, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 236 ì */ + { FIRST_PRIMARY + 147, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 237 í */ + { FIRST_PRIMARY + 144, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 238 î */ + { FIRST_PRIMARY + 149, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 239 ï */ + { FIRST_PRIMARY + 158, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 240 ð */ + { FIRST_PRIMARY + 151, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 241 ñ */ + { FIRST_PRIMARY + 152, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 242 ò */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 243 ó */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 244 ô */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 4, FIRST_TERTIARY + 0, 0, 0 }, /* 245 õ */ + { FIRST_PRIMARY + 153, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 246 ö */ { FIRST_PRIMARY + 100, NULL_SECONDARY, NULL_TERTIARY, 0, 0 }, /* 247 ÷ */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 3, FIRST_TERTIARY + 0, 0, 0 }, /* 248 ø */ - { FIRST_PRIMARY + 146, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 249 ù */ - { FIRST_PRIMARY + 155, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 250 ú */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 251 û */ - { FIRST_PRIMARY + 160, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 252 ü */ - { FIRST_PRIMARY + 165, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 253 ý */ - { FIRST_PRIMARY + 166, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 254 þ */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 248 ø */ + { FIRST_PRIMARY + 148, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 249 ù */ + { FIRST_PRIMARY + 157, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 250 ú */ + { FIRST_PRIMARY + 162, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0 }, /* 251 û */ + { FIRST_PRIMARY + 161, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0 }, /* 252 ü */ + { FIRST_PRIMARY + 167, FIRST_SECONDARY + 2, FIRST_TERTIARY + 0, 0, 0 }, /* 253 ý */ + { FIRST_PRIMARY + 168, NULL_SECONDARY, FIRST_TERTIARY + 0, 0, 0 }, /* 254 þ */ { FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0 } /* 255 ÿ */ };