X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/c98bda172fec13970df56f9bec501b420c3b51f5..1fffc8ba4ed48b9cc9a8fd76532ef7396f3d27b6:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index df5b595..c04ca8a 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -4,7 +4,7 @@ use warnings;
 use utf8;
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 use Data::Dump 'pp';
 
 our $VERSION = '1.02';
@@ -21,7 +21,7 @@ my %info = (
 $info{chr $_} //= {} for 32 .. 126;
 
 eval {
-	my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
+	my $tables = do './unicode-table.inc.pl' or die $@ || $!;
 	for (values %$tables) {
 		for (values %$_) {
 			for (@$_) {
@@ -34,6 +34,13 @@ eval {
 	1;
 } or warn "Failed reading unicode tables: $@";
 
+eval {
+	do './keyboard/altgr/macos-abc.eng.inc.pl' or die $@ || $!;
+	our %rows;
+	$info{$_} //= {} for values %rows;
+	1;
+} or warn "Failed reading additional keyboard map: $@";
+
 eval {
 	require HTML::Entities;
 	our %char2entity;
@@ -46,9 +53,9 @@ eval {
 } or warn "Failed importing html entities: $@";
 
 my %diinc = (
-	'data/digraphs-rfc.inc.pl' => 'u-di',
-	'data/digraphs-shiar.inc.pl' => 'u-prop',
-	'data/digraphs-vim.inc.pl' => 'u-vim',
+	'./data/digraphs-rfc.inc.pl' => 'u-di',
+	'./data/digraphs-shiar.inc.pl' => 'u-prop',
+	'./data/digraphs-vim.inc.pl' => 'u-vim',
 );
 for (sort keys %diinc) {
 	-e $_ or next;
@@ -64,13 +71,13 @@ for (sort keys %diinc) {
 
 eval {
 	# read introducing unicode versions for known characters
-	my $agemap = do 'unicode-age.inc.pl' or die $@ || $!;
+	my $agemap = do './data/unicode-age.inc.pl' or die $@ || $!;
 	for my $chr (keys %info) {
 		my $version = $agemap->{ord $chr} or next;
 		$info{$chr}->{class}->{'u-v'.$version}++
 	}
 	1;
-} or warn "Failed including unicode version data $@";
+} or warn "Failed including unicode version data: $@";
 
 for my $chr (keys %info) {
 	my $cp = ord $chr;