This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
mktables: Under -annotate use dotted circle for combining marks
authorKarl Williamson <khw@cpan.org>
Thu, 28 May 2015 02:35:43 +0000 (20:35 -0600)
committerKarl Williamson <khw@cpan.org>
Tue, 2 Jun 2015 04:06:02 +0000 (22:06 -0600)
Previously the NBSP was used, but the dotted circle is what Unicode uses
in their books, and it looks better.  Note that -annotate is not a
default option for mktables.

charclass_invlists.h
lib/unicore/mktables
regcharclass.h

index 9051766..2ee1e38 100644 (file)
@@ -97321,7 +97321,7 @@ static const UV XPosixXDigit_invlist[] = { /* for EBCDIC POSIX-BC */
  * a9791f08281d7b0a417e4ad882cf64463f6815db8156932acd85228ac717fd94 lib/unicore/extracted/DLineBreak.txt
  * a17a0330e57d774343a53c019f1bc69827c2676982a1bf48e0898a76710e8877 lib/unicore/extracted/DNumType.txt
  * c2cb810a67cc5fb4a8d236b6c1bc6dd4d89733d8603881997e8aae2c816a3db1 lib/unicore/extracted/DNumValues.txt
- * 808d76136d9952faf581347e9bc040dbab5158f143f243a6de455a4af39b7401 lib/unicore/mktables
+ * 868dbf83a2c62170b63a1fc4f52e11d0a32c8af0f7833dd7823c6ca496cc0d9c lib/unicore/mktables
  * 746472de66b936ac885ca6d6e68058242b4e909e3260c6317f3ec719f78f76cc lib/unicore/version
  * 4360c31f23eb368e0f3bfd045a44d3bc37ff0889e216f686ebea02543ac188d9 regen/mk_invlists.pl
  * ex: set ro: */
index a746b77..8a4100c 100644 (file)
@@ -8902,13 +8902,13 @@ sub trace { return main::trace(@_) if main::DEBUG && $to_trace }
 package main;
 
     sub display_chr {
-        # Converts an ordinal character value to a displayable string, using a
-        # NBSP to hold combining characters.
+        # Converts an ordinal printable character value to a displayable
+        # string, using a dotted circle to hold combining characters.
 
         my $ord = shift;
         my $chr = chr $ord;
         return $chr if $ccc->table(0)->contains($ord);
-        return chr(utf8::unicode_to_native(0xA0)) . $chr;
+        return "\x{25CC}$chr";
     }
 
 sub join_lines($) {
index 27cf8ea..00e4515 100644 (file)
  * a9791f08281d7b0a417e4ad882cf64463f6815db8156932acd85228ac717fd94 lib/unicore/extracted/DLineBreak.txt
  * a17a0330e57d774343a53c019f1bc69827c2676982a1bf48e0898a76710e8877 lib/unicore/extracted/DNumType.txt
  * c2cb810a67cc5fb4a8d236b6c1bc6dd4d89733d8603881997e8aae2c816a3db1 lib/unicore/extracted/DNumValues.txt
- * 808d76136d9952faf581347e9bc040dbab5158f143f243a6de455a4af39b7401 lib/unicore/mktables
+ * 868dbf83a2c62170b63a1fc4f52e11d0a32c8af0f7833dd7823c6ca496cc0d9c lib/unicore/mktables
  * 746472de66b936ac885ca6d6e68058242b4e909e3260c6317f3ec719f78f76cc lib/unicore/version
  * 3eaedce3745bef6219cff3b5f63e5f8622c58dc66736281a82df991636d54451 regen/regcharclass.pl
  * ex: set ro: */