keyboard: dereference class definition includes

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 30b73bf8da9b93a1a5c91b3b6d06c686ae6a8be5..90ec4e827daee68cc9279315a470de17719b0d73 100644 (file)
--- 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;
 
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 

-our $VERSION = 'v2.04';
+our $VERSION = 'v2.05';

 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);


@@ -81,7 +81,7 @@ sub keyunalias {
        my $keyinfo = $self->{def}->{$mode}->{$key};
 
        return unless defined $keyinfo;
        my $keyinfo = $self->{def}->{$mode}->{$key};
 
        return unless defined $keyinfo;

-       return $keyinfo->[0] if ref $keyinfo;
+       $keyinfo =~ s/^=// or return $keyinfo;

        return '' if $ancestry->{$key}++;  # endless loop failsafe
        return $self->keyunalias($keyinfo, $ancestry);
 }
        return '' if $ancestry->{$key}++;  # endless loop failsafe
        return $self->keyunalias($keyinfo, $ancestry);
 }


@@ -89,16 +89,16 @@ sub keyunalias {
 sub print_key {
        my $self = shift;
        my ($mode, $key, $flags) = @_;
 sub print_key {
        my $self = shift;
        my ($mode, $key, $flags) = @_;

+       my ($desc, $mnem);

 
        if (not defined $flags) {
 
        if (not defined $flags) {

-               $flags = [$key eq '^0' ? 'ni' : 'no'];
+               $flags = $key eq '^0' ? 'ni' : 'no';

        }
        }

-       elsif (not ref $flags) { # alias
-               my $desc = $self->{sign}->{alias};
+       elsif ($flags =~ s/^=//) { # alias
+               $desc = $self->{sign}->{alias};

                $desc .= $flags eq "\e" ? 'esc' : $flags;
                $desc .= $flags eq "\e" ? 'esc' : $flags;

-               $flags = [$self->keyunalias($flags) . ' alias', $desc];
+               $flags = $self->keyunalias($flags) . ' alias';

        }
        }

-       my ($flags, $desc, $mnem) = @{$flags};

        if (my $txt = $self->{key}->{$mode.$key}) {
                ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
        }
        if (my $txt = $self->{key}->{$mode.$key}) {
                ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
        }


@@ -203,8 +203,8 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
        my $keys = Shiar_Sheet::Keyboard({
                def => {
                        'lead' => {
        my $keys = Shiar_Sheet::Keyboard({
                def => {
                        'lead' => {

-                               'A' => 'a', # alias
-                               'a' => ['classes'],
+                               'A' => '=a', # alias
+                               'a' => 'classes',

                        },
                },
                key => {
                        },
                },
                key => {