From: Karl Williamson Date: Sun, 3 Dec 2017 05:28:28 +0000 (-0700) Subject: perluniprops/mktables: Fix wong output. X-Git-Tag: v5.27.7~200 X-Git-Url: https://perl5.git.perl.org/perl5.git/commitdiff_plain/4f193c3e96af4b9697510e396fb5e944776d38fb perluniprops/mktables: Fix wong output. perluniprops had a few entries like XPosixCntrl General_Category=XPosixCntrlControl It should have read XPosixCntrl General_Category=Control --- diff --git a/charclass_invlists.h b/charclass_invlists.h index b31e91c..5370b11 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -97454,7 +97454,7 @@ static const U8 WB_table[24][24] = { * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt - * d690e26d30064cf6ecf46f003b690bad4668750cbbaccb77175aa9b237a1b3da lib/unicore/mktables + * 54674ddca5d34b6e08b881e39573d821079cc552fc57e811f6da121bed59a3f8 lib/unicore/mktables * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 48418cbf454eb9ef35c73468ed5ef72ad8603490eabe74181ce4fae42ec72579 regen/mk_invlists.pl diff --git a/lib/unicore/mktables b/lib/unicore/mktables index 032701b..55da8ff 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -16425,39 +16425,50 @@ sub make_ucd_table_pod_entries { : $table->parent->property; my $perl_extension = $table->perl_extension; + my $is_perl_extension_match_table_but_not_dollar_perl + = $property != $perl + && $perl_extension + && $property != $table; # Get the more official name for for perl extensions that aren't # stand-alone properties - if ($perl_extension && $property != $table) { - if ($property == $perl ||$property->type == $BINARY) { - $meaning = $table->complete_name; + if ($is_perl_extension_match_table_but_not_dollar_perl) { + if ($property->type == $BINARY) { + $meaning = $property->full_name; } else { - $meaning = $property->full_name . "=$full_name"; + $meaning = $table->parent->complete_name; } } # There are three types of info column. One for the short name, one for # the full name, and one for everything else. They mostly are the same, # so initialize in the same loop. + foreach my $info_ref (\$full_info, \$short_info, \$other_info) { - if ($perl_extension && $property != $table) { + if ($info_ref != \$full_info) { + + # The non-full name columns include the full name + $$info_ref .= $full_name; + } + + + if ($is_perl_extension_match_table_but_not_dollar_perl) { # Add the synonymous name for the non-full name entries; and to # the full-name entry if it adds extra information - if ($info_ref == \$other_info - || ($info_ref == \$short_info - && $standard_short_name ne $standard_full_name) - || standardize($meaning) ne $standard_full_name - ) { - $$info_ref .= "$meaning."; + if ( standardize($meaning) ne $standard_full_name + || $info_ref == \$other_info + || $info_ref == \$short_info) + { + my $parenthesized = $info_ref != \$full_info; + $$info_ref .= " " if $$info_ref && $parenthesized; + $$info_ref .= "(=" if $parenthesized; + $$info_ref .= "$meaning"; + $$info_ref .= ")" if $parenthesized; + $$info_ref .= "."; } } - elsif ($info_ref != \$full_info) { - - # Otherwise, the non-full name columns include the full name - $$info_ref .= $full_name; - } # And the full-name entry includes the short name, if shorter if ($info_ref == \$full_info diff --git a/regcharclass.h b/regcharclass.h index ea9c5d6..a7218f4 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -1898,7 +1898,7 @@ * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt - * d690e26d30064cf6ecf46f003b690bad4668750cbbaccb77175aa9b237a1b3da lib/unicore/mktables + * 54674ddca5d34b6e08b881e39573d821079cc552fc57e811f6da121bed59a3f8 lib/unicore/mktables * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 9ea6338945a7d70e5ea4b31ac7856c0b521df96be002e94b4b3b7d31debbf3ab regen/regcharclass.pl