X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/7e678eaffb1a57d300e8aa77078d93ab481f8006..e81df0ef9f0d7b5d22b0829f0a89a380a8e310ab:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 2315495..b58f0c3 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -47,7 +47,8 @@ eval {
 } or warn "Failed importing html entities: $@";
 
 my %diinc = (
-	'digraphs.inc.pl' => 'u-di',
+	'data/digraphs-rfc.inc.pl' => 'u-di',
+	'data/digraphs-shiar.inc.pl' => 'u-prop Xz',
 );
 for (keys %diinc) {
 	-e $_ or next;
@@ -55,13 +56,8 @@ for (keys %diinc) {
 	while (my ($mnem, $cp) = each %$di) {
 		length $mnem == 2 or next;  # limit to digraphs
 		my $class = $diinc{$_};
-		if (ref $cp) {
-			# old style array
-			$class = 'u-prop' if $cp->[2] and $cp->[2] =~ m/\bXz\b/;
-			$cp = chr $cp->[0];
-		}
-		$info{$cp}->{di} //= $mnem;
-		$info{$cp}->{class}->{$class}++;
+		$info{chr $cp}->{di} //= $mnem;
+		$info{chr $cp}->{class}->{$class}++;
 	}
 }