keyboard/altgr: cache code include (package)

diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl
index 45acbd52a9ac19fff04da3d3d6ebd8469becf7b6..215fc8ed81fe605af4a92f273953b7a55efc4cb6 100644 (file)
--- a/keyboard/altgr/apl.eng.inc.pl
+++ b/keyboard/altgr/apl.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my %dyalogx = (
        'Q' => '⍰',

diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl
index 33550f997097b33ffc2b7194172c5c8e2b1618f5..d62971f87da09ab06e3fa6654e13a4358b1a4118 100644 (file)
--- a/keyboard/altgr/eurkey.eng.inc.pl
+++ b/keyboard/altgr/eurkey.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbmodes');
 
 my $V = v1.3;
 

diff --git a/keyboard/altgr/groups.inc.pl b/keyboard/altgr/groups.inc.pl
index 66d12261ae1017ceca8c118b0c78638070d40767..6afd7dce4cf1b7619d9aff5b9ab0e784692fc812 100644 (file)
--- a/keyboard/altgr/groups.inc.pl
+++ b/keyboard/altgr/groups.inc.pl
@@ -1,10 +1,16 @@
+package Shiar_Sheet::KeyboardChars;
+
 use 5.020;
 use warnings;
 use experimental 'signatures';
+use parent 'Exporter';
 use Unicode::Normalize qw( NFKD );
 use Text::Unidecode qw( unidecode );
 use Shiar_Sheet::FormatChar;
 
+our $VERSION = '1.00';
+our @EXPORT = qw( kbchars kbmodes );
+
 my $uc = Shiar_Sheet::FormatChar->new;
 
 sub kbchars ($rows) {

diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index a2cdb1832bdb238d11455175192672e55651611c..069a9b32d124d14931f7d9a7f8ce2ef1600d24c5 100644 (file)
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbmodes');
 
 my %rows = (
        '' => {

diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index aa153adafb8f230308da76a2bcb36e3648106030..4c80397d0bab490780d89d5fb46c773a79046ff3 100644 (file)
--- a/keyboard/altgr/macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my %rows = (
        'A' => 'Å',

diff --git a/keyboard/altgr/msx.eng.inc.pl b/keyboard/altgr/msx.eng.inc.pl
index 08d961bf81a444ec6b618af7deaec228221b7b4b..b84e37a42eefbaa7c1b25d07aa54984de7c63e8d 100644 (file)
--- a/keyboard/altgr/msx.eng.inc.pl
+++ b/keyboard/altgr/msx.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my %rows = (
        '!' => '¡',

diff --git a/keyboard/altgr/spacecadet.eng.inc.pl b/keyboard/altgr/spacecadet.eng.inc.pl
index d2e1eae5de59019bd174113105c967ce698dc56a..dacb57f20eb14effe348288d51e7d703d54dd8fe 100644 (file)
--- a/keyboard/altgr/spacecadet.eng.inc.pl
+++ b/keyboard/altgr/spacecadet.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my %rows = (
        'q' => '∧',

diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
index bfc995e9cc6ae09f212549fe5fb53d0a97c64b82..87d629a012652ec5a8372dac5601200096a306cb 100644 (file)
--- a/keyboard/altgr/ukext.eng.inc.pl
+++ b/keyboard/altgr/ukext.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my %rows = (
        '~' => '¦',

diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index d575e81a732fdc3fd2a9a53e5c30a2eb9892fe93..329cb7f156e45f8e264ffc6e6b3e8a5859231bcb 100644 (file)
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+require './keyboard/altgr/groups.inc.pl';
+Shiar_Sheet::KeyboardChars->import('kbchars');
 
 my @az = ('A'..'Z', 'a'..'z');
 my @letters = qw(