From fca88ab2c458a7ae367bfede7d2ddce2e0458f97 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 31 Oct 2023 19:35:28 +0100
Subject: [PATCH] vi: append flags of key aliases

Support class overrides of missing references, and additional versioning
as "v6", likewise fixing "new" of mpv overrides.
---
 Shiar_Sheet/Keyboard.pm | 10 +++++-----
 mplayer.plp             |  2 +-
 vi.eng.inc.pl           |  4 ++--
 vi.plp                  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 0108cf1..6908ce9 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -6,7 +6,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = '2.07';
+our $VERSION = '2.08';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -110,10 +110,10 @@ sub print_key {
 	if (not defined $flags) {
 		$flags = $key eq '^0' ? 'ni' : 'no';
 	}
-	elsif ($flags =~ s/^=//) { # alias
-		$desc = $self->{sign}->{alias};
-		$desc .= $flags eq "\e" ? 'esc' : $flags;
-		$flags = $self->keyunalias($flags) . ' alias';
+	elsif ($flags =~ s/^=(\S+)\s?//) { # alias
+		my $ref = $1;
+		$desc = $self->{sign}->{alias} . ($ref eq "\e" ? 'esc' : $ref);
+		$flags = join ' ', $self->keyunalias($ref), 'alias', $flags;
 	}
 	if (my $txt = $self->{key}->{$mode.$key}) {
 		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
diff --git a/mplayer.plp b/mplayer.plp
index f7b4445..9e97d71 100644
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -22,7 +22,7 @@ Html({
 say "<h1>$mode cheat sheet</h1>";
 say '';
 
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.08;
 my $info = Data($include);
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 20f70f3..6188702 100644
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -840,7 +840,7 @@ def => {
 		'(' => "g2",
 		'*' => "=[/",
 		'/' => "g2",
-		"'" => "=[` ^", # v6
+		"'" => "=0[`^ g2 v6",
 		'{' => "g2",
 		'[' => "g2",
 		'^['=> "=\e",
@@ -893,7 +893,7 @@ def => {
 		'#' => "g2",
 		')' => "g2",
 		'*' => "=]/",
-		"'" => "=]` ^", # v6
+		"'" => '=$]`^ g2 v6',
 		'/' => "g2",
 		'[' => "g2",
 		'^['=> "=\e",
diff --git a/vi.plp b/vi.plp
index c5e2025..bd30d8c 100644
--- a/vi.plp
+++ b/vi.plp
@@ -20,7 +20,7 @@ Html({
 <h2>normal mode (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2.07;
+use Shiar_Sheet::Keyboard 2.08;
 my $info = Data('vi.eng');
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
-- 
2.30.0