Skip to content

Commit ba1c089

Browse files
committed
Merge branch 'bb/unicode-10.0' into maint
Update the character width tables. * bb/unicode-10.0: unicode: update the width tables to Unicode 10
2 parents 08f9c32 + 7560aac commit ba1c089

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

unicode_width.h

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ static const struct interval zero_width[] = {
5151
{ 0x0AC7, 0x0AC8 },
5252
{ 0x0ACD, 0x0ACD },
5353
{ 0x0AE2, 0x0AE3 },
54+
{ 0x0AFA, 0x0AFF },
5455
{ 0x0B01, 0x0B01 },
5556
{ 0x0B3C, 0x0B3C },
5657
{ 0x0B3F, 0x0B3F },
@@ -73,7 +74,8 @@ static const struct interval zero_width[] = {
7374
{ 0x0CC6, 0x0CC6 },
7475
{ 0x0CCC, 0x0CCD },
7576
{ 0x0CE2, 0x0CE3 },
76-
{ 0x0D01, 0x0D01 },
77+
{ 0x0D00, 0x0D01 },
78+
{ 0x0D3B, 0x0D3C },
7779
{ 0x0D41, 0x0D44 },
7880
{ 0x0D4D, 0x0D4D },
7981
{ 0x0D62, 0x0D63 },
@@ -158,7 +160,7 @@ static const struct interval zero_width[] = {
158160
{ 0x1CED, 0x1CED },
159161
{ 0x1CF4, 0x1CF4 },
160162
{ 0x1CF8, 0x1CF9 },
161-
{ 0x1DC0, 0x1DF5 },
163+
{ 0x1DC0, 0x1DF9 },
162164
{ 0x1DFB, 0x1DFF },
163165
{ 0x200B, 0x200F },
164166
{ 0x202A, 0x202E },
@@ -262,13 +264,27 @@ static const struct interval zero_width[] = {
262264
{ 0x1171D, 0x1171F },
263265
{ 0x11722, 0x11725 },
264266
{ 0x11727, 0x1172B },
267+
{ 0x11A01, 0x11A06 },
268+
{ 0x11A09, 0x11A0A },
269+
{ 0x11A33, 0x11A38 },
270+
{ 0x11A3B, 0x11A3E },
271+
{ 0x11A47, 0x11A47 },
272+
{ 0x11A51, 0x11A56 },
273+
{ 0x11A59, 0x11A5B },
274+
{ 0x11A8A, 0x11A96 },
275+
{ 0x11A98, 0x11A99 },
265276
{ 0x11C30, 0x11C36 },
266277
{ 0x11C38, 0x11C3D },
267278
{ 0x11C3F, 0x11C3F },
268279
{ 0x11C92, 0x11CA7 },
269280
{ 0x11CAA, 0x11CB0 },
270281
{ 0x11CB2, 0x11CB3 },
271282
{ 0x11CB5, 0x11CB6 },
283+
{ 0x11D31, 0x11D36 },
284+
{ 0x11D3A, 0x11D3A },
285+
{ 0x11D3C, 0x11D3D },
286+
{ 0x11D3F, 0x11D45 },
287+
{ 0x11D47, 0x11D47 },
272288
{ 0x16AF0, 0x16AF4 },
273289
{ 0x16B30, 0x16B36 },
274290
{ 0x16F8F, 0x16F92 },
@@ -339,7 +355,7 @@ static const struct interval double_width[] = {
339355
{ 0x3000, 0x303E },
340356
{ 0x3041, 0x3096 },
341357
{ 0x3099, 0x30FF },
342-
{ 0x3105, 0x312D },
358+
{ 0x3105, 0x312E },
343359
{ 0x3131, 0x318E },
344360
{ 0x3190, 0x31BA },
345361
{ 0x31C0, 0x31E3 },
@@ -358,10 +374,11 @@ static const struct interval double_width[] = {
358374
{ 0xFE68, 0xFE6B },
359375
{ 0xFF01, 0xFF60 },
360376
{ 0xFFE0, 0xFFE6 },
361-
{ 0x16FE0, 0x16FE0 },
377+
{ 0x16FE0, 0x16FE1 },
362378
{ 0x17000, 0x187EC },
363379
{ 0x18800, 0x18AF2 },
364-
{ 0x1B000, 0x1B001 },
380+
{ 0x1B000, 0x1B11E },
381+
{ 0x1B170, 0x1B2FB },
365382
{ 0x1F004, 0x1F004 },
366383
{ 0x1F0CF, 0x1F0CF },
367384
{ 0x1F18E, 0x1F18E },
@@ -370,6 +387,7 @@ static const struct interval double_width[] = {
370387
{ 0x1F210, 0x1F23B },
371388
{ 0x1F240, 0x1F248 },
372389
{ 0x1F250, 0x1F251 },
390+
{ 0x1F260, 0x1F265 },
373391
{ 0x1F300, 0x1F320 },
374392
{ 0x1F32D, 0x1F335 },
375393
{ 0x1F337, 0x1F37C },
@@ -392,15 +410,13 @@ static const struct interval double_width[] = {
392410
{ 0x1F6CC, 0x1F6CC },
393411
{ 0x1F6D0, 0x1F6D2 },
394412
{ 0x1F6EB, 0x1F6EC },
395-
{ 0x1F6F4, 0x1F6F6 },
396-
{ 0x1F910, 0x1F91E },
397-
{ 0x1F920, 0x1F927 },
398-
{ 0x1F930, 0x1F930 },
399-
{ 0x1F933, 0x1F93E },
400-
{ 0x1F940, 0x1F94B },
401-
{ 0x1F950, 0x1F95E },
402-
{ 0x1F980, 0x1F991 },
413+
{ 0x1F6F4, 0x1F6F8 },
414+
{ 0x1F910, 0x1F93E },
415+
{ 0x1F940, 0x1F94C },
416+
{ 0x1F950, 0x1F96B },
417+
{ 0x1F980, 0x1F997 },
403418
{ 0x1F9C0, 0x1F9C0 },
419+
{ 0x1F9D0, 0x1F9E6 },
404420
{ 0x20000, 0x2FFFD },
405421
{ 0x30000, 0x3FFFD }
406422
};

0 commit comments

Comments
 (0)