X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/55fccedff787f05a5950ff827b5bbd41ba597e3f..f6ae52898e175c06356e7a847f5f0f69d16f0fd0:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 61f674f..8bf3d54 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -18,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;
 
@@ -35,11 +38,13 @@ eval {
 	1;
 } or warn "Failed reading unicode tables: $@";
 
-eval {
-	my $kbd = do './keyboard/altgr/macos-abc.eng.inc.pl' or die $@ || $!;
-	$info{$_} //= {} for map {s/◌//g; m/\A./g} values %{ $kbd->{key} };
-	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;