qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UnicodeData has precedence over EastAsianWidth 

[BZ #19852]
[BZ #21750]
* unicode-gen/utf8_gen.py: Process EastAsianWidth lines before
  UnicodeData lines so the latter have precedence; remove hack
  to group output by EastAsianWidth ranges.
This commit is contained in:
Thorsten Glaser 2017-07-14 14:02:37 +02:00 committed by Mike FABIAN
parent 038d1cafaf
commit 580be3035d
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
localedata/unicode-gen/utf8_gen.py
View File

@ -221,29 +221,21 @@ def process_width(outfile, ulines, elines):
''' '''
width_dict = {} width_dict = {}
for line in elines:
fields = line.split(";")
if not '..' in fields[0]:
code_points = (fields[0], fields[0])
else:
code_points = fields[0].split("..")
for key in range(int(code_points[0], 16),
int(code_points[1], 16)+1):
width_dict[key] = unicode_utils.ucs_symbol(key) + '\t2'
for line in ulines: for line in ulines:
fields = line.split(";") fields = line.split(";")
if fields[4] == "NSM" or fields[2] == "Cf": if fields[4] == "NSM" or fields[2] == "Cf":
width_dict[int(fields[0], 16)] = unicode_utils.ucs_symbol( width_dict[int(fields[0], 16)] = unicode_utils.ucs_symbol(
int(fields[0], 16)) + '\t0' int(fields[0], 16)) + '\t0'
for line in elines:
# If an entry in EastAsianWidth.txt is found, it overrides entries in
# UnicodeData.txt:
fields = line.split(";")
if not '..' in fields[0]:
width_dict[int(fields[0], 16)] = unicode_utils.ucs_symbol(
int(fields[0], 16)) + '\t2'
else:
code_points = fields[0].split("..")
for key in range(int(code_points[0], 16),
int(code_points[1], 16)+1):
if key in width_dict:
del width_dict[key]
width_dict[int(code_points[0], 16)] = '{:s}...{:s}\t2'.format(
unicode_utils.ucs_symbol(int(code_points[0], 16)),
unicode_utils.ucs_symbol(int(code_points[1], 16)))
for key in sorted(width_dict): for key in sorted(width_dict):
outfile.write(width_dict[key]+'\n') outfile.write(width_dict[key]+'\n')