X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8521aa8e17b8e10fd0d9450d474d8ab06a8c2b73..0d7d8b502321cdd3d041b756c742a4805b009f8f:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 988d7b1..6d08f9e 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -1,14 +1,13 @@
 #!/usr/bin/env perl
-use 5.010;
-use strict;
+use 5.014;
 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.01';
+our $VERSION = '1.02';
 
 my %info = (
 	# prepare presentational string for some control(lish) entries
@@ -22,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 (@$_) {
@@ -47,9 +46,9 @@ eval {
 } or warn "Failed importing html entities: $@";
 
 my %diinc = (
-	'data/digraphs-rfc.inc.pl' => 'u-di',
-	'data/digraphs-shiar.inc.pl' => 'u-prop ex',
-	'data/digraphs-vim.inc.pl' => 'u-prop',
+	'./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;
@@ -65,13 +64,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;
@@ -84,9 +83,9 @@ for my $chr (keys %info) {
 
 	$info->{$_} = $info{$chr}->{$_} for keys %{ $info{$chr} };
 
-	# official digraphs either lose vim flag or gain experimental
-	delete $info->{class}->{'u-prop'} or $info->{class}->{ex}++
-		if $info->{class}->{'u-di'};
+	# ignore vim flag in addition to rfc support, replace otherwise
+	$info->{class}->{'u-di'} or $info->{class}->{'u-prop'}++
+		if delete $info->{class}->{'u-vim'};
 
 	# categorise by unicode types and writing script
 	$info->{class}->{$_}++ for $info->{category};