X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/24f355ee04994c12c6bee2b276aab8c1ff4c0748..d4937c088ffb429c8b3fdf1b3d35b8cbc78d1290:/vim.plp
diff --git a/vim.plp b/vim.plp
index df3cca5..183a04a 100644
--- a/vim.plp
+++ b/vim.plp
@@ -5,7 +5,7 @@ use warnings;
no warnings 'qw'; # you know what you doing
no warnings 'uninitialized'; # save some useless checks for more legible code
-our $VERSION = '1.1';
+our $VERSION = '1.2';
our $ascii = 0;
if (exists $get{ascii}) {
@@ -31,7 +31,7 @@ $header{content_type} = $ctype;
<:
- my %styles = map {$_ => $_} qw(dark circus mono terse);
+ my %styles = map {$_ => $_} qw(dark circus mono red terse);
our $style = exists $get{style} && $styles{$get{style}} || 'light';
printf(qq{\n},
$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "$_.css", $_
@@ -42,35 +42,10 @@ $header{content_type} = $ctype;
print "\n"
if $showkeys and $get{keys} eq 'ghost';
:>
+
+
-
-
-
+
vi/vim cheat sheet
@@ -100,103 +75,10 @@ our %sign = (
# default to use unofficial html for best support
);
-my %keys = do 'vim-cmds.inc.pl';
-
-my @casedesc = qw(ctrl shift);
-my @rowdesc = qw(numeric top home bottom);
-my %keyrows = do 'vim-keys.inc.pl';
-
-sub keyunalias {
- my ($key, %tree) = @_;
- $key =~ s/(\S*?)(\^?\S)($|\s.*)/$2/;
- my $mode = $1;
- return [] unless defined $keys{$mode}{$key};
- return $keys{$mode}{$key} if ref $keys{$mode}{$key};
- return if $tree{$key}++; # endless loop failsafe
- return keyunalias($keys{$mode}{$key}, %tree);
-}
-
-sub escapeclass {
- local $_ = shift;
- s/\^/_c/g;
- s/\[/_sbo/g;
- s/\]/_sbc/g;
- s/^$/_/;
- return $_;
-}
-
-my %keytrans = qw(
- ^@ NUL ^a SOH ^b STX ^c ETX ^d EOT ^e ENQ ^f ACK ^g BEL
- ^h BS ^i tab ^j LF ^k VT ^l FF ^m CR ^n SO ^o SI
- ^p DLE ^q DC1 ^r DC2 ^s DC3 ^t DC4 ^u NAK ^v SYN ^w ETB
- ^x CAN ^y EM ^z SUB ^[ ESC ^\ FS ^] GS ^^ RS ^_ US
- ^? DEL
-);
-
-sub print_key {
- my ($mode, $key, $keyinfo) = @_;
-
- $keyinfo = [ $sign{alias}.$keyinfo, keyunalias($keyinfo)->[1] . ' alias' ]
- if defined $keyinfo and not ref $keyinfo; # alias
- my ($desc, $flags, $mnem) = @$keyinfo if defined $keyinfo;
- defined $desc or $flags = $key eq '^0' ? 'ni' : 'no';
-
-# $key = $keytrans{$key} if defined $keytrans{$key};
- my $keytxt = $mode . Entity($key) if $key ne '^0';
- $keytxt .= $sign{arg} while $flags =~ s/ ?\barg\b//; # argument
- $keytxt .= "$sign{motion}" if $flags =~ s/ ?\bargm\b//; # motion argument
- $keytxt =~ s{\^(?=.)}{^}; # element around ctrl-identifier
- my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $keys{$1} && sprintf(
- ' onclick="setmode(%s)"',
- $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
- );
- $onclick .= sprintf(q{ onclick="document.location='%s'"}, $1)
- if $flags =~ s/ ?\blink(\S*)//;
- my $keyhint = defined($mnem) && qq{ title="$mnem"};
-
- print qq{\t\t$keytxt};
- print ' ', $desc if defined $desc;
- print "\n";
-}
-
-our $map = defined $keyrows{$get{map}} ? $get{map} : 'qwerty';
-my $keyrows = $keyrows{$map};
-my @moderows = $get{static} ? split(/\s+/, $get{static}) : sort keys %keys;
-
-for (my $row = 0; $row <= $#$keyrows; $row++) {
- my $keyrow = $keyrows->[$row];
- my @caserows = 0 .. $#$keyrow;
-
- print qq{\n};
- for my $modefull (@moderows) {
- my $mode = $modefull;
- my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$//
- ? (map {3 - $_} split //, $row == 0 && $2 || $1) : @caserows;
- my $modekeys = $keys{$mode};
-
- for my $case (@showcase) {
- my $keycase = $keyrow->[$case] or next;
- @$keycase or next;
-
- printf "\t", $mode ne '' && sprintf(
- ' class="%s"', ($get{static} ? '' : 'mode ') . 'mode' . escapeclass($mode)
- );
- printf("%s: %s
\n", # XXX insert here to fix msie<=6
- $modekeys->{desc} || "mode $mode",
- "$rowdesc[$row] row $casedesc[$case]"
- );
- my $caseclass = 'keys';
- $caseclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown
- $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
- print qq{\t\t\n};
- print_key($modekeys->{lead}, $_, $modekeys->{$_}) for @$keycase;
- print qq{\t\t
\n};
- } # case
-
- } # mode
- print qq{\t
\n};
-} # row
-
+use Shiar_Sheet::Keyboard;
+my $keys = Shiar_Sheet::Keyboard->new({do 'vim.inc.pl'});
+$keys->map($get{map}) or undef $get{map};
+$keys->print_rows($get{static});
:>
@@ -238,7 +120,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
- keyboard map is
- <:= $get{map} ? 'set to ' : '' :><:= $map :>
+ <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :>
- ascii mode is
<:= exists $get{ascii} && 'forced ' :><:=
$ascii ? 'on' : 'off' :>
@@ -253,13 +135,13 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {