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.

diff --git a/keyboard/altgr/drix.eng.inc.pl b/keyboard/altgr/drix.eng.inc.pl
index cdb4f0539769fd06e6448b16d358af185b09b861..c36f53bf1c9e6e42315cf5ce1f7937f3b081ea21 100644 (file)
--- 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",
                '<a href="/unicode">Unicode</a> characters while pressing AltGr,',

diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl
index 72208514a6cab5819b1719aaf196921ce7690801..5b9702cf427f42b003f7de40c84916dbb0cb27f7 100644 (file)
--- 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 <a href="https://eurkey.steffen.bruentjen.eu/">EurKEY</a>',
                '<abbr title="last updated 2017-05-15">v1.3</abbr> by Steffen Brüntjen',

diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 0bb7774112193b414cab1a65531cf966ccc66a9b..7966426ed2ee2ec0c9b5f15dee1b3a7d4f1a65bb 100644 (file)
--- 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 /(?<!\+)/, $get{sample} // 'asSci1!+1';
 require Shiar_Sheet::Keyboard;
 use List::Util qw( uniq max );
 
+my %caticon = (
+       legacy  => "\N{TOP HAT}",
+       windows => "\x{1FA9F}", # \N{WINDOW}
+       macos   => "\N{RED APPLE}",
+       xorg    => "\N{PENGUIN}",
+);
+
 printf '<section class="%s">', @sample ? 'section' : 'gallery';
 if (@sample) {
        print '<table class="big keys cmp">';
-       print '<thead><tr><th>';
+       print '<thead><tr><th colspan=2>';
        print "<th>$_" for @sample;
        say '</tr></thead>';
 }
@@ -140,6 +148,9 @@ for my $inc (sort {
                        }
                        say '</span>';
                }
+               print "\t<th>";
+               print join '<br>', map { $caticon{$_} // () } split m{/}, $keys->{category};
+               say '';
                $keys->print_key('', $_, $keys->{def}{''}{$_} // 'ni') for @sample;
                say '</tr>';
        }

diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index 35d4447641017ac18555b64de94c6885e146e214..88afe8233d98e8675ef42e7008bb3113bec096ae 100644 (file)
--- 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 <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> 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 7bf52965ac608559143ead8b774cc1bee376e457..ec8e55635513af303b50cad2f4c4ba6788297920 100644 (file)
--- 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 <a href="/unicode">selection</a> of equivalent <a href="/charset">Unicode</a> characters',
+               'Resulting <a href="/unicode">selection</a>",
+               "of equivalent <a href="/charset">Unicode</a> characters',
                "when the <em>code</em> 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 2cd99e2399fa2f528fb69802a14afd63a8b5a15f..3d72e36306565aa8355b3fd7b52c6a3637a1891e 100644 (file)
--- 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 fd7caf2b7d1ff183c5817c4f370daac101e5ef3a..dc6ebcda495c18aa34ca70794d9bc660ed096802 100644 (file)
--- 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",
                '<a href="/unicode">Unicode</a> characters while pressing AltGr,',

diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
index 04181c45bfd838e227019a059347e939a135d634..6a8e9148949bfc100fa9ca61a69aa6d30ac91209 100644 (file)
--- 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 252884dc9c978700ae516b1dbb0b4544a10ed324..66221ffb537c5573f5e9dcdcd24ed6f997628123 100644 (file)
--- 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 <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',