summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2015-09-08 13:18:58 -0600
committerKarl Williamson <khw@cpan.org>2015-09-08 16:42:30 -0600
commit718ac8a2e5fd26fa68078f057e7c332594ebebf6 (patch)
treea7f13efe159a9f258af6c913ce41710ccf5acaac /lib
parentba403c704ff59749fc2ce2550b23a8769a22897e (diff)
downloadperl-718ac8a2e5fd26fa68078f057e7c332594ebebf6.tar.gz
mktables: Fix --annotate option output
Special code suppressed the expanded output of some ranges, where it would be clear from the range itself what was meant. However, for many output tables, that range output was changed, so the desired information is missing. For these tables, don't suppress the expanded output.
Diffstat (limited to 'lib')
-rw-r--r--lib/unicore/mktables11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index c621923828..d005c44518 100644
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -6379,7 +6379,15 @@ END
$range_name = "Hangul Syllable";
}
- if ($i != $start || $range_end < $end) {
+ # If the annotation would just repeat what's
+ # already being output as the range, skip it.
+ # (When an inversion list is being written, it
+ # isn't a repeat, as that always is in
+ # decimal)
+ if ( $write_as_invlist
+ || $i != $start
+ || $range_end < $end)
+ {
if ($range_end < $MAX_WORKING_CODEPOINT)
{
$annotation = sprintf "%04X..%04X",
@@ -6393,6 +6401,7 @@ END
else { # Indent if not displaying code points
$annotation = " " x 4;
}
+
if ($range_name) {
$annotation .= " $age[$i]" if $age[$i];
$annotation .= " $range_name";