X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/d22e7febda8720bc38069f7061adb43b98143c48..9445c538bedc82733b7b1c6eb9df7bf9cb54ed64:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index af71630..6b1a5c2 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -38,14 +38,13 @@ 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)
-	$di->{ substr($_, 1, 1) . substr($_, 0, 1) } ||=
-		[ $di->{$_}->[0], '', 'l0 ex', '', $di->{$_}->[4] ]
-		for grep { ref $di->{$_} } keys %{$di};
+	$di->{key}->{ substr($_, 1, 1) . substr($_, 0, 1) } ||= [
+		$di->{key}->{$_}->[0], '', 'l0 ex', '', $di->{key}->{$_}->[4]
+	] for grep { ref $di->{key}->{$_} } keys %{ $di->{key} };
 }
 
 my @chars = (
@@ -59,12 +58,13 @@ 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: ", $@ // $!;
-	$_ = [ord $_] for values %{$xorg};
+	my $xorg = Data('digraphs-xorg');
+	$_->[3] = undef for values %{$xorg};  # reset alias classes
 	$xorg->{$_}->[2] = # class = compatibility
-		$di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
-		$di->{$_}->[2] eq 'l4' ? 'l5' : 'l3' : 'l2'  # rfc|any|none
+		!$di->{key}->{$_} ? 'l2' :  # free
+		$di->{key}->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
+		$di->{key}->{$_}->[2] eq 'l4' ? 'l5' :  # rfc
+		'l3'  # any
 		for keys %{$xorg};
 
 	for my $cp (map {$_->[0]} values %{$xorg}) {
@@ -87,7 +87,7 @@ if ($mode) {
 
 	$chars2[0] = [qw( # ^ _ ` ~ )];
 	@chars = @chars2;
-	$di = $xorg;
+	$di->{key} = $xorg;
 }
 
 for my $colchars (@columns) {
@@ -105,15 +105,16 @@ for my $c1group (@chars) {
 		print '<tr><th>', EscapeHTML($c1);
 		for my $c2 (map {@$_} @$colchars) {
 			my $mnem = $c1 . $c2;
-			if (not defined $di->{$mnem}) {
+			if (not defined $di->{key}->{$mnem}) {
 				print '<td>';
 				next;
 			}
-			if (ref $di->{$mnem} ne 'ARRAY') {
+			if (ref $di->{key}->{$mnem} ne 'ARRAY') {
 				printf '<td class="X Xr" title="%s">', EscapeHTML($mnem);
 				next;
 			}
-			my ($codepoint, $name, $support, $script, $string) = @{ $di->{$mnem} };
+			my ($codepoint, $name, $support, $script, $string) =
+				@{ $di->{key}->{$mnem} };
 
 			my $glyph = $string || chr $codepoint;
 			utf8::upgrade($glyph);  # prevent latin1 output
@@ -168,12 +169,10 @@ if ($mode) {
 	<td class="X Bopomofo">chinese
 	</table>
 
-	<table class="glyphs"><tr>
-	<td class="X u-l4">full support
-	<td class="X u-l3">vim extension
-	<td class="X u-l3 ex">vim v8.0
-	<td class="X u-l2">proposal
-	<td class="X u-l1">not in vim
+	<table class="glyphs"><tr><:
+	print qq(\n\t<td class="X u-$_">$di->{flag}->{$_})
+		for sort keys %{ $di->{flag} };
+:>
 	</table>
 </div>