keyboard: move includes to subdirectory

diff --git a/keyboard.plp b/keyboard.plp
index 7689af5851591a3e3fbaaf96ac2d7d4f47e51e7a..59e8ad5d1e4909212a90b49b8495b86d1de95e0c 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -1,7 +1,8 @@
 <(common.inc.plp)><:
 
-my $mode = lc($Request || 'altgr');
-my $include = "$mode.eng";
+$Request ||= 'altgr/windows';
+my $mode = lc $Request;
+my $include = "keyboard/$mode.eng";
 
 my $info = eval { Data($include) } || {};
 warn "error in $include: ", @{$@} if ref $@;
@@ -16,7 +17,7 @@ my @keystyle = (
        $showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
        '<script type="text/javascript" src="/keys.js?1.6" async></script>',
 );
-if ($include =~ /^altgr/ and open my $cssinc, '<', 'keyboard-altgr.css') {
+if ($Request =~ /^altgr/ and open my $cssinc, '<', 'keyboard/altgr.css') {
        local $/;
        my $data = readline $cssinc;
        push @keystyle, "<style>\n$data</style>";

diff --git a/keyboard-altgr.css b/keyboard/altgr.css
similarity index 100%
rename from keyboard-altgr.css
rename to keyboard/altgr.css

diff --git a/keyboard.eng.inc.pl b/keyboard/altgr/groups.inc.pl
similarity index 100%
rename from keyboard.eng.inc.pl
rename to keyboard/altgr/groups.inc.pl

diff --git a/altgr-macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
similarity index 94%
rename from altgr-macos.eng.inc.pl
rename to keyboard/altgr/macos.eng.inc.pl
index 4321d1b298b3c8a8702ff6713c466bb32c726d9b..38e78e237324018084966446ab519773b193ebe0 100644 (file)
--- a/altgr-macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -99,14 +99,14 @@ our %rows = (
 );
 
 +{
-       %{ do 'keyboard.eng.inc.pl' },
+       %{ do 'keyboard/altgr/groups.inc.pl' },
        version => '1.3',
        title => 'option key',
        intro => join("\n",
                'Special <a href="/unicode">characters</a>',
                "when pressing ⌥ Option (Alt) with Apple's US (or US International) layout",
                'on <abbr title="at least in Ventura 13.2">macOS</abbr>.',
-               q{Not to be confused with <a href="/keyboard/altgr">Windows'</a> AltGr keys.},
+               q{Not to be confused with <a href="/keyboard/altgr/windows">Windows'</a> AltGr keys.},
        ),
        description => [
                "Apple US International keyboard layout table",

diff --git a/altgr-ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
similarity index 98%
rename from altgr-ukext.eng.inc.pl
rename to keyboard/altgr/ukext.eng.inc.pl
index ec04b8a4abda94282f19cee4f4d99ae644a51725..29702ec64b32f9da08c60431fab9807fe48c9ec5 100644 (file)
--- a/altgr-ukext.eng.inc.pl
+++ b/keyboard/altgr/ukext.eng.inc.pl
@@ -100,7 +100,7 @@ $rows{'['} = $rows{'2'};
 $rows{']'} = $rows{'#'};
 
 +{
-       %{ do 'keyboard.eng.inc.pl' },
+       %{ do 'keyboard/altgr/groups.inc.pl' },
        title => 'UK-extended',
        version => '1.0',
        intro => join("\n",

diff --git a/altgr.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
similarity index 85%
rename from altgr.eng.inc.pl
rename to keyboard/altgr/windows.eng.inc.pl
index 69430f65c7e6a835e828074349f13dea8cb725cd..eb578148cd618b65edacf0c68d342c9820ca1903 100644 (file)
--- a/altgr.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -11,13 +11,13 @@ our %rows = map {
 } 0 .. $#az;
 
 +{
-       %{ do 'keyboard.eng.inc.pl' },
+       %{ do 'keyboard/altgr/groups.inc.pl' },
        title => 'altgr',
        version => '1.2',
        intro => join("\n",
                'Special <a href="/unicode">characters</a> returned with the AltGr modifier',
                'for the Windows US international layout.',
-               'Similar to <a href="/keyboard/altgr-macos">Apple</a> options.',
+               'Similar to <a href="/keyboard/altgr/macos">Apple</a> options.',
        ),
        description => [
                "Windows US international keyboard layout table",

diff --git a/less.eng.inc.pl b/keyboard/less.eng.inc.pl
similarity index 100%
rename from less.eng.inc.pl
rename to keyboard/less.eng.inc.pl

diff --git a/mplayer.eng.inc.pl b/keyboard/mplayer.eng.inc.pl
similarity index 100%
rename from mplayer.eng.inc.pl
rename to keyboard/mplayer.eng.inc.pl

diff --git a/mpv.eng.inc.pl b/keyboard/mpv.eng.inc.pl
similarity index 96%
rename from mpv.eng.inc.pl
rename to keyboard/mpv.eng.inc.pl
index 67847ff64e8d262d69a914db4229e232609ab78a..11d4aff9224ba88c69e6de6557bb0fb3fce53f3a 100644 (file)
--- a/mpv.eng.inc.pl
+++ b/keyboard/mpv.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
 
-my $legacy = do 'mplayer.eng.inc.pl' or die $@;
+my $legacy = do 'keyboard/mplayer.eng.inc.pl' or die $@;
 
 {
 title => 'mpv',

diff --git a/mutt.eng.inc.pl b/keyboard/mutt.eng.inc.pl
similarity index 100%
rename from mutt.eng.inc.pl
rename to keyboard/mutt.eng.inc.pl

diff --git a/nethack.eng.inc.pl b/keyboard/nethack.eng.inc.pl
similarity index 100%
rename from nethack.eng.inc.pl
rename to keyboard/nethack.eng.inc.pl

diff --git a/readline.eng.inc.pl b/keyboard/readline.eng.inc.pl
similarity index 100%
rename from readline.eng.inc.pl
rename to keyboard/readline.eng.inc.pl

diff --git a/screen.eng.inc.pl b/keyboard/screen.eng.inc.pl
similarity index 100%
rename from screen.eng.inc.pl
rename to keyboard/screen.eng.inc.pl

diff --git a/vi.eng.inc.pl b/keyboard/vi.eng.inc.pl
similarity index 100%
rename from vi.eng.inc.pl
rename to keyboard/vi.eng.inc.pl

diff --git a/vimperator.eng.inc.pl b/keyboard/vimperator.eng.inc.pl
similarity index 100%
rename from vimperator.eng.inc.pl
rename to keyboard/vimperator.eng.inc.pl