cache unicode character details in digraph include

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 93dfd75b698b115a5a44898c1bc4f5b8e4b07dea..67d2a1a130f1370a2696d5bbd797321a076745ba 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -4,8 +4,6 @@ use strict;
 use warnings;
 use open IO => ':utf8';
 
 use warnings;
 use open IO => ':utf8';
 

-use Unicode::UCD qw(charinfo);
-

 our $VERSION = '1.0';
 
 $header{content_type} = 'text/html; charset=utf-8';
 our $VERSION = '1.0';
 
 $header{content_type} = 'text/html; charset=utf-8';


@@ -122,20 +120,15 @@ for my $c1 (@chars) {
                        print '<td>';
                        next;
                }
                        print '<td>';
                        next;
                }

-               my $chr = $di->{$mnem};
-               my $glyph = chr $chr;
-               utf8::upgrade($glyph);  # prevent latin1 output
-               my $info = charinfo($chr);
+               my ($codepoint, $name, $prop, $script) = @{ $di->{$mnem} };

 
 

-               my $desc = $mnem;
-               $desc .= " ($_)" for $info->{name} || ();
-
-               my @class = 'X';
-               push @class, $_ for $info->{category} || ();
-               push @class, $_ for $info->{script} || ();
+               my $glyph = chr $codepoint;
+               utf8::upgrade($glyph);  # prevent latin1 output
+               my $desc = $mnem . ($name && " ($name)");
+               my @class = ('X', grep {$_} $prop, $script);

 
                $glyph = quote($glyph);
 
                $glyph = quote($glyph);

-               $glyph = "<span>$glyph</span>" if $info->{category} eq 'Zs';
+               $glyph = "<span>$glyph</span>" if $prop eq 'Zs';

 
                printf "\n".'<td class="%s" title="%s">%s',
                        join(' ', @class), quote($desc), $glyph;
 
                printf "\n".'<td class="%s" title="%s">%s',
                        join(' ', @class), quote($desc), $glyph;