Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0d7de11

Browse files
authored
Update tables for Unicode 9.0.0 (#18)
* Update for Unicode 9.0.0
1 parent e719a48 commit 0d7de11

5 files changed

Lines changed: 116 additions & 21 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: python
2+
23
sudo: false
34

45
env:
56
- TOXENV=py26
67
- TOXENV=py27
78
- TOXENV=py33
89
- TOXENV=py34
9-
- TOXENV=pypy
1010

1111
install:
1212
- pip install -q tox
@@ -21,7 +21,7 @@ install:
2121
script:
2222
- tox -e $TOXENV
2323
- if [[ $TOXENV == "py34" ]]; then
24-
tox -esa;
24+
tox -echeck;
2525
fi
2626

2727
after_success:

README.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ unicode string is expected to occupy.*
4242
This library aims to be forward-looking, portable, and most correct. The most
4343
current release of this API is based on the Unicode Standard release files:
4444

45-
``EastAsianWidth-8.0.0.txt``
46-
*2015-02-10, 21:00:00 GMT [KW, LI]*
45+
``DerivedGeneralCategory-9.0.0.txt``
46+
*Date: 2016-06-01, 10:34:26 GMT*
47+
© 2016 Unicode®, Inc.
48+
49+
``EastAsianWidth-9.0.0.txt``
50+
*Date: 2016-05-27, 17:00:00 GMT [KW, LI]*
51+
© 2016 Unicode®, Inc.
4752

48-
``DerivedGeneralCategory-8.0.0.txt``
49-
*2015-02-13, 13:47:11 GMT [MD]*
5053

5154
Installation
5255
------------
@@ -160,6 +163,9 @@ source code. They are not distributed.
160163
History
161164
=======
162165

166+
0.1.7 *2016-07-01*
167+
* **Updated** tables to Unicode Specification 9.0.0. (`PR #18`_).
168+
163169
0.1.6 *2016-01-08 Production/Stable*
164170
* ``LICENSE`` file now included with distribution.
165171

tox.ini

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py35, compile, check, docs, update
2+
envlist = update, py27, py35, compile, check
33

44
[testenv]
55
deps = pytest
@@ -9,14 +9,13 @@ commands = {posargs:py.test}
99
commands = python -m compileall {toxinidir}/wcwidth
1010

1111
[testenv:check]
12-
deps = prospector
13-
-rrequirements-develop.txt
12+
deps = -rrequirements-develop.txt
1413
usedevelop = true
1514
commands = prospector {posargs:--no-autodetect --die-on-tool-error}
1615

17-
[testenv:docs]
18-
deps = sphinx
19-
commands = sphinx-build docs/
16+
;[testenv:docs]
17+
;deps = sphinx
18+
;commands = sphinx-build docs/
2019

2120
[testenv:update]
2221
usedevelop = false

wcwidth/table_wide.py

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,43 @@
11
"""Wide_Eastasian table. Created by setup.py."""
2-
# Generated: 2015-09-14T01:48:19.503860
3-
# Source: EastAsianWidth-8.0.0.txt
4-
# Date: 2015-02-10, 21:00:00 GMT [KW, LI]
2+
# Generated: 2016-07-02T04:20:28.048222
3+
# Source: EastAsianWidth-9.0.0.txt
4+
# Date: 2016-05-27, 17:00:00 GMT [KW, LI]
55
WIDE_EASTASIAN = (
66
(0x1100, 0x115f,), # Hangul Choseong Kiyeok ..Hangul Choseong Filler
7+
(0x231a, 0x231b,), # Watch ..Hourglass
78
(0x2329, 0x232a,), # Left-pointing Angle Brac..Right-pointing Angle Bra
9+
(0x23e9, 0x23ec,), # Black Right-pointing Dou..Black Down-pointing Doub
10+
(0x23f0, 0x23f0,), # Alarm Clock ..Alarm Clock
11+
(0x23f3, 0x23f3,), # Hourglass With Flowing S..Hourglass With Flowing S
12+
(0x25fd, 0x25fe,), # White Medium Small Squar..Black Medium Small Squar
13+
(0x2614, 0x2615,), # Umbrella With Rain Drops..Hot Beverage
14+
(0x2648, 0x2653,), # Aries ..Pisces
15+
(0x267f, 0x267f,), # Wheelchair Symbol ..Wheelchair Symbol
16+
(0x2693, 0x2693,), # Anchor ..Anchor
17+
(0x26a1, 0x26a1,), # High Voltage Sign ..High Voltage Sign
18+
(0x26aa, 0x26ab,), # Medium White Circle ..Medium Black Circle
19+
(0x26bd, 0x26be,), # Soccer Ball ..Baseball
20+
(0x26c4, 0x26c5,), # Snowman Without Snow ..Sun Behind Cloud
21+
(0x26ce, 0x26ce,), # Ophiuchus ..Ophiuchus
22+
(0x26d4, 0x26d4,), # No Entry ..No Entry
23+
(0x26ea, 0x26ea,), # Church ..Church
24+
(0x26f2, 0x26f3,), # Fountain ..Flag In Hole
25+
(0x26f5, 0x26f5,), # Sailboat ..Sailboat
26+
(0x26fa, 0x26fa,), # Tent ..Tent
27+
(0x26fd, 0x26fd,), # Fuel Pump ..Fuel Pump
28+
(0x2705, 0x2705,), # White Heavy Check Mark ..White Heavy Check Mark
29+
(0x270a, 0x270b,), # Raised Fist ..Raised Hand
30+
(0x2728, 0x2728,), # Sparkles ..Sparkles
31+
(0x274c, 0x274c,), # Cross Mark ..Cross Mark
32+
(0x274e, 0x274e,), # Negative Squared Cross M..Negative Squared Cross M
33+
(0x2753, 0x2755,), # Black Question Mark Orna..White Exclamation Mark O
34+
(0x2757, 0x2757,), # Heavy Exclamation Mark S..Heavy Exclamation Mark S
35+
(0x2795, 0x2797,), # Heavy Plus Sign ..Heavy Division Sign
36+
(0x27b0, 0x27b0,), # Curly Loop ..Curly Loop
37+
(0x27bf, 0x27bf,), # Double Curly Loop ..Double Curly Loop
38+
(0x2b1b, 0x2b1c,), # Black Large Square ..White Large Square
39+
(0x2b50, 0x2b50,), # White Medium Star ..White Medium Star
40+
(0x2b55, 0x2b55,), # Heavy Large Circle ..Heavy Large Circle
841
(0x2e80, 0x2e99,), # Cjk Radical Repeat ..Cjk Radical Rap
942
(0x2e9b, 0x2ef3,), # Cjk Radical Choke ..Cjk Radical C-simplified
1043
(0x2f00, 0x2fd5,), # Kangxi Radical One ..Kangxi Radical Flute
@@ -31,11 +64,49 @@
3164
(0xfe68, 0xfe6b,), # Small Reverse Solidus ..Small Commercial At
3265
(0xff01, 0xff60,), # Fullwidth Exclamation Ma..Fullwidth Right White Pa
3366
(0xffe0, 0xffe6,), # Fullwidth Cent Sign ..Fullwidth Won Sign
67+
(0x16fe0, 0x16fe0,), # (nil) ..
68+
(0x17000, 0x187ec,), # (nil) ..
69+
(0x18800, 0x18af2,), # (nil) ..
3470
(0x1b000, 0x1b001,), # Katakana Letter Archaic ..Hiragana Letter Archaic
71+
(0x1f004, 0x1f004,), # Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon
72+
(0x1f0cf, 0x1f0cf,), # Playing Card Black Joker..Playing Card Black Joker
73+
(0x1f18e, 0x1f18e,), # Negative Squared Ab ..Negative Squared Ab
74+
(0x1f191, 0x1f19a,), # Squared Cl ..Squared Vs
3575
(0x1f200, 0x1f202,), # Square Hiragana Hoka ..Squared Katakana Sa
36-
(0x1f210, 0x1f23a,), # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
76+
(0x1f210, 0x1f23b,), # Squared Cjk Unified Ideo..
3777
(0x1f240, 0x1f248,), # Tortoise Shell Bracketed..Tortoise Shell Bracketed
3878
(0x1f250, 0x1f251,), # Circled Ideograph Advant..Circled Ideograph Accept
79+
(0x1f300, 0x1f320,), # Cyclone ..Shooting Star
80+
(0x1f32d, 0x1f335,), # Hot Dog ..Cactus
81+
(0x1f337, 0x1f37c,), # Tulip ..Baby Bottle
82+
(0x1f37e, 0x1f393,), # Bottle With Popping Cork..Graduation Cap
83+
(0x1f3a0, 0x1f3ca,), # Carousel Horse ..Swimmer
84+
(0x1f3cf, 0x1f3d3,), # Cricket Bat And Ball ..Table Tennis Paddle And
85+
(0x1f3e0, 0x1f3f0,), # House Building ..European Castle
86+
(0x1f3f4, 0x1f3f4,), # Waving Black Flag ..Waving Black Flag
87+
(0x1f3f8, 0x1f43e,), # Badminton Racquet And Sh..Paw Prints
88+
(0x1f440, 0x1f440,), # Eyes ..Eyes
89+
(0x1f442, 0x1f4fc,), # Ear ..Videocassette
90+
(0x1f4ff, 0x1f53d,), # Prayer Beads ..Down-pointing Small Red
91+
(0x1f54b, 0x1f54e,), # Kaaba ..Menorah With Nine Branch
92+
(0x1f550, 0x1f567,), # Clock Face One Oclock ..Clock Face Twelve-thirty
93+
(0x1f57a, 0x1f57a,), # (nil) ..
94+
(0x1f595, 0x1f596,), # Reversed Hand With Middl..Raised Hand With Part Be
95+
(0x1f5a4, 0x1f5a4,), # (nil) ..
96+
(0x1f5fb, 0x1f64f,), # Mount Fuji ..Person With Folded Hands
97+
(0x1f680, 0x1f6c5,), # Rocket ..Left Luggage
98+
(0x1f6cc, 0x1f6cc,), # Sleeping Accommodation ..Sleeping Accommodation
99+
(0x1f6d0, 0x1f6d2,), # Place Of Worship ..
100+
(0x1f6eb, 0x1f6ec,), # Airplane Departure ..Airplane Arriving
101+
(0x1f6f4, 0x1f6f6,), # (nil) ..
102+
(0x1f910, 0x1f91e,), # Zipper-mouth Face ..
103+
(0x1f920, 0x1f927,), # (nil) ..
104+
(0x1f930, 0x1f930,), # (nil) ..
105+
(0x1f933, 0x1f93e,), # (nil) ..
106+
(0x1f940, 0x1f94b,), # (nil) ..
107+
(0x1f950, 0x1f95e,), # (nil) ..
108+
(0x1f980, 0x1f991,), # Crab ..
109+
(0x1f9c0, 0x1f9c0,), # Cheese Wedge ..Cheese Wedge
39110
(0x20000, 0x2fffd,), # Cjk Unified Ideograph-20..
40111
(0x30000, 0x3fffd,), # (nil) ..
41112
)

wcwidth/table_zero.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Zero_Width table. Created by setup.py."""
2-
# Generated: 2015-09-14T01:48:19.532217
3-
# Source: DerivedGeneralCategory-8.0.0.txt
4-
# Date: 2015-02-13, 13:47:11 GMT [MD]
2+
# Generated: 2016-07-02T04:20:28.075504
3+
# Source: DerivedGeneralCategory-9.0.0.txt
4+
# Date: 2016-06-01, 10:34:26 GMT
55
ZERO_WIDTH = (
66
(0x0300, 0x036f,), # Combining Grave Accent ..Combining Latin Small Le
77
(0x0483, 0x0489,), # Combining Cyrillic Titlo..Combining Cyrillic Milli
@@ -26,6 +26,7 @@
2626
(0x0825, 0x0827,), # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
2727
(0x0829, 0x082d,), # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
2828
(0x0859, 0x085b,), # Mandaic Affrication Mark..Mandaic Gemination Mark
29+
(0x08d4, 0x08e1,), # (nil) ..
2930
(0x08e3, 0x0902,), # Arabic Turned Damma Belo..Devanagari Sign Anusvara
3031
(0x093a, 0x093a,), # Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
3132
(0x093c, 0x093c,), # Devanagari Sign Nukta ..Devanagari Sign Nukta
@@ -120,6 +121,7 @@
120121
(0x17c9, 0x17d3,), # Khmer Sign Muusikatoan ..Khmer Sign Bathamasat
121122
(0x17dd, 0x17dd,), # Khmer Sign Atthacan ..Khmer Sign Atthacan
122123
(0x180b, 0x180d,), # Mongolian Free Variation..Mongolian Free Variation
124+
(0x1885, 0x1886,), # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
123125
(0x18a9, 0x18a9,), # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
124126
(0x1920, 0x1922,), # Limbu Vowel Sign A ..Limbu Vowel Sign U
125127
(0x1927, 0x1928,), # Limbu Vowel Sign E ..Limbu Vowel Sign O
@@ -158,7 +160,7 @@
158160
(0x1cf4, 0x1cf4,), # Vedic Tone Candra Above ..Vedic Tone Candra Above
159161
(0x1cf8, 0x1cf9,), # Vedic Tone Ring Above ..Vedic Tone Double Ring A
160162
(0x1dc0, 0x1df5,), # Combining Dotted Grave A..Combining Up Tack Above
161-
(0x1dfc, 0x1dff,), # Combining Double Inverte..Combining Right Arrowhea
163+
(0x1dfb, 0x1dff,), # (nil) ..Combining Right Arrowhea
162164
(0x20d0, 0x20f0,), # Combining Left Harpoon A..Combining Asterisk Above
163165
(0x2cef, 0x2cf1,), # Coptic Combining Ni Abov..Coptic Combining Spiritu
164166
(0x2d7f, 0x2d7f,), # Tifinagh Consonant Joine..Tifinagh Consonant Joine
@@ -173,7 +175,7 @@
173175
(0xa806, 0xa806,), # Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
174176
(0xa80b, 0xa80b,), # Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
175177
(0xa825, 0xa826,), # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
176-
(0xa8c4, 0xa8c4,), # Saurashtra Sign Virama ..Saurashtra Sign Virama
178+
(0xa8c4, 0xa8c5,), # Saurashtra Sign Virama ..
177179
(0xa8e0, 0xa8f1,), # Combining Devanagari Dig..Combining Devanagari Sig
178180
(0xa926, 0xa92d,), # Kayah Li Vowel Ue ..Kayah Li Tone Calya Plop
179181
(0xa947, 0xa951,), # Rejang Vowel Sign I ..Rejang Consonant Sign R
@@ -225,13 +227,17 @@
225227
(0x1122f, 0x11231,), # Khojki Vowel Sign U ..Khojki Vowel Sign Ai
226228
(0x11234, 0x11234,), # Khojki Sign Anusvara ..Khojki Sign Anusvara
227229
(0x11236, 0x11237,), # Khojki Sign Nukta ..Khojki Sign Shadda
230+
(0x1123e, 0x1123e,), # (nil) ..
228231
(0x112df, 0x112df,), # Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara
229232
(0x112e3, 0x112ea,), # Khudawadi Vowel Sign U ..Khudawadi Sign Virama
230233
(0x11300, 0x11301,), # Grantha Sign Combining A..Grantha Sign Candrabindu
231234
(0x1133c, 0x1133c,), # Grantha Sign Nukta ..Grantha Sign Nukta
232235
(0x11340, 0x11340,), # Grantha Vowel Sign Ii ..Grantha Vowel Sign Ii
233236
(0x11366, 0x1136c,), # Combining Grantha Digit ..Combining Grantha Digit
234237
(0x11370, 0x11374,), # Combining Grantha Letter..Combining Grantha Letter
238+
(0x11438, 0x1143f,), # (nil) ..
239+
(0x11442, 0x11444,), # (nil) ..
240+
(0x11446, 0x11446,), # (nil) ..
235241
(0x114b3, 0x114b8,), # Tirhuta Vowel Sign U ..Tirhuta Vowel Sign Vocal
236242
(0x114ba, 0x114ba,), # Tirhuta Vowel Sign Short..Tirhuta Vowel Sign Short
237243
(0x114bf, 0x114c0,), # Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
@@ -250,6 +256,13 @@
250256
(0x1171d, 0x1171f,), # Ahom Consonant Sign Medi..Ahom Consonant Sign Medi
251257
(0x11722, 0x11725,), # Ahom Vowel Sign I ..Ahom Vowel Sign Uu
252258
(0x11727, 0x1172b,), # Ahom Vowel Sign Aw ..Ahom Sign Killer
259+
(0x11c30, 0x11c36,), # (nil) ..
260+
(0x11c38, 0x11c3d,), # (nil) ..
261+
(0x11c3f, 0x11c3f,), # (nil) ..
262+
(0x11c92, 0x11ca7,), # (nil) ..
263+
(0x11caa, 0x11cb0,), # (nil) ..
264+
(0x11cb2, 0x11cb3,), # (nil) ..
265+
(0x11cb5, 0x11cb6,), # (nil) ..
253266
(0x16af0, 0x16af4,), # Bassa Vah Combining High..Bassa Vah Combining High
254267
(0x16b30, 0x16b36,), # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
255268
(0x16f8f, 0x16f92,), # Miao Tone Right ..Miao Tone Below
@@ -265,6 +278,12 @@
265278
(0x1da84, 0x1da84,), # Signwriting Location Hea..Signwriting Location Hea
266279
(0x1da9b, 0x1da9f,), # Signwriting Fill Modifie..Signwriting Fill Modifie
267280
(0x1daa1, 0x1daaf,), # Signwriting Rotation Mod..Signwriting Rotation Mod
281+
(0x1e000, 0x1e006,), # (nil) ..
282+
(0x1e008, 0x1e018,), # (nil) ..
283+
(0x1e01b, 0x1e021,), # (nil) ..
284+
(0x1e023, 0x1e024,), # (nil) ..
285+
(0x1e026, 0x1e02a,), # (nil) ..
268286
(0x1e8d0, 0x1e8d6,), # Mende Kikakui Combining ..Mende Kikakui Combining
287+
(0x1e944, 0x1e94a,), # (nil) ..
269288
(0xe0100, 0xe01ef,), # Variation Selector-17 ..Variation Selector-256
270289
)

0 commit comments

Comments
 (0)