Skip to content

Commit 5b9b715

Browse files
committed
Merge branch 'tb/unicode-7.0-display-width'
* tb/unicode-7.0-display-width: Update of unicode_width.h to Unicode Version 7.0
2 parents ccca6b6 + a67c821 commit 5b9b715

File tree

1 file changed

+42
-7
lines changed

1 file changed

+42
-7
lines changed

unicode_width.h

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ static const struct interval zero_width[] = {
66
{ 0x05C1, 0x05C2 },
77
{ 0x05C4, 0x05C5 },
88
{ 0x05C7, 0x05C7 },
9-
{ 0x0600, 0x0604 },
9+
{ 0x0600, 0x0605 },
1010
{ 0x0610, 0x061A },
1111
{ 0x061C, 0x061C },
1212
{ 0x064B, 0x065F },
@@ -25,8 +25,7 @@ static const struct interval zero_width[] = {
2525
{ 0x0825, 0x0827 },
2626
{ 0x0829, 0x082D },
2727
{ 0x0859, 0x085B },
28-
{ 0x08E4, 0x08FE },
29-
{ 0x0900, 0x0902 },
28+
{ 0x08E4, 0x0902 },
3029
{ 0x093A, 0x093A },
3130
{ 0x093C, 0x093C },
3231
{ 0x0941, 0x0948 },
@@ -62,16 +61,19 @@ static const struct interval zero_width[] = {
6261
{ 0x0B82, 0x0B82 },
6362
{ 0x0BC0, 0x0BC0 },
6463
{ 0x0BCD, 0x0BCD },
64+
{ 0x0C00, 0x0C00 },
6565
{ 0x0C3E, 0x0C40 },
6666
{ 0x0C46, 0x0C48 },
6767
{ 0x0C4A, 0x0C4D },
6868
{ 0x0C55, 0x0C56 },
6969
{ 0x0C62, 0x0C63 },
70+
{ 0x0C81, 0x0C81 },
7071
{ 0x0CBC, 0x0CBC },
7172
{ 0x0CBF, 0x0CBF },
7273
{ 0x0CC6, 0x0CC6 },
7374
{ 0x0CCC, 0x0CCD },
7475
{ 0x0CE2, 0x0CE3 },
76+
{ 0x0D01, 0x0D01 },
7577
{ 0x0D41, 0x0D44 },
7678
{ 0x0D4D, 0x0D4D },
7779
{ 0x0D62, 0x0D63 },
@@ -132,6 +134,7 @@ static const struct interval zero_width[] = {
132134
{ 0x1A65, 0x1A6C },
133135
{ 0x1A73, 0x1A7C },
134136
{ 0x1A7F, 0x1A7F },
137+
{ 0x1AB0, 0x1ABE },
135138
{ 0x1B00, 0x1B03 },
136139
{ 0x1B34, 0x1B34 },
137140
{ 0x1B36, 0x1B3A },
@@ -141,7 +144,7 @@ static const struct interval zero_width[] = {
141144
{ 0x1B80, 0x1B81 },
142145
{ 0x1BA2, 0x1BA5 },
143146
{ 0x1BA8, 0x1BA9 },
144-
{ 0x1BAB, 0x1BAB },
147+
{ 0x1BAB, 0x1BAD },
145148
{ 0x1BE6, 0x1BE6 },
146149
{ 0x1BE8, 0x1BE9 },
147150
{ 0x1BED, 0x1BED },
@@ -153,7 +156,8 @@ static const struct interval zero_width[] = {
153156
{ 0x1CE2, 0x1CE8 },
154157
{ 0x1CED, 0x1CED },
155158
{ 0x1CF4, 0x1CF4 },
156-
{ 0x1DC0, 0x1DE6 },
159+
{ 0x1CF8, 0x1CF9 },
160+
{ 0x1DC0, 0x1DF5 },
157161
{ 0x1DFC, 0x1DFF },
158162
{ 0x200B, 0x200F },
159163
{ 0x202A, 0x202E },
@@ -181,11 +185,13 @@ static const struct interval zero_width[] = {
181185
{ 0xA9B3, 0xA9B3 },
182186
{ 0xA9B6, 0xA9B9 },
183187
{ 0xA9BC, 0xA9BC },
188+
{ 0xA9E5, 0xA9E5 },
184189
{ 0xAA29, 0xAA2E },
185190
{ 0xAA31, 0xAA32 },
186191
{ 0xAA35, 0xAA36 },
187192
{ 0xAA43, 0xAA43 },
188193
{ 0xAA4C, 0xAA4C },
194+
{ 0xAA7C, 0xAA7C },
189195
{ 0xAAB0, 0xAAB0 },
190196
{ 0xAAB2, 0xAAB4 },
191197
{ 0xAAB7, 0xAAB8 },
@@ -198,36 +204,65 @@ static const struct interval zero_width[] = {
198204
{ 0xABED, 0xABED },
199205
{ 0xFB1E, 0xFB1E },
200206
{ 0xFE00, 0xFE0F },
201-
{ 0xFE20, 0xFE26 },
207+
{ 0xFE20, 0xFE2D },
202208
{ 0xFEFF, 0xFEFF },
203209
{ 0xFFF9, 0xFFFB },
204210
{ 0x101FD, 0x101FD },
211+
{ 0x102E0, 0x102E0 },
212+
{ 0x10376, 0x1037A },
205213
{ 0x10A01, 0x10A03 },
206214
{ 0x10A05, 0x10A06 },
207215
{ 0x10A0C, 0x10A0F },
208216
{ 0x10A38, 0x10A3A },
209217
{ 0x10A3F, 0x10A3F },
218+
{ 0x10AE5, 0x10AE6 },
210219
{ 0x11001, 0x11001 },
211220
{ 0x11038, 0x11046 },
212-
{ 0x11080, 0x11081 },
221+
{ 0x1107F, 0x11081 },
213222
{ 0x110B3, 0x110B6 },
214223
{ 0x110B9, 0x110BA },
215224
{ 0x110BD, 0x110BD },
216225
{ 0x11100, 0x11102 },
217226
{ 0x11127, 0x1112B },
218227
{ 0x1112D, 0x11134 },
228+
{ 0x11173, 0x11173 },
219229
{ 0x11180, 0x11181 },
220230
{ 0x111B6, 0x111BE },
231+
{ 0x1122F, 0x11231 },
232+
{ 0x11234, 0x11234 },
233+
{ 0x11236, 0x11237 },
234+
{ 0x112DF, 0x112DF },
235+
{ 0x112E3, 0x112EA },
236+
{ 0x11301, 0x11301 },
237+
{ 0x1133C, 0x1133C },
238+
{ 0x11340, 0x11340 },
239+
{ 0x11366, 0x1136C },
240+
{ 0x11370, 0x11374 },
241+
{ 0x114B3, 0x114B8 },
242+
{ 0x114BA, 0x114BA },
243+
{ 0x114BF, 0x114C0 },
244+
{ 0x114C2, 0x114C3 },
245+
{ 0x115B2, 0x115B5 },
246+
{ 0x115BC, 0x115BD },
247+
{ 0x115BF, 0x115C0 },
248+
{ 0x11633, 0x1163A },
249+
{ 0x1163D, 0x1163D },
250+
{ 0x1163F, 0x11640 },
221251
{ 0x116AB, 0x116AB },
222252
{ 0x116AD, 0x116AD },
223253
{ 0x116B0, 0x116B5 },
224254
{ 0x116B7, 0x116B7 },
255+
{ 0x16AF0, 0x16AF4 },
256+
{ 0x16B30, 0x16B36 },
225257
{ 0x16F8F, 0x16F92 },
258+
{ 0x1BC9D, 0x1BC9E },
259+
{ 0x1BCA0, 0x1BCA3 },
226260
{ 0x1D167, 0x1D169 },
227261
{ 0x1D173, 0x1D182 },
228262
{ 0x1D185, 0x1D18B },
229263
{ 0x1D1AA, 0x1D1AD },
230264
{ 0x1D242, 0x1D244 },
265+
{ 0x1E8D0, 0x1E8D6 },
231266
{ 0xE0001, 0xE0001 },
232267
{ 0xE0020, 0xE007F },
233268
{ 0xE0100, 0xE01EF }

0 commit comments

Comments
 (0)