Skip to content

Commit b0dfa10

Browse files
committed
Merge branch 'bb/unicode-12' into next
Unicode update. * bb/unicode-12: unicode: update the width tables to Unicode 12
2 parents e160d4a + 584b62c commit b0dfa10

File tree

1 file changed

+25
-13
lines changed

1 file changed

+25
-13
lines changed

unicode-width.h

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ static const struct interval zero_width[] = {
8989
{ 0x0E34, 0x0E3A },
9090
{ 0x0E47, 0x0E4E },
9191
{ 0x0EB1, 0x0EB1 },
92-
{ 0x0EB4, 0x0EB9 },
93-
{ 0x0EBB, 0x0EBC },
92+
{ 0x0EB4, 0x0EBC },
9493
{ 0x0EC8, 0x0ECD },
9594
{ 0x0F18, 0x0F19 },
9695
{ 0x0F35, 0x0F35 },
@@ -191,7 +190,7 @@ static const struct interval zero_width[] = {
191190
{ 0xA980, 0xA982 },
192191
{ 0xA9B3, 0xA9B3 },
193192
{ 0xA9B6, 0xA9B9 },
194-
{ 0xA9BC, 0xA9BC },
193+
{ 0xA9BC, 0xA9BD },
195194
{ 0xA9E5, 0xA9E5 },
196195
{ 0xAA29, 0xAA2E },
197196
{ 0xAA31, 0xAA32 },
@@ -274,6 +273,9 @@ static const struct interval zero_width[] = {
274273
{ 0x11727, 0x1172B },
275274
{ 0x1182F, 0x11837 },
276275
{ 0x11839, 0x1183A },
276+
{ 0x119D4, 0x119D7 },
277+
{ 0x119DA, 0x119DB },
278+
{ 0x119E0, 0x119E0 },
277279
{ 0x11A01, 0x11A0A },
278280
{ 0x11A33, 0x11A38 },
279281
{ 0x11A3B, 0x11A3E },
@@ -298,8 +300,10 @@ static const struct interval zero_width[] = {
298300
{ 0x11D95, 0x11D95 },
299301
{ 0x11D97, 0x11D97 },
300302
{ 0x11EF3, 0x11EF4 },
303+
{ 0x13430, 0x13438 },
301304
{ 0x16AF0, 0x16AF4 },
302305
{ 0x16B30, 0x16B36 },
306+
{ 0x16F4F, 0x16F4F },
303307
{ 0x16F8F, 0x16F92 },
304308
{ 0x1BC9D, 0x1BC9E },
305309
{ 0x1BCA0, 0x1BCA3 },
@@ -319,6 +323,8 @@ static const struct interval zero_width[] = {
319323
{ 0x1E01B, 0x1E021 },
320324
{ 0x1E023, 0x1E024 },
321325
{ 0x1E026, 0x1E02A },
326+
{ 0x1E130, 0x1E136 },
327+
{ 0x1E2EC, 0x1E2EF },
322328
{ 0x1E8D0, 0x1E8D6 },
323329
{ 0x1E944, 0x1E94A },
324330
{ 0xE0001, 0xE0001 },
@@ -387,10 +393,12 @@ static const struct interval double_width[] = {
387393
{ 0xFE68, 0xFE6B },
388394
{ 0xFF01, 0xFF60 },
389395
{ 0xFFE0, 0xFFE6 },
390-
{ 0x16FE0, 0x16FE1 },
391-
{ 0x17000, 0x187F1 },
396+
{ 0x16FE0, 0x16FE3 },
397+
{ 0x17000, 0x187F7 },
392398
{ 0x18800, 0x18AF2 },
393399
{ 0x1B000, 0x1B11E },
400+
{ 0x1B150, 0x1B152 },
401+
{ 0x1B164, 0x1B167 },
394402
{ 0x1B170, 0x1B2FB },
395403
{ 0x1F004, 0x1F004 },
396404
{ 0x1F0CF, 0x1F0CF },
@@ -422,16 +430,20 @@ static const struct interval double_width[] = {
422430
{ 0x1F680, 0x1F6C5 },
423431
{ 0x1F6CC, 0x1F6CC },
424432
{ 0x1F6D0, 0x1F6D2 },
433+
{ 0x1F6D5, 0x1F6D5 },
425434
{ 0x1F6EB, 0x1F6EC },
426-
{ 0x1F6F4, 0x1F6F9 },
427-
{ 0x1F910, 0x1F93E },
428-
{ 0x1F940, 0x1F970 },
435+
{ 0x1F6F4, 0x1F6FA },
436+
{ 0x1F7E0, 0x1F7EB },
437+
{ 0x1F90D, 0x1F971 },
429438
{ 0x1F973, 0x1F976 },
430-
{ 0x1F97A, 0x1F97A },
431-
{ 0x1F97C, 0x1F9A2 },
432-
{ 0x1F9B0, 0x1F9B9 },
433-
{ 0x1F9C0, 0x1F9C2 },
434-
{ 0x1F9D0, 0x1F9FF },
439+
{ 0x1F97A, 0x1F9A2 },
440+
{ 0x1F9A5, 0x1F9AA },
441+
{ 0x1F9AE, 0x1F9CA },
442+
{ 0x1F9CD, 0x1F9FF },
443+
{ 0x1FA70, 0x1FA73 },
444+
{ 0x1FA78, 0x1FA7A },
445+
{ 0x1FA80, 0x1FA82 },
446+
{ 0x1FA90, 0x1FA95 },
435447
{ 0x20000, 0x2FFFD },
436448
{ 0x30000, 0x3FFFD }
437449
};

0 commit comments

Comments
 (0)