From 0dbd385c08032c90c09bf97afe843d4fce619c6f Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 1 Jan 2024 09:27:36 +0100 Subject: [PATCH] keyboard/altgr: move code include to project packages --- keyboard/altgr/groups.inc.pl => Shiar_Sheet/KeyboardChars.pm | 0 keyboard/altgr/apl.eng.inc.pl | 3 +-- keyboard/altgr/eurkey.eng.inc.pl | 3 +-- keyboard/altgr/macos-abc.eng.inc.pl | 3 +-- keyboard/altgr/macos.eng.inc.pl | 3 +-- keyboard/altgr/msx.eng.inc.pl | 3 +-- keyboard/altgr/spacecadet.eng.inc.pl | 3 +-- keyboard/altgr/ukext.eng.inc.pl | 3 +-- keyboard/altgr/windows.eng.inc.pl | 3 +-- 9 files changed, 8 insertions(+), 16 deletions(-) rename keyboard/altgr/groups.inc.pl => Shiar_Sheet/KeyboardChars.pm (100%) diff --git a/keyboard/altgr/groups.inc.pl b/Shiar_Sheet/KeyboardChars.pm similarity index 100% rename from keyboard/altgr/groups.inc.pl rename to Shiar_Sheet/KeyboardChars.pm diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl index 215fc8e..b8636b7 100644 --- a/keyboard/altgr/apl.eng.inc.pl +++ b/keyboard/altgr/apl.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my %dyalogx = ( 'Q' => '⍰', diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl index d62971f..4fd357d 100644 --- a/keyboard/altgr/eurkey.eng.inc.pl +++ b/keyboard/altgr/eurkey.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbmodes'); +use Shiar_Sheet::KeyboardChars 'kbmodes'; my $V = v1.3; diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl index 069a9b3..a5d63b4 100644 --- a/keyboard/altgr/macos-abc.eng.inc.pl +++ b/keyboard/altgr/macos-abc.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbmodes'); +use Shiar_Sheet::KeyboardChars 'kbmodes'; my %rows = ( '' => { diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl index 4c80397..884eeb9 100644 --- a/keyboard/altgr/macos.eng.inc.pl +++ b/keyboard/altgr/macos.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my %rows = ( 'A' => 'Å', diff --git a/keyboard/altgr/msx.eng.inc.pl b/keyboard/altgr/msx.eng.inc.pl index b84e37a..af79ad3 100644 --- a/keyboard/altgr/msx.eng.inc.pl +++ b/keyboard/altgr/msx.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my %rows = ( '!' => '¡', diff --git a/keyboard/altgr/spacecadet.eng.inc.pl b/keyboard/altgr/spacecadet.eng.inc.pl index dacb57f..0fd8952 100644 --- a/keyboard/altgr/spacecadet.eng.inc.pl +++ b/keyboard/altgr/spacecadet.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my %rows = ( 'q' => '∧', diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl index 87d629a..9fa019f 100644 --- a/keyboard/altgr/ukext.eng.inc.pl +++ b/keyboard/altgr/ukext.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my %rows = ( '~' => '¦', diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl index 329cb7f..06c2993 100644 --- a/keyboard/altgr/windows.eng.inc.pl +++ b/keyboard/altgr/windows.eng.inc.pl @@ -1,8 +1,7 @@ use utf8; use strict; use warnings; -require './keyboard/altgr/groups.inc.pl'; -Shiar_Sheet::KeyboardChars->import('kbchars'); +use Shiar_Sheet::KeyboardChars 'kbchars'; my @az = ('A'..'Z', 'a'..'z'); my @letters = qw( -- 2.30.0