From c0ca5fd2ce5aaae5170e553b50a8e54e58368845 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 15 Dec 2023 23:48:14 +0100
Subject: [PATCH] keyboard/altgr: omit empty digits row on windows altgr

---
 Shiar_Sheet/Keyboard.pm | 4 ++--
 altgr.eng.inc.pl        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 3b72576..d4f78c8 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -167,8 +167,8 @@ print_row:
 
 		for my $submode (@moderows ? @moderows : '') {
 			my $mode = $basemode . $submode;
-			my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$//
-				? (map {$_ - 1} split //, $row == 0 && $2 || $1)  # user override
+			my @caserows = $mode =~ s/(\d+)(?:-(\d*))?$//
+				? (map {$_ - 1} split //, $row == 0 ? $2 // $1 : $1)  # user override
 				: @$defrows;  # default
 			my $modekeys = $self->{def}{$mode};
 
diff --git a/altgr.eng.inc.pl b/altgr.eng.inc.pl
index 9abad16..69430f6 100644
--- a/altgr.eng.inc.pl
+++ b/altgr.eng.inc.pl
@@ -23,4 +23,5 @@ our %rows = map {
 		"Windows US international keyboard layout table",
 		"with the AltGr modifier key.",
 	],
+	moderows => '12-',
 }
-- 
2.30.0