From d1bf245dac9f5a1401ac536b5a19fff9aa39b72f Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 18 Dec 2023 17:37:46 +0100 Subject: [PATCH] keyboard: move includes to subdirectory --- keyboard.plp | 7 ++++--- keyboard-altgr.css => keyboard/altgr.css | 0 keyboard.eng.inc.pl => keyboard/altgr/groups.inc.pl | 0 altgr-macos.eng.inc.pl => keyboard/altgr/macos.eng.inc.pl | 4 ++-- altgr-ukext.eng.inc.pl => keyboard/altgr/ukext.eng.inc.pl | 2 +- altgr.eng.inc.pl => keyboard/altgr/windows.eng.inc.pl | 4 ++-- less.eng.inc.pl => keyboard/less.eng.inc.pl | 0 mplayer.eng.inc.pl => keyboard/mplayer.eng.inc.pl | 0 mpv.eng.inc.pl => keyboard/mpv.eng.inc.pl | 2 +- mutt.eng.inc.pl => keyboard/mutt.eng.inc.pl | 0 nethack.eng.inc.pl => keyboard/nethack.eng.inc.pl | 0 readline.eng.inc.pl => keyboard/readline.eng.inc.pl | 0 screen.eng.inc.pl => keyboard/screen.eng.inc.pl | 0 vi.eng.inc.pl => keyboard/vi.eng.inc.pl | 0 vimperator.eng.inc.pl => keyboard/vimperator.eng.inc.pl | 0 15 files changed, 10 insertions(+), 9 deletions(-) rename keyboard-altgr.css => keyboard/altgr.css (100%) rename keyboard.eng.inc.pl => keyboard/altgr/groups.inc.pl (100%) rename altgr-macos.eng.inc.pl => keyboard/altgr/macos.eng.inc.pl (94%) rename altgr-ukext.eng.inc.pl => keyboard/altgr/ukext.eng.inc.pl (98%) rename altgr.eng.inc.pl => keyboard/altgr/windows.eng.inc.pl (85%) rename less.eng.inc.pl => keyboard/less.eng.inc.pl (100%) rename mplayer.eng.inc.pl => keyboard/mplayer.eng.inc.pl (100%) rename mpv.eng.inc.pl => keyboard/mpv.eng.inc.pl (96%) rename mutt.eng.inc.pl => keyboard/mutt.eng.inc.pl (100%) rename nethack.eng.inc.pl => keyboard/nethack.eng.inc.pl (100%) rename readline.eng.inc.pl => keyboard/readline.eng.inc.pl (100%) rename screen.eng.inc.pl => keyboard/screen.eng.inc.pl (100%) rename vi.eng.inc.pl => keyboard/vi.eng.inc.pl (100%) rename vimperator.eng.inc.pl => keyboard/vimperator.eng.inc.pl (100%) diff --git a/keyboard.plp b/keyboard.plp index 7689af5..59e8ad5 100644 --- 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' ? '' : (), '', ); -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, ""; 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 4321d1b..38e78e2 100644 --- 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 characters', "when pressing ⌥ Option (Alt) with Apple's US (or US International) layout", 'on macOS.', - q{Not to be confused with Windows' AltGr keys.}, + q{Not to be confused with Windows' 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 ec04b8a..29702ec 100644 --- 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 69430f6..eb57814 100644 --- 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 characters returned with the AltGr modifier', 'for the Windows US international layout.', - 'Similar to Apple options.', + 'Similar to Apple 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 67847ff..11d4aff 100644 --- 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 -- 2.30.0