digraphs: mkdigraphlist: redetermine source class

diff --git a/digraphs.plp b/digraphs.plp
index ce149628c324a074854e2d7eebacf85341bc6db2..18123a61e127c8640681152c3ad25231f78f4eb0 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -66,7 +66,7 @@ for my $c1group (@chars) {
                        my @class = ('X', grep {$_} $prop, $script);
 
                        $glyph = EscapeHTML($glyph);
                        my @class = ('X', grep {$_} $prop, $script);
 
                        $glyph = EscapeHTML($glyph);

-                       $glyph = "<span>$glyph</span>" if $prop =~ /\bZs\b/;
+                       $glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;

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

diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index 8a05fa42f3740066125fdf42204056e39d248b95..e472ce0e0d01a41b5e0f27ef5f16f927c51c4d78 100755 (executable)
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -6,18 +6,16 @@ use utf8;
 
 use open OUT => ':utf8', ':std';
 
 
 use open OUT => ':utf8', ':std';
 

-our $VERSION = '1.03';
+our $VERSION = '1.04';

 
 

-# create a hash of desired input
-my $di = do 'data/digraphs-rfc.inc.pl'
+# import and combine various digraph data
+my $rfc = do 'data/digraphs-rfc.inc.pl'

        or die "error reading digraphs include: ", $@ // $!;
        or die "error reading digraphs include: ", $@ // $!;

-
-# personal addendums

 my $extra = do 'data/digraphs-shiar.inc.pl'
        or warn "could not include shiar proposals: ", $@ // $!;
 my $vim = do 'data/digraphs-vim.inc.pl'
        or warn "could not include vim extensions ", $@ // $!;
 my $extra = do 'data/digraphs-shiar.inc.pl'
        or warn "could not include shiar proposals: ", $@ // $!;
 my $vim = do 'data/digraphs-vim.inc.pl'
        or warn "could not include vim extensions ", $@ // $!;

-$di = { %{$vim // {}}, %{$di}, %{$extra // {}} };
+my $di = { %{$vim // {}}, %{$rfc}, %{$extra // {}} };

 
 # optionally get unicode character information
 my $uninfo = do 'unicode-char.inc.pl'
 
 # optionally get unicode character information
 my $uninfo = do 'unicode-char.inc.pl'


@@ -36,8 +34,11 @@ printf "q{%s}=>[%s],\n", $_, join(',',
        $di->{$_},   # original code point
        map {"'$_'"}
        $uninfo->{ chr $di->{$_} }->[1],  # name
        $di->{$_},   # original code point
        map {"'$_'"}
        $uninfo->{ chr $di->{$_} }->[1],  # name

-       $uninfo->{ chr $di->{$_} }->[0],  # class
-       (map {('', $_)} $uninfo->{ chr $di->{$_} }->[4] // ()),  # string
+       $vim->{$_}
+               ? $rfc->{$_} ? 'u-di' : 'u-prop'  # vim+rfc or vim-only
+               :              'u-prop ex',  # neither
+       $uninfo->{ chr $di->{$_} }->[0] =~ s/ u-di| u-prop| ex//gr,  # class
+       $uninfo->{ chr $di->{$_} }->[4] // (),  # string

 ) for sort keys %{$di};
 print "}\n";
 
 ) for sort keys %{$di};
 print "}\n";
 


@@ -61,11 +62,12 @@ The value can either be a scalar string containing another
 digraph which can be considered identical (usually inverted),
 or an array ref containing at least the resulting character's
 Unicode code point value.  If available, the following UCD data
 digraph which can be considered identical (usually inverted),
 or an array ref containing at least the resulting character's
 Unicode code point value.  If available, the following UCD data

-is appended: character name, category, script, and output string.
+is appended: character name, usage classes, unicode classes,
+and replacement output string.

 For example:
 
  +{
 For example:
 
  +{

-   AE => [198, 'LATIN CAPITAL LETTER AE', 'Lu Xl', 'Latin'],
+   AE => [198, 'LATIN CAPITAL LETTER AE', 'u-di', 'Latin Lu Xl u-v11'],

    EA => 'AE',
   }
 
    EA => 'AE',
   }