Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
#!/usr/bin/python3
|
|
|
|
# -*- coding: utf-8 -*-
|
2023-01-06 21:08:04 +00:00
|
|
|
# Copyright (C) 2014-2023 Free Software Foundation, Inc.
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
# This file is part of the GNU C Library.
|
|
|
|
#
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
|
|
# License as published by the Free Software Foundation; either
|
|
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
#
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
# Lesser General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
|
|
# License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
# <https://www.gnu.org/licenses/>.
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
|
|
|
'''glibc/localedata/charmaps/UTF-8 file generator script
|
|
|
|
|
|
|
|
This script generates a glibc/localedata/charmaps/UTF-8 file
|
|
|
|
from Unicode data.
|
|
|
|
|
|
|
|
Usage: python3 utf8_gen.py UnicodeData.txt EastAsianWidth.txt
|
|
|
|
|
|
|
|
It will output UTF-8 file
|
|
|
|
'''
|
|
|
|
|
2018-07-10 09:25:48 +00:00
|
|
|
import argparse
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
import sys
|
|
|
|
import re
|
2015-12-10 03:27:41 +00:00
|
|
|
import unicode_utils
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
|
|
|
# Auxiliary tables for Hangul syllable names, see the Unicode 3.0 book,
|
|
|
|
# sections 3.11 and 4.4.
|
|
|
|
|
2015-02-23 14:22:37 +00:00
|
|
|
JAMO_INITIAL_SHORT_NAME = (
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
'G', 'GG', 'N', 'D', 'DD', 'R', 'M', 'B', 'BB', 'S', 'SS', '', 'J', 'JJ',
|
|
|
|
'C', 'K', 'T', 'P', 'H'
|
2015-02-23 14:22:37 +00:00
|
|
|
)
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
2015-02-23 14:22:37 +00:00
|
|
|
JAMO_MEDIAL_SHORT_NAME = (
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
'A', 'AE', 'YA', 'YAE', 'EO', 'E', 'YEO', 'YE', 'O', 'WA', 'WAE', 'OE',
|
|
|
|
'YO', 'U', 'WEO', 'WE', 'WI', 'YU', 'EU', 'YI', 'I'
|
2015-02-23 14:22:37 +00:00
|
|
|
)
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
2015-02-23 14:22:37 +00:00
|
|
|
JAMO_FINAL_SHORT_NAME = (
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
'', 'G', 'GG', 'GS', 'N', 'NI', 'NH', 'D', 'L', 'LG', 'LM', 'LB', 'LS',
|
|
|
|
'LT', 'LP', 'LH', 'M', 'B', 'BS', 'S', 'SS', 'NG', 'J', 'C', 'K', 'T',
|
|
|
|
'P', 'H'
|
2015-02-23 14:22:37 +00:00
|
|
|
)
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
|
|
|
def process_range(start, end, outfile, name):
|
|
|
|
'''Writes a range of code points into the CHARMAP section of the
|
|
|
|
output file
|
|
|
|
|
|
|
|
'''
|
|
|
|
if 'Hangul Syllable' in name:
|
|
|
|
# from glibc/localedata/ChangeLog:
|
|
|
|
#
|
|
|
|
# 2000-09-24 Bruno Haible <haible@clisp.cons.org>
|
|
|
|
# * charmaps/UTF-8: Expand <Hangul Syllable> and <Private Use> ranges,
|
|
|
|
# so they become printable and carry a width. Comment out surrogate
|
|
|
|
# ranges. Add a WIDTH table
|
|
|
|
#
|
|
|
|
# So we expand the Hangul Syllables here:
|
|
|
|
for i in range(int(start, 16), int(end, 16)+1 ):
|
|
|
|
index2, index3 = divmod(i - 0xaC00, 28)
|
|
|
|
index1, index2 = divmod(index2, 21)
|
|
|
|
hangul_syllable_name = 'HANGUL SYLLABLE ' \
|
2015-02-23 14:22:37 +00:00
|
|
|
+ JAMO_INITIAL_SHORT_NAME[index1] \
|
|
|
|
+ JAMO_MEDIAL_SHORT_NAME[index2] \
|
|
|
|
+ JAMO_FINAL_SHORT_NAME[index3]
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
outfile.write('{:<11s} {:<12s} {:s}\n'.format(
|
2015-12-10 03:27:41 +00:00
|
|
|
unicode_utils.ucs_symbol(i), convert_to_hex(i),
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
hangul_syllable_name))
|
|
|
|
return
|
|
|
|
# UnicodeData.txt file has contains code point ranges like this:
|
|
|
|
#
|
|
|
|
# 3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
|
|
|
|
# 4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
|
|
|
|
#
|
|
|
|
# The glibc UTF-8 file splits ranges like these into shorter
|
|
|
|
# ranges of 64 code points each:
|
|
|
|
#
|
|
|
|
# <U3400>..<U343F> /xe3/x90/x80 <CJK Ideograph Extension A>
|
|
|
|
# …
|
|
|
|
# <U4D80>..<U4DB5> /xe4/xb6/x80 <CJK Ideograph Extension A>
|
|
|
|
for i in range(int(start, 16), int(end, 16), 64 ):
|
|
|
|
if i > (int(end, 16)-64):
|
|
|
|
outfile.write('{:s}..{:s} {:<12s} {:s}\n'.format(
|
2015-12-10 03:27:41 +00:00
|
|
|
unicode_utils.ucs_symbol(i),
|
|
|
|
unicode_utils.ucs_symbol(int(end,16)),
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
convert_to_hex(i),
|
|
|
|
name))
|
|
|
|
break
|
|
|
|
outfile.write('{:s}..{:s} {:<12s} {:s}\n'.format(
|
2015-12-10 03:27:41 +00:00
|
|
|
unicode_utils.ucs_symbol(i),
|
|
|
|
unicode_utils.ucs_symbol(i+63),
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
convert_to_hex(i),
|
|
|
|
name))
|
|
|
|
|
|
|
|
def process_charmap(flines, outfile):
|
|
|
|
'''This function takes an array which contains *all* lines of
|
|
|
|
of UnicodeData.txt and write lines to outfile as used in the
|
|
|
|
|
|
|
|
CHARMAP
|
|
|
|
…
|
|
|
|
END CHARMAP
|
|
|
|
|
|
|
|
section of the UTF-8 file in glibc/localedata/charmaps/UTF-8.
|
|
|
|
|
|
|
|
Samples for input lines:
|
|
|
|
|
|
|
|
0010;<control>;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;;
|
|
|
|
3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
|
|
|
|
4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
|
|
|
|
D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
|
|
|
|
DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
|
|
|
|
100000;<Plane 16 Private Use, First>;Co;0;L;;;;;N;;;;;
|
|
|
|
10FFFD;<Plane 16 Private Use, Last>;Co;0;L;;;;;N;;;;;
|
|
|
|
|
|
|
|
Samples for output lines (Unicode-Value UTF-8-HEX Unicode-Char-Name):
|
|
|
|
|
|
|
|
<U0010> /x10 DATA LINK ESCAPE
|
|
|
|
<U3400>..<U343F> /xe3/x90/x80 <CJK Ideograph Extension A>
|
|
|
|
%<UD800> /xed/xa0/x80 <Non Private Use High Surrogate, First>
|
|
|
|
%<UDB7F> /xed/xad/xbf <Non Private Use High Surrogate, Last>
|
|
|
|
<U0010FFC0>..<U0010FFFD> /xf4/x8f/xbf/x80 <Plane 16 Private Use>
|
|
|
|
|
|
|
|
'''
|
|
|
|
fields_start = []
|
|
|
|
for line in flines:
|
|
|
|
fields = line.split(";")
|
|
|
|
# Some characters have “<control>” as their name. We try to
|
|
|
|
# use the “Unicode 1.0 Name” (10th field in
|
|
|
|
# UnicodeData.txt) for them.
|
|
|
|
#
|
|
|
|
# The Characters U+0080, U+0081, U+0084 and U+0099 have
|
|
|
|
# “<control>” as their name but do not even have aa
|
|
|
|
# ”Unicode 1.0 Name”. We could write code to take their
|
|
|
|
# alternate names from NameAliases.txt.
|
|
|
|
if fields[1] == "<control>" and fields[10]:
|
|
|
|
fields[1] = fields[10]
|
|
|
|
# Handling code point ranges like:
|
|
|
|
#
|
|
|
|
# 3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
|
|
|
|
# 4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
|
|
|
|
if fields[1].endswith(', First>') and not 'Surrogate,' in fields[1]:
|
|
|
|
fields_start = fields
|
|
|
|
continue
|
|
|
|
if fields[1].endswith(', Last>') and not 'Surrogate,' in fields[1]:
|
|
|
|
process_range(fields_start[0], fields[0],
|
|
|
|
outfile, fields[1][:-7]+'>')
|
|
|
|
fields_start = []
|
|
|
|
continue
|
|
|
|
fields_start = []
|
|
|
|
if 'Surrogate,' in fields[1]:
|
|
|
|
# Comment out the surrogates in the UTF-8 file.
|
|
|
|
# One could of course skip them completely but
|
|
|
|
# the original UTF-8 file in glibc had them as
|
|
|
|
# comments, so we keep these comment lines.
|
|
|
|
outfile.write('%')
|
|
|
|
outfile.write('{:<11s} {:<12s} {:s}\n'.format(
|
2015-12-10 03:27:41 +00:00
|
|
|
unicode_utils.ucs_symbol(int(fields[0], 16)),
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
convert_to_hex(int(fields[0], 16)),
|
|
|
|
fields[1]))
|
|
|
|
|
|
|
|
def convert_to_hex(code_point):
|
|
|
|
'''Converts a code point to a hexadecimal UTF-8 representation
|
|
|
|
like /x**/x**/x**.'''
|
|
|
|
# Getting UTF8 of Unicode characters.
|
|
|
|
# In Python3, .encode('UTF-8') does not work for
|
|
|
|
# surrogates. Therefore, we use this conversion table
|
|
|
|
surrogates = {
|
|
|
|
0xD800: '/xed/xa0/x80',
|
|
|
|
0xDB7F: '/xed/xad/xbf',
|
|
|
|
0xDB80: '/xed/xae/x80',
|
|
|
|
0xDBFF: '/xed/xaf/xbf',
|
|
|
|
0xDC00: '/xed/xb0/x80',
|
|
|
|
0xDFFF: '/xed/xbf/xbf',
|
|
|
|
}
|
|
|
|
if code_point in surrogates:
|
|
|
|
return surrogates[code_point]
|
|
|
|
return ''.join([
|
|
|
|
'/x{:02x}'.format(c) for c in chr(code_point).encode('UTF-8')
|
|
|
|
])
|
|
|
|
|
|
|
|
def write_header_charmap(outfile):
|
|
|
|
'''Write the header on top of the CHARMAP section to the output file'''
|
|
|
|
outfile.write("<code_set_name> UTF-8\n")
|
|
|
|
outfile.write("<comment_char> %\n")
|
|
|
|
outfile.write("<escape_char> /\n")
|
|
|
|
outfile.write("<mb_cur_min> 1\n")
|
|
|
|
outfile.write("<mb_cur_max> 6\n\n")
|
|
|
|
outfile.write("% CHARMAP generated using utf8_gen.py\n")
|
|
|
|
outfile.write("% alias ISO-10646/UTF-8\n")
|
|
|
|
outfile.write("CHARMAP\n")
|
|
|
|
|
2018-07-10 09:25:48 +00:00
|
|
|
def write_header_width(outfile, unicode_version):
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
'''Writes the header on top of the WIDTH section to the output file'''
|
2018-07-10 09:25:48 +00:00
|
|
|
outfile.write('% Character width according to Unicode '
|
|
|
|
+ '{:s}.\n'.format(unicode_version))
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
outfile.write('% - Default width is 1.\n')
|
|
|
|
outfile.write('% - Double-width characters have width 2; generated from\n')
|
|
|
|
outfile.write('% "grep \'^[^;]*;[WF]\' EastAsianWidth.txt"\n')
|
|
|
|
outfile.write('% - Non-spacing characters have width 0; '
|
|
|
|
+ 'generated from PropList.txt or\n')
|
|
|
|
outfile.write('% "grep \'^[^;]*;[^;]*;[^;]*;[^;]*;NSM;\' '
|
|
|
|
+ 'UnicodeData.txt"\n')
|
|
|
|
outfile.write('% - Format control characters have width 0; '
|
|
|
|
+ 'generated from\n')
|
|
|
|
outfile.write("% \"grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt\"\n")
|
|
|
|
# Not needed covered by Cf
|
|
|
|
# outfile.write("% - Zero width characters have width 0; generated from\n")
|
|
|
|
# outfile.write("% \"grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt\"\n")
|
|
|
|
outfile.write("WIDTH\n")
|
|
|
|
|
2017-09-06 09:19:33 +00:00
|
|
|
def process_width(outfile, ulines, elines, plines):
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
'''ulines are lines from UnicodeData.txt, elines are lines from
|
2017-09-06 09:19:33 +00:00
|
|
|
EastAsianWidth.txt containing characters with width “W” or “F”,
|
|
|
|
plines are lines from PropList.txt which contain characters
|
|
|
|
with the property “Prepended_Concatenation_Mark”.
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
|
|
|
'''
|
|
|
|
width_dict = {}
|
|
|
|
for line in elines:
|
|
|
|
fields = line.split(";")
|
|
|
|
if not '..' in fields[0]:
|
2017-07-14 12:02:37 +00:00
|
|
|
code_points = (fields[0], fields[0])
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
else:
|
|
|
|
code_points = fields[0].split("..")
|
2017-07-14 12:02:37 +00:00
|
|
|
for key in range(int(code_points[0], 16),
|
|
|
|
int(code_points[1], 16)+1):
|
2017-08-18 08:12:29 +00:00
|
|
|
width_dict[key] = 2
|
2017-09-06 09:19:33 +00:00
|
|
|
|
2017-07-14 12:02:37 +00:00
|
|
|
for line in ulines:
|
|
|
|
fields = line.split(";")
|
2017-07-14 12:02:44 +00:00
|
|
|
if fields[4] == "NSM" or fields[2] in ("Cf", "Me", "Mn"):
|
2017-08-18 08:12:29 +00:00
|
|
|
width_dict[int(fields[0], 16)] = 0
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
2017-09-06 09:19:33 +00:00
|
|
|
for line in plines:
|
|
|
|
# Characters with the property “Prepended_Concatenation_Mark”
|
|
|
|
# should have the width 1:
|
|
|
|
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):
|
|
|
|
del width_dict[key] # default width is 1
|
|
|
|
|
2017-07-14 12:02:46 +00:00
|
|
|
# handle special cases for compatibility
|
2017-08-18 08:12:29 +00:00
|
|
|
for key in list((0x00AD,)):
|
|
|
|
# https://www.cs.tut.fi/~jkorpela/shy.html
|
2017-07-14 12:02:46 +00:00
|
|
|
if key in width_dict:
|
2017-09-06 09:19:33 +00:00
|
|
|
del width_dict[key] # default width is 1
|
2017-08-18 08:12:29 +00:00
|
|
|
for key in list(range(0x1160, 0x1200)):
|
2020-06-16 06:29:40 +00:00
|
|
|
# Hangul jungseong and jongseong:
|
|
|
|
if key in unicode_utils.UNICODE_ATTRIBUTES:
|
|
|
|
width_dict[key] = 0
|
|
|
|
for key in list(range(0xD7B0, 0xD800)):
|
|
|
|
# Hangul jungseong and jongseong:
|
|
|
|
if key in unicode_utils.UNICODE_ATTRIBUTES:
|
|
|
|
width_dict[key] = 0
|
2017-08-18 08:12:29 +00:00
|
|
|
for key in list(range(0x3248, 0x3250)):
|
|
|
|
# These are “A” which means we can decide whether to treat them
|
|
|
|
# as “W” or “N” based on context:
|
|
|
|
# http://www.unicode.org/mail-arch/unicode-ml/y2017-m08/0023.html
|
|
|
|
# For us, “W” seems better.
|
|
|
|
width_dict[key] = 2
|
|
|
|
for key in list(range(0x4DC0, 0x4E00)):
|
|
|
|
width_dict[key] = 2
|
2017-07-14 12:02:46 +00:00
|
|
|
|
2017-08-18 08:12:29 +00:00
|
|
|
same_width_lists = []
|
|
|
|
current_width_list = []
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
for key in sorted(width_dict):
|
2017-08-18 08:12:29 +00:00
|
|
|
if not current_width_list:
|
|
|
|
current_width_list = [key]
|
|
|
|
elif (key == current_width_list[-1] + 1
|
|
|
|
and width_dict[key] == width_dict[current_width_list[0]]):
|
|
|
|
current_width_list.append(key)
|
|
|
|
else:
|
|
|
|
same_width_lists.append(current_width_list)
|
|
|
|
current_width_list = [key]
|
|
|
|
if current_width_list:
|
|
|
|
same_width_lists.append(current_width_list)
|
|
|
|
|
|
|
|
for same_width_list in same_width_lists:
|
|
|
|
if len(same_width_list) == 1:
|
|
|
|
outfile.write('{:s}\t{:d}\n'.format(
|
|
|
|
unicode_utils.ucs_symbol(same_width_list[0]),
|
|
|
|
width_dict[same_width_list[0]]))
|
|
|
|
else:
|
|
|
|
outfile.write('{:s}...{:s}\t{:d}\n'.format(
|
|
|
|
unicode_utils.ucs_symbol(same_width_list[0]),
|
|
|
|
unicode_utils.ucs_symbol(same_width_list[-1]),
|
|
|
|
width_dict[same_width_list[0]]))
|
Unicode 7.0.0 update; added generator scripts.
for localedata/ChangeLog
[BZ #17588]
[BZ #13064]
[BZ #14094]
[BZ #17998]
* unicode-gen/Makefile: New.
* unicode-gen/unicode-license.txt: New, from Unicode.
* unicode-gen/UnicodeData.txt: New, from Unicode.
* unicode-gen/DerivedCoreProperties.txt: New, from Unicode.
* unicode-gen/EastAsianWidth.txt: New, from Unicode.
* unicode-gen/gen_unicode_ctype.py: New generator, from Mike
FABIAN <mfabian@redhat.com>.
* unicode-gen/ctype_compatibility.py: New verifier, from
Pravin Satpute <psatpute@redhat.com> and Mike FABIAN.
* unicode-gen/ctype_compatibility_test_cases.py: New verifier
module, from Mike FABIAN.
* unicode-gen/utf8_gen.py: New generator, from Pravin Satpute
and Mike FABIAN.
* unicode-gen/utf8_compatibility.py: New verifier, from Pravin
Satpute and Mike FABIAN.
* charmaps/UTF-8: Update.
* locales/i18n: Update.
* gen-unicode-ctype.c: Remove.
* tst-ctype-de_DE.ISO-8859-1.in: Adjust, islower now returns
true for ordinal indicators.
2015-02-20 22:14:59 +00:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
2018-07-10 09:25:48 +00:00
|
|
|
PARSER = argparse.ArgumentParser(
|
|
|
|
description='''
|
|
|
|
Generate a UTF-8 file from UnicodeData.txt, EastAsianWidth.txt, and PropList.txt.
|
|
|
|
''')
|
|
|
|
PARSER.add_argument(
|
|
|
|
'-u', '--unicode_data_file',
|
|
|
|
nargs='?',
|
|
|
|
type=str,
|
|
|
|
default='UnicodeData.txt',
|
|
|
|
help=('The UnicodeData.txt file to read, '
|
|
|
|
+ 'default: %(default)s'))
|
|
|
|
PARSER.add_argument(
|
|
|
|
'-e', '--east_asian_with_file',
|
|
|
|
nargs='?',
|
|
|
|
type=str,
|
|
|
|
default='EastAsianWidth.txt',
|
|
|
|
help=('The EastAsianWidth.txt file to read, '
|
|
|
|
+ 'default: %(default)s'))
|
|
|
|
PARSER.add_argument(
|
|
|
|
'-p', '--prop_list_file',
|
|
|
|
nargs='?',
|
|
|
|
type=str,
|
|
|
|
default='PropList.txt',
|
|
|
|
help=('The PropList.txt file to read, '
|
|
|
|
+ 'default: %(default)s'))
|
|
|
|
PARSER.add_argument(
|
|
|
|
'--unicode_version',
|
|
|
|
nargs='?',
|
|
|
|
required=True,
|
|
|
|
type=str,
|
|
|
|
help='The Unicode version of the input files used.')
|
|
|
|
ARGS = PARSER.parse_args()
|
|
|
|
|
2020-06-16 06:29:40 +00:00
|
|
|
unicode_utils.fill_attributes(ARGS.unicode_data_file)
|
2018-07-10 09:25:48 +00:00
|
|
|
with open(ARGS.unicode_data_file, mode='r') as UNIDATA_FILE:
|
|
|
|
UNICODE_DATA_LINES = UNIDATA_FILE.readlines()
|
|
|
|
with open(ARGS.east_asian_with_file, mode='r') as EAST_ASIAN_WIDTH_FILE:
|
|
|
|
EAST_ASIAN_WIDTH_LINES = []
|
|
|
|
for LINE in EAST_ASIAN_WIDTH_FILE:
|
|
|
|
# If characters from EastAasianWidth.txt which are from
|
|
|
|
# from reserved ranges (i.e. not yet assigned code points)
|
|
|
|
# are added to the WIDTH section of the UTF-8 file, then
|
|
|
|
# “make check” produces “Unknown Character” errors for
|
|
|
|
# these code points because such unassigned code points
|
|
|
|
# are not in the CHARMAP section of the UTF-8 file.
|
|
|
|
#
|
|
|
|
# Therefore, we skip all reserved code points when reading
|
|
|
|
# the EastAsianWidth.txt file.
|
|
|
|
if re.match(r'.*<reserved-.+>\.\.<reserved-.+>.*', LINE):
|
|
|
|
continue
|
|
|
|
if re.match(r'^[^;]*;[WF]', LINE):
|
|
|
|
EAST_ASIAN_WIDTH_LINES.append(LINE.strip())
|
|
|
|
with open(ARGS.prop_list_file, mode='r') as PROP_LIST_FILE:
|
|
|
|
PROP_LIST_LINES = []
|
|
|
|
for LINE in PROP_LIST_FILE:
|
|
|
|
if re.match(r'^[^;]*;[\s]*Prepended_Concatenation_Mark', LINE):
|
|
|
|
PROP_LIST_LINES.append(LINE.strip())
|
|
|
|
with open('UTF-8', mode='w') as OUTFILE:
|
|
|
|
# Processing UnicodeData.txt and write CHARMAP to UTF-8 file
|
|
|
|
write_header_charmap(OUTFILE)
|
|
|
|
process_charmap(UNICODE_DATA_LINES, OUTFILE)
|
|
|
|
OUTFILE.write("END CHARMAP\n\n")
|
|
|
|
# Processing EastAsianWidth.txt and write WIDTH to UTF-8 file
|
|
|
|
write_header_width(OUTFILE, ARGS.unicode_version)
|
|
|
|
process_width(OUTFILE,
|
|
|
|
UNICODE_DATA_LINES,
|
|
|
|
EAST_ASIAN_WIDTH_LINES,
|
|
|
|
PROP_LIST_LINES)
|
|
|
|
OUTFILE.write("END WIDTH\n")
|