From 18606a64db0a6c02e5e289074b62728c93b5231b Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 31 Dec 2023 04:51:22 +0100
Subject: [PATCH] keyboard/altgr: cache code include (package)

---
 keyboard/altgr/apl.eng.inc.pl        | 3 ++-
 keyboard/altgr/eurkey.eng.inc.pl     | 3 ++-
 keyboard/altgr/groups.inc.pl         | 6 ++++++
 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, 22 insertions(+), 8 deletions(-)

diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl
index 45acbd5..215fc8e 100644
--- 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 33550f9..d62971f 100644
--- 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 66d1226..6afd7dc 100644
--- 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 a2cdb18..069a9b3 100644
--- 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 aa153ad..4c80397 100644
--- 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 08d961b..b84e37a 100644
--- 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 d2e1eae..dacb57f 100644
--- 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 bfc995e..87d629a 100644
--- 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 d575e81..329cb7f 100644
--- 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(
-- 
2.30.0