common: global Data() to parse perl code includes

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 7106c7f6da3ad411472fdb0798b98b2f9f7a8ab1..2f57b36147f5063b204f8368a25c02e59a2bd33c 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -38,8 +38,7 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'data/digraphs.inc.pl'
-       or Abort("Error loading digraphs data", 501, $@ // $!);
+my $di = Data('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 Abort("Error loading Xorg data", 501, $@ // $!);
+       my $xorg = Data('data/digraphs-xorg');
        $_ = [ord $_] for values %{$xorg};
        $xorg->{$_}->[2] = # class = compatibility
                $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict