In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/d870e48d0f79756c36f71c7a21e6b4e8edf017c0?hp=7fd0eed3ddc61ff1ab8e81d17472959868e6a87f>
- Log ----------------------------------------------------------------- commit d870e48d0f79756c36f71c7a21e6b4e8edf017c0 Author: Karl Williamson <[email protected]> Date: Wed Oct 2 16:19:49 2019 -0600 lib/charnames.t: Fix Named Sequence test for EBCDIC The file from Unicode needs to be translated to native commit ff8d74df8543a394d61833a4f940f40a2c3aed18 Author: Karl Williamson <[email protected]> Date: Wed Oct 2 16:13:31 2019 -0600 mktables: Fix Named Sequences for EBCDIC This table wasn't being translated into native code points ----------------------------------------------------------------------- Summary of changes: charclass_invlists.h | 2 +- lib/charnames.t | 3 +++ lib/unicore/mktables | 5 +++++ lib/unicore/uni_keywords.pl | 2 +- regcharclass.h | 2 +- uni_keywords.h | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/charclass_invlists.h b/charclass_invlists.h index 70ea70894d..50cf43bd17 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -395307,7 +395307,7 @@ static const U8 WB_table[23][23] = { * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt - * a74b5e334b78d45bfc61718c8ef302d19884bdcfe348d0f24ddcbf4fa0a17118 lib/unicore/mktables + * 70966df83428f30e3b8a0f75539b3cf4964248c73ce898aabdcb819d6eb8175a lib/unicore/mktables * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl diff --git a/lib/charnames.t b/lib/charnames.t index 14bdebddb0..723c02fb8b 100644 --- a/lib/charnames.t +++ b/lib/charnames.t @@ -1259,6 +1259,9 @@ is("\N{U+1D0C5}", "\N{BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA VASIS}", 'V s/^\s*#.*//; next unless $_; my ($name, $codes) = split ";"; + $codes =~ s/\b 00 ( [0-9A-F]{2} ) \b/ + sprintf("%04X", utf8::unicode_to_native(hex $1))/gxe + if ord "A" != 65; my $utf8 = pack("W*", map { hex } split " ", $codes); is(charnames::string_vianame($name), $utf8, "Verify string_vianame(\"$name\") is the proper utf8"); my $loose_name = get_loose_name($name); diff --git a/lib/unicore/mktables b/lib/unicore/mktables index 9cecad3799..8b16b820cd 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -12524,6 +12524,11 @@ sub process_NamedSequences { next; } + # Code points below 0x0100 need to be converted to native + $sequence =~ s/\b 00 ( [0-9A-F]{2} ) \b/ + sprintf("%04X", utf8::unicode_to_native(hex $1))/gxe + if NON_ASCII_PLATFORM; + # Note single \t in keeping with special output format of # Perl_charnames. But it turns out that the code points don't have to # be 5 digits long, like the rest, based on the internal workings of diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index b1640d7583..94e8c183c7 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1261,7 +1261,7 @@ # 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt # 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt # 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt -# a74b5e334b78d45bfc61718c8ef302d19884bdcfe348d0f24ddcbf4fa0a17118 lib/unicore/mktables +# 70966df83428f30e3b8a0f75539b3cf4964248c73ce898aabdcb819d6eb8175a lib/unicore/mktables # a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version # 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl # 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl diff --git a/regcharclass.h b/regcharclass.h index cc8dc6dcbb..6df3b95a6f 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -1901,7 +1901,7 @@ * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt - * a74b5e334b78d45bfc61718c8ef302d19884bdcfe348d0f24ddcbf4fa0a17118 lib/unicore/mktables + * 70966df83428f30e3b8a0f75539b3cf4964248c73ce898aabdcb819d6eb8175a lib/unicore/mktables * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl * 830144f6afdd047b009754ffa06134397268f6638837fe85283483eb0cfdd558 regen/regcharclass.pl diff --git a/uni_keywords.h b/uni_keywords.h index c160321c0c..f088a431f1 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7284,7 +7284,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt - * a74b5e334b78d45bfc61718c8ef302d19884bdcfe348d0f24ddcbf4fa0a17118 lib/unicore/mktables + * 70966df83428f30e3b8a0f75539b3cf4964248c73ce898aabdcb819d6eb8175a lib/unicore/mktables * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl -- Perl5 Master Repository
