AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

localedata: unicode-gen: Remove redundant \s* from regexp, fix comments

Browse Source
This commit is contained in:
Mike FABIAN 2024-01-08 10:05:13 +01:00
parent 6f87f46bf4
commit d333a2e0fb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
localedata/charmaps/UTF-8
View File

@ -49858,7 +49858,7 @@ END CHARMAP
% Character width according to Unicode 15.1.0. % Character width according to Unicode 15.1.0.
% - Default width is 1. % - Default width is 1.
% - Double-width characters have width 2; generated from % - Double-width characters have width 2; generated from
% "grep '^[^;]*;[WF]' EastAsianWidth.txt" % "grep '^[^;]*;\s*[WF]' EastAsianWidth.txt"
% - Non-spacing characters have width 0; generated from PropList.txt or % - Non-spacing characters have width 0; generated from PropList.txt or
% "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt" % "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt"
% - Format control characters have width 0; generated from % - Format control characters have width 0; generated from

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

@ -204,7 +204,7 @@ def write_header_width(outfile, unicode_version):
+ '{:s}.\n'.format(unicode_version)) + '{:s}.\n'.format(unicode_version))
outfile.write('% - Default width is 1.\n') outfile.write('% - Default width is 1.\n')
outfile.write('% - Double-width characters have width 2; generated from\n') outfile.write('% - Double-width characters have width 2; generated from\n')
outfile.write('% "grep \'^[^;]*;[WF]\' EastAsianWidth.txt"\n') outfile.write('% "grep \'^[^;]*;\\s*[WF]\' EastAsianWidth.txt"\n')
outfile.write('% - Non-spacing characters have width 0; ' outfile.write('% - Non-spacing characters have width 0; '
+ 'generated from PropList.txt or\n') + 'generated from PropList.txt or\n')
outfile.write('% "grep \'^[^;]*;[^;]*;[^;]*;[^;]*;NSM;\' ' outfile.write('% "grep \'^[^;]*;[^;]*;[^;]*;[^;]*;NSM;\' '
@ -339,8 +339,8 @@ if __name__ == "__main__":
with open(ARGS.east_asian_with_file, mode='r') as EAST_ASIAN_WIDTH_FILE: with open(ARGS.east_asian_with_file, mode='r') as EAST_ASIAN_WIDTH_FILE:
EAST_ASIAN_WIDTH_LINES = [] EAST_ASIAN_WIDTH_LINES = []
for LINE in EAST_ASIAN_WIDTH_FILE: for LINE in EAST_ASIAN_WIDTH_FILE:
# If characters from EastAasianWidth.txt which are from # If characters from EastAsianWidth.txt which are from
# from reserved ranges (i.e. not yet assigned code points) # reserved ranges (i.e. not yet assigned code points)
# are added to the WIDTH section of the UTF-8 file, then # are added to the WIDTH section of the UTF-8 file, then
# “make check” produces “Unknown Character” errors for # “make check” produces “Unknown Character” errors for
# these code points because such unassigned code points # these code points because such unassigned code points
@ -350,7 +350,7 @@ if __name__ == "__main__":
# the EastAsianWidth.txt file. # the EastAsianWidth.txt file.
if re.match(r'.*<reserved-.+>\.\.<reserved-.+>.*', LINE): if re.match(r'.*<reserved-.+>\.\.<reserved-.+>.*', LINE):
continue continue
if re.match(r'^[^;]*;\s*[WF]\s*', LINE): if re.match(r'^[^;]*;\s*[WF]', LINE):
EAST_ASIAN_WIDTH_LINES.append(LINE.strip()) EAST_ASIAN_WIDTH_LINES.append(LINE.strip())
with open(ARGS.prop_list_file, mode='r') as PROP_LIST_FILE: with open(ARGS.prop_list_file, mode='r') as PROP_LIST_FILE:
PROP_LIST_LINES = [] PROP_LIST_LINES = []