keyboard/altgr: prepare character info for windows inventory

[sheet.git] / tools / mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index c04ca8a3a5cd5c314d0eca115bb783f28c71d8ba..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 => ':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,6 +18,9 @@ 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;
 
@@ -34,12 +38,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: $@";
+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;
@@ -81,6 +86,7 @@ eval {
 
 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;