In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/3baae3fab5dea1469c2d040f5380bc2009bdeecb?hp=af25b33d388e2824ad52b31c8f5c7bc722f02dd6>
- Log ----------------------------------------------------------------- commit 3baae3fab5dea1469c2d040f5380bc2009bdeecb Author: Karl Williamson <[email protected]> Date: Fri Nov 11 14:52:39 2016 +0100 Move Unicode-Normalize to dist/ p5p has taken over the maintenance of this module, so it should be in dist/ ----------------------------------------------------------------------- Summary of changes: MANIFEST | 32 +++++++++++++-------------- META.json | 1 + META.yml | 1 + Porting/Maintainers.pl | 2 +- charclass_invlists.h | 2 +- {cpan => dist}/Unicode-Normalize/.gitignore | 0 {cpan => dist}/Unicode-Normalize/Makefile.PL | 0 {cpan => dist}/Unicode-Normalize/Normalize.pm | 14 ++++++------ {cpan => dist}/Unicode-Normalize/Normalize.xs | 0 {cpan => dist}/Unicode-Normalize/mkheader | 0 {cpan => dist}/Unicode-Normalize/t/fcdc.t | 0 {cpan => dist}/Unicode-Normalize/t/form.t | 0 {cpan => dist}/Unicode-Normalize/t/func.t | 0 {cpan => dist}/Unicode-Normalize/t/illegal.t | 0 {cpan => dist}/Unicode-Normalize/t/norm.t | 0 {cpan => dist}/Unicode-Normalize/t/null.t | 0 {cpan => dist}/Unicode-Normalize/t/partial1.t | 0 {cpan => dist}/Unicode-Normalize/t/partial2.t | 0 {cpan => dist}/Unicode-Normalize/t/proto.t | 0 {cpan => dist}/Unicode-Normalize/t/split.t | 0 {cpan => dist}/Unicode-Normalize/t/test.t | 0 {cpan => dist}/Unicode-Normalize/t/tie.t | 0 lib/unicore/mktables | 4 ++-- regcharclass.h | 2 +- t/TEST | 2 +- 25 files changed, 31 insertions(+), 29 deletions(-) rename {cpan => dist}/Unicode-Normalize/.gitignore (100%) rename {cpan => dist}/Unicode-Normalize/Makefile.PL (100%) rename {cpan => dist}/Unicode-Normalize/Normalize.pm (97%) rename {cpan => dist}/Unicode-Normalize/Normalize.xs (100%) rename {cpan => dist}/Unicode-Normalize/mkheader (100%) rename {cpan => dist}/Unicode-Normalize/t/fcdc.t (100%) rename {cpan => dist}/Unicode-Normalize/t/form.t (100%) rename {cpan => dist}/Unicode-Normalize/t/func.t (100%) rename {cpan => dist}/Unicode-Normalize/t/illegal.t (100%) rename {cpan => dist}/Unicode-Normalize/t/norm.t (100%) rename {cpan => dist}/Unicode-Normalize/t/null.t (100%) rename {cpan => dist}/Unicode-Normalize/t/partial1.t (100%) rename {cpan => dist}/Unicode-Normalize/t/partial2.t (100%) rename {cpan => dist}/Unicode-Normalize/t/proto.t (100%) rename {cpan => dist}/Unicode-Normalize/t/split.t (100%) rename {cpan => dist}/Unicode-Normalize/t/test.t (100%) rename {cpan => dist}/Unicode-Normalize/t/tie.t (100%) diff --git a/MANIFEST b/MANIFEST index ef902b8..842b9aa 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3112,22 +3112,6 @@ cpan/Unicode-Collate/t/trailwt.t Unicode::Collate cpan/Unicode-Collate/t/variable.t Unicode::Collate cpan/Unicode-Collate/t/version.t Unicode::Collate cpan/Unicode-Collate/t/view.t Unicode::Collate -cpan/Unicode-Normalize/Makefile.PL Unicode::Normalize -cpan/Unicode-Normalize/mkheader Unicode::Normalize -cpan/Unicode-Normalize/Normalize.pm Unicode::Normalize -cpan/Unicode-Normalize/Normalize.xs Unicode::Normalize -cpan/Unicode-Normalize/t/fcdc.t Unicode::Normalize -cpan/Unicode-Normalize/t/form.t Unicode::Normalize -cpan/Unicode-Normalize/t/func.t Unicode::Normalize -cpan/Unicode-Normalize/t/illegal.t Unicode::Normalize -cpan/Unicode-Normalize/t/norm.t Unicode::Normalize -cpan/Unicode-Normalize/t/null.t Unicode::Normalize -cpan/Unicode-Normalize/t/partial1.t Unicode::Normalize -cpan/Unicode-Normalize/t/partial2.t Unicode::Normalize -cpan/Unicode-Normalize/t/proto.t Unicode::Normalize -cpan/Unicode-Normalize/t/split.t Unicode::Normalize -cpan/Unicode-Normalize/t/test.t Unicode::Normalize -cpan/Unicode-Normalize/t/tie.t Unicode::Normalize cpan/version/lib/version.pm Support for version objects cpan/version/lib/version.pod Documentation of the version module cpan/version/lib/version/Internals.pod Description of the internals of version objects @@ -3783,6 +3767,22 @@ dist/Time-HiRes/t/usleep.t Test for Time::HiRes dist/Time-HiRes/t/utime.t Test for Time::HiRes dist/Time-HiRes/t/Watchdog.pm Test for Time::HiRes dist/Time-HiRes/typemap Time::HiRes extension +dist/Unicode-Normalize/Makefile.PL Unicode::Normalize +dist/Unicode-Normalize/mkheader Unicode::Normalize +dist/Unicode-Normalize/Normalize.pm Unicode::Normalize +dist/Unicode-Normalize/Normalize.xs Unicode::Normalize +dist/Unicode-Normalize/t/fcdc.t Unicode::Normalize +dist/Unicode-Normalize/t/form.t Unicode::Normalize +dist/Unicode-Normalize/t/func.t Unicode::Normalize +dist/Unicode-Normalize/t/illegal.t Unicode::Normalize +dist/Unicode-Normalize/t/norm.t Unicode::Normalize +dist/Unicode-Normalize/t/null.t Unicode::Normalize +dist/Unicode-Normalize/t/partial1.t Unicode::Normalize +dist/Unicode-Normalize/t/partial2.t Unicode::Normalize +dist/Unicode-Normalize/t/proto.t Unicode::Normalize +dist/Unicode-Normalize/t/split.t Unicode::Normalize +dist/Unicode-Normalize/t/test.t Unicode::Normalize +dist/Unicode-Normalize/t/tie.t Unicode::Normalize dist/XSLoader/Makefile.PL Dynamic Loader makefile writer dist/XSLoader/t/XSLoader.t See if XSLoader works dist/XSLoader/XSLoader_pm.PL Simple XS Loader perl module diff --git a/META.json b/META.json index e8aa5cb..64a46ab 100644 --- a/META.json +++ b/META.json @@ -51,6 +51,7 @@ "dist/threads-shared", "dist/Tie-File", "dist/Time-HiRes", + "dist/Unicode-Normalize", "dist/XSLoader", "lib/perl5db", "win32" diff --git a/META.yml b/META.yml index 4d43f10..cfa9074 100644 --- a/META.yml +++ b/META.yml @@ -49,6 +49,7 @@ no_index: - dist/threads-shared - dist/Tie-File - dist/Time-HiRes + - dist/Unicode-Normalize - dist/XSLoader - lib/perl5db - win32 diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 51a417e..20889f8 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1327,7 +1327,7 @@ use File::Glob qw(:case); 'Unicode::Normalize' => { 'DISTRIBUTION' => 'KHW/Unicode-Normalize-1.25.tar.gz', - 'FILES' => q[cpan/Unicode-Normalize], + 'FILES' => q[dist/Unicode-Normalize], 'EXCLUDED' => [ qw( MANIFEST.N Normalize.pmN diff --git a/charclass_invlists.h b/charclass_invlists.h index 1613dda..5ed5aed 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -91558,7 +91558,7 @@ static const U8 WB_table[24][24] = { * 37f6186253da9824bdb27f4ad867bfe8c25d4dc6bdb2f05585e40a034675a348 lib/unicore/extracted/DLineBreak.txt * ef24061b5a5dc93d7e90c2e34530ec757180ee75d872cba65ffc946e52624ae8 lib/unicore/extracted/DNumType.txt * a197371fec9a1b517058b440841f60f9378d81682084eef8db22a88cb2f96e90 lib/unicore/extracted/DNumValues.txt - * 421444fcd83fcdfecffa743c8888c3a1a8e88bcde472a80fca57d199ec5db10a lib/unicore/mktables + * 066d6e75f95cf6794161c8ac0b1a40990277de90eefb913be2e675a7cba38d59 lib/unicore/mktables * cdecb300baad839a6f62791229f551a4fa33f3cbdca08e378dc976466354e778 lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 11011bc761487f5a63c8135e67248394d4cdff6f8f204a41cdfbdc8131e79406 regen/mk_invlists.pl diff --git a/cpan/Unicode-Normalize/.gitignore b/dist/Unicode-Normalize/.gitignore similarity index 100% rename from cpan/Unicode-Normalize/.gitignore rename to dist/Unicode-Normalize/.gitignore diff --git a/cpan/Unicode-Normalize/Makefile.PL b/dist/Unicode-Normalize/Makefile.PL similarity index 100% rename from cpan/Unicode-Normalize/Makefile.PL rename to dist/Unicode-Normalize/Makefile.PL diff --git a/cpan/Unicode-Normalize/Normalize.pm b/dist/Unicode-Normalize/Normalize.pm similarity index 97% rename from cpan/Unicode-Normalize/Normalize.pm rename to dist/Unicode-Normalize/Normalize.pm index ff6c0f0..b53f5c7 100644 --- a/cpan/Unicode-Normalize/Normalize.pm +++ b/dist/Unicode-Normalize/Normalize.pm @@ -161,7 +161,7 @@ Unicode::Normalize - Unicode Normalization Forms Parameters: -C<$string> is used as a string under character semantics (see F<perlunicode>). +C<$string> is used as a string under character semantics (see L<perlunicode>). C<$code_point> should be an unsigned integer representing a Unicode code point. @@ -238,8 +238,8 @@ the decomposition is compatibility decomposition. The string returned is not always in NFD/NFKD. Reordering may be required. - $NFD_string = reorder(decompose($string)); # eq. to NFD() - $NFKD_string = reorder(decompose($string, TRUE)); # eq. to NFKD() + $NFD_string = reorder(decompose($string)); # eq. to NFD() + $NFKD_string = reorder(decompose($string, TRUE)); # eq. to NFKD() =item C<$reordered_string = reorder($string)> @@ -277,12 +277,12 @@ should be equal to the entire C<$normalized>. When you have a C<$normalized> string and an C<$unnormalized> string following it, a simple concatenation is wrong: - $concat = $normalized . normalize($form, $unnormalized); # wrong! + $concat = $normalized . normalize($form, $unnormalized); # wrong! Instead of it, do like this: - ($processed, $unprocessed) = splitOnLastStarter($normalized); - $concat = $processed . normalize($form, $unprocessed.$unnormalized); + ($processed, $unprocessed) = splitOnLastStarter($normalized); + $concat = $processed . normalize($form,$unprocessed.$unnormalized); C<splitOnLastStarter()> should be called with a pre-normalized parameter C<$normalized>, that is in the same form as C<$form> you want. @@ -548,7 +548,7 @@ compiled into your perl. The following table lists the default Unicode version that comes with various perl versions. (It is possible to change the Unicode version in any perl version to be any earlier Unicode version, so one could cause Unicode 3.2 to be used in any perl version starting with -5.8.0. See C<$Config{privlib}>/F<unicore/README.perl>. +5.8.0. Read F<C<$Config{privlib}>/unicore/README.perl> for details. perl's version implemented Unicode version 5.6.1 3.0.1 diff --git a/cpan/Unicode-Normalize/Normalize.xs b/dist/Unicode-Normalize/Normalize.xs similarity index 100% rename from cpan/Unicode-Normalize/Normalize.xs rename to dist/Unicode-Normalize/Normalize.xs diff --git a/cpan/Unicode-Normalize/mkheader b/dist/Unicode-Normalize/mkheader similarity index 100% rename from cpan/Unicode-Normalize/mkheader rename to dist/Unicode-Normalize/mkheader diff --git a/cpan/Unicode-Normalize/t/fcdc.t b/dist/Unicode-Normalize/t/fcdc.t similarity index 100% rename from cpan/Unicode-Normalize/t/fcdc.t rename to dist/Unicode-Normalize/t/fcdc.t diff --git a/cpan/Unicode-Normalize/t/form.t b/dist/Unicode-Normalize/t/form.t similarity index 100% rename from cpan/Unicode-Normalize/t/form.t rename to dist/Unicode-Normalize/t/form.t diff --git a/cpan/Unicode-Normalize/t/func.t b/dist/Unicode-Normalize/t/func.t similarity index 100% rename from cpan/Unicode-Normalize/t/func.t rename to dist/Unicode-Normalize/t/func.t diff --git a/cpan/Unicode-Normalize/t/illegal.t b/dist/Unicode-Normalize/t/illegal.t similarity index 100% rename from cpan/Unicode-Normalize/t/illegal.t rename to dist/Unicode-Normalize/t/illegal.t diff --git a/cpan/Unicode-Normalize/t/norm.t b/dist/Unicode-Normalize/t/norm.t similarity index 100% rename from cpan/Unicode-Normalize/t/norm.t rename to dist/Unicode-Normalize/t/norm.t diff --git a/cpan/Unicode-Normalize/t/null.t b/dist/Unicode-Normalize/t/null.t similarity index 100% rename from cpan/Unicode-Normalize/t/null.t rename to dist/Unicode-Normalize/t/null.t diff --git a/cpan/Unicode-Normalize/t/partial1.t b/dist/Unicode-Normalize/t/partial1.t similarity index 100% rename from cpan/Unicode-Normalize/t/partial1.t rename to dist/Unicode-Normalize/t/partial1.t diff --git a/cpan/Unicode-Normalize/t/partial2.t b/dist/Unicode-Normalize/t/partial2.t similarity index 100% rename from cpan/Unicode-Normalize/t/partial2.t rename to dist/Unicode-Normalize/t/partial2.t diff --git a/cpan/Unicode-Normalize/t/proto.t b/dist/Unicode-Normalize/t/proto.t similarity index 100% rename from cpan/Unicode-Normalize/t/proto.t rename to dist/Unicode-Normalize/t/proto.t diff --git a/cpan/Unicode-Normalize/t/split.t b/dist/Unicode-Normalize/t/split.t similarity index 100% rename from cpan/Unicode-Normalize/t/split.t rename to dist/Unicode-Normalize/t/split.t diff --git a/cpan/Unicode-Normalize/t/test.t b/dist/Unicode-Normalize/t/test.t similarity index 100% rename from cpan/Unicode-Normalize/t/test.t rename to dist/Unicode-Normalize/t/test.t diff --git a/cpan/Unicode-Normalize/t/tie.t b/dist/Unicode-Normalize/t/tie.t similarity index 100% rename from cpan/Unicode-Normalize/t/tie.t rename to dist/Unicode-Normalize/t/tie.t diff --git a/lib/unicore/mktables b/lib/unicore/mktables index e93cb4d..fa1f1f4 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -490,8 +490,8 @@ my $unicode_reference_url = 'http://www.unicode.org/reports/tr44/'; # handled by Unicode::Normalize, nor will it compile when presented a version # that has them. However, you can trivially get it to compile by simply # ignoring those decompositions, by changing the croak to a carp. At the time -# of this writing, the line (in cpan/Unicode-Normalize/Normalize.pm or -# cpan/Unicode-Normalize/mkheader) reads +# of this writing, the line (in dist/Unicode-Normalize/Normalize.pm or +# dist/Unicode-Normalize/mkheader) reads # # croak("Weird Canonical Decomposition of U+$h"); # diff --git a/regcharclass.h b/regcharclass.h index 09857a7..cb43aca 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -1873,7 +1873,7 @@ * 37f6186253da9824bdb27f4ad867bfe8c25d4dc6bdb2f05585e40a034675a348 lib/unicore/extracted/DLineBreak.txt * ef24061b5a5dc93d7e90c2e34530ec757180ee75d872cba65ffc946e52624ae8 lib/unicore/extracted/DNumType.txt * a197371fec9a1b517058b440841f60f9378d81682084eef8db22a88cb2f96e90 lib/unicore/extracted/DNumValues.txt - * 421444fcd83fcdfecffa743c8888c3a1a8e88bcde472a80fca57d199ec5db10a lib/unicore/mktables + * 066d6e75f95cf6794161c8ac0b1a40990277de90eefb913be2e675a7cba38d59 lib/unicore/mktables * cdecb300baad839a6f62791229f551a4fa33f3cbdca08e378dc976466354e778 lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 66e20f857451956f9fc7ad7432de972e84fb857885009838878bcf6f91ffbeef regen/regcharclass.pl diff --git a/t/TEST b/t/TEST index e00029c..9a12bcd 100755 --- a/t/TEST +++ b/t/TEST @@ -73,7 +73,7 @@ my %temp_no_core = '../cpan/Test-Simple' => 1, '../cpan/Tie-RefHash' => 1, '../cpan/Unicode-Collate' => 1, - '../cpan/Unicode-Normalize' => 1, + '../dist/Unicode-Normalize' => 1, ); # delete env vars that may influence the results -- Perl5 Master Repository
