index: release v1.18 with only altgr index linked

[sheet.git] / tools / mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index df5b595c296f849e32479e3766ae995f11d49c57..8bf3d54fb62bea78a537947f7360209a7031ea34 100755 (executable)
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -3,11 +3,12 @@ use 5.014;
 use warnings;
 use utf8;
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
+use lib '.';
 
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 use Data::Dump 'pp';
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 
 my %info = (
        # prepare presentational string for some control(lish) entries
@@ -17,11 +18,14 @@ my %info = (
        "\x{200B}" => {string => '␣'}, # nbsp: ~ in TeX
        "\x{200C}" => {string => '|'}, # ISO-9995-7-081 lookalike (alt: ∣ ⊺ ⟙)
        "\x{200D}" => {string => '⁀'}, # join (alt: ∤ |ͯ ⨝)
+       (map {( $_ => {string => chr(9676).$_.chr(9676)} )} map {chr} # combining double
+               0x35C .. 0x362, 0x1DCD, 0x1DFC,
+       ),
 );
 $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 +38,14 @@ eval {
        1;
 } or warn "Failed reading unicode tables: $@";
 
+for my $layout ('macos-abc', 'windows') {
+       eval {
+               my $kbd = do "./keyboard/altgr/$layout.eng.inc.pl" or die $@ || $!;
+               $info{$_} //= {} for map {s/◌//g; m/\A./g} values %{ $kbd->{key} };
+               1;
+       } or warn "Failed reading additional keyboard map $layout: $@";
+}
+
 eval {
        require HTML::Entities;
        our %char2entity;
@@ -46,9 +58,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,16 +76,17 @@ 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;
+       #my $info = glyph_mkinfo($cp) or next;
        # attempt to get unicode character information
        my $info = eval {
                require Unicode::UCD;