From 623177b99e1aa90c459e5710df34a8cd33ad2b01 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Fri, 16 Feb 2024 22:36:03 +0100 Subject: [PATCH] keyboard/altgr: system categories indicated on index Translate os parts as unicode icons: windows as glass window, xorg as [linux] penguin, macos as apple, legacy as top hat. --- keyboard/altgr/drix.eng.inc.pl | 2 +- keyboard/altgr/eurkey.eng.inc.pl | 2 +- keyboard/altgr/index.inc.plp | 13 ++++++++++++- keyboard/altgr/macos.eng.inc.pl | 2 +- keyboard/altgr/msx.eng.inc.pl | 5 +++-- keyboard/altgr/olpc.eng.inc.pl | 2 +- keyboard/altgr/symbolics.eng.inc.pl | 2 +- keyboard/altgr/ukext.eng.inc.pl | 2 +- keyboard/altgr/windows.eng.inc.pl | 2 +- 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/keyboard/altgr/drix.eng.inc.pl b/keyboard/altgr/drix.eng.inc.pl index cdb4f05..c36f53b 100644 --- a/keyboard/altgr/drix.eng.inc.pl +++ b/keyboard/altgr/drix.eng.inc.pl @@ -110,7 +110,7 @@ $groups->{def}{''}{$_} .= ' ext' for qw( ` E Y ); %{$groups}, version => '1.0', title => 'Drix', - category => 'latin', + category => 'latin/xorg', intro => join("\n", "European Latin layout version 3.1 providing", 'Unicode characters while pressing AltGr,', diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl index 7220851..5b9702c 100644 --- a/keyboard/altgr/eurkey.eng.inc.pl +++ b/keyboard/altgr/eurkey.eng.inc.pl @@ -279,7 +279,7 @@ my %rows = ( }, version => '1.1', title => 'EurKEY', - category => 'latin', + category => 'latin/thirdparty', intro => join("\n", 'Third-party proposal EurKEY', 'v1.3 by Steffen Brüntjen', diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp index 0bb7774..7966426 100644 --- a/keyboard/altgr/index.inc.plp +++ b/keyboard/altgr/index.inc.plp @@ -1,6 +1,7 @@ <: # included from keyboard.plp use 5.014; use warnings; +use utf8; my @incs = glob 'keyboard/altgr/*.eng.inc.pl'; @@ -96,10 +97,17 @@ my @sample = split /(? "\N{TOP HAT}", + windows => "\x{1FA9F}", # \N{WINDOW} + macos => "\N{RED APPLE}", + xorg => "\N{PENGUIN}", +); + printf '
', @sample ? 'section' : 'gallery'; if (@sample) { print ''; - print ''; } @@ -140,6 +148,9 @@ for my $inc (sort { } say ''; } + print "\t'; } diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl index 35d4447..88afe82 100644 --- a/keyboard/altgr/macos.eng.inc.pl +++ b/keyboard/altgr/macos.eng.inc.pl @@ -104,7 +104,7 @@ my %rows = ( %{ kbchars(\%rows) }, version => '1.3', title => 'US option', - category => 'latin/windows', + category => 'latin/macos', intro => join("\n", 'Resulting selection of Unicode characters', "while pressing ⌥ Option (Alt) with Apple's US (or US International) layout", diff --git a/keyboard/altgr/msx.eng.inc.pl b/keyboard/altgr/msx.eng.inc.pl index 7bf5296..ec8e556 100644 --- a/keyboard/altgr/msx.eng.inc.pl +++ b/keyboard/altgr/msx.eng.inc.pl @@ -97,10 +97,11 @@ $groups->{flag}{ext} = ['anachrone', 'expected uppercase variants if allowed by +{ %{ $groups }, version => '1.1', - title => 'msx code', + title => 'MSX code', category => 'legacy/latin', intro => join("\n", - 'Resulting selection of equivalent Unicode characters', + 'Resulting selection", + "of equivalent Unicode characters', "when the code key is pressed on an MSX home computer", "(International model such as Toshiba HX10 or Phillips NMS 8245).", ), diff --git a/keyboard/altgr/olpc.eng.inc.pl b/keyboard/altgr/olpc.eng.inc.pl index 2cd99e2..3d72e36 100644 --- a/keyboard/altgr/olpc.eng.inc.pl +++ b/keyboard/altgr/olpc.eng.inc.pl @@ -74,7 +74,7 @@ $groups->{def}{''}{$_} .= ' ext' for keys %shift; # mark aliases %{ $groups }, version => '1.0', title => 'OLPC', - category => 'legacy/latin', + category => 'legacy/latin/xorg', intro => join("\n", "International US English developed for the OLPC project,", 'providing mostly European', diff --git a/keyboard/altgr/symbolics.eng.inc.pl b/keyboard/altgr/symbolics.eng.inc.pl index fd7caf2..dc6ebcd 100644 --- a/keyboard/altgr/symbolics.eng.inc.pl +++ b/keyboard/altgr/symbolics.eng.inc.pl @@ -110,7 +110,7 @@ my %rows = ( %{ kbchars(\%rows) }, version => '1.0', title => 'US Symbolics', - category => 'specialised/greek', + category => 'specialised/greek/xorg', intro => join("\n", "A US English extension providing scientific", 'Unicode characters while pressing AltGr,', diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl index 04181c4..6a8e914 100644 --- a/keyboard/altgr/ukext.eng.inc.pl +++ b/keyboard/altgr/ukext.eng.inc.pl @@ -104,7 +104,7 @@ $rows{']'} = $rows{'#'}; +{ %{ kbchars(\%rows) }, title => 'UK-extended', - category => 'latin', + category => 'latin/thirdparty', version => '1.0', intro => join("\n", "A Chrome OS extension", diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl index 252884d..66221ff 100644 --- a/keyboard/altgr/windows.eng.inc.pl +++ b/keyboard/altgr/windows.eng.inc.pl @@ -68,7 +68,7 @@ $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE +{ %{$groups}, title => 'Windows AltGr', - category => 'latin/windows', + category => 'latin/windows/xorg', version => '1.4', intro => join("\n", 'Resulting selection of Unicode characters', -- 2.30.0
'; + print '
'; print "$_" for @sample; say '
"; + print join '
', map { $caticon{$_} // () } split m{/}, $keys->{category}; + say ''; $keys->print_key('', $_, $keys->{def}{''}{$_} // 'ni') for @sample; say '