digraphs: encode data include directly as json

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 5e4a3341812d689f3c4599061efd1e1e1c7a67d6..ccb19871ea0348d1d65ce7c640a7167e021fa323 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -5,7 +5,7 @@ my $modename = $mode ? 'X.Org' : 'RFC-1345';
 
 Html({
        title => 'digraph cheat sheet',
-       version => '1.2',
+       version => '1.3',
        description => [
                "Complete table of digraph characters from $modename.",
        ],
@@ -38,8 +38,7 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'data/digraphs.inc.pl'
-       or die "Error loading digraphs data: ", $@ // $!;
+my $di = Data('digraphs');
 
 if (exists $get{v}) {
        # show characters for inverted mnemonics (vim alternatives)
@@ -59,8 +58,7 @@ my @columns = !exists $get{split} ? \@chars2 :
        ([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
 
 if ($mode) {
-       my $xorg = do 'data/digraphs-xorg.inc.pl'
-               or die "Error loading Xorg data: ", $@ // $!;
+       my $xorg = Data('data/digraphs-xorg');
        $_ = [ord $_] for values %{$xorg};
        $xorg->{$_}->[2] = # class = compatibility
                $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict