X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/24f355ee04994c12c6bee2b276aab8c1ff4c0748..09bc7e2233fec9509879df474235cc0492982eb3:/vim.plp

diff --git a/vim.plp b/vim.plp
index df3cca5..4be5d71 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}) {
@@ -42,6 +42,7 @@ $header{content_type} = $ctype;
 	print "\n<style> .no, .alias {opacity:.5} </style>"
 		if $showkeys and $get{keys} eq 'ghost';
 :>
+<link rel="vcs" type="git" href="git://dev.shiar.nl/sheet">
 
 <script><!--
 function setmode(classname) {
@@ -100,103 +101,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 .= "<small>$sign{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
-	   $keytxt =~ s{\^(?=.)}{<small>^</small>};  # 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<li class="$flags"$onclick><b$keyhint>$keytxt</b>};
-	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{<li class="row row$row"><ul>\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<li%s>", $mode ne '' && sprintf(
-				' class="%s"', ($get{static} ? '' : 'mode ') . 'mode' . escapeclass($mode)
-			);
-			printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; 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<ul class="$caseclass">\n};
-			print_key($modekeys->{lead}, $_, $modekeys->{$_}) for @$keycase;
-			print qq{\t\t</ul>\n};
-		} # case
-
-	} # mode
-	print qq{\t</ul>\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});
 :>
 </ul>
 
@@ -238,7 +146,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
 
 		<ul class="legend legend-set">
 		<li>keyboard <strong>map</strong> is
-			<:= $get{map} ? 'set to ' : '' :><em><:= $map :></em>
+			<:= $get{map} ? 'set to ' : '' :><em><:= $keys->{map} :></em>
 		<li><strong>ascii</strong> mode is
 			<:= exists $get{ascii} && 'forced ' :><em><:=
 				$ascii ? 'on' : 'off' :></em>
@@ -253,13 +161,13 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
 
 <p class="footer">
 	<a href="http://sheet.shiar.nl/vim">sheet.shiar.nl<strong>/vim</strong></a>
-	<a href="git://dev.shiar.net/vi-cheat"><:= "v$VERSION" :></a>
+	<a href="git://dev.shiar.nl/sheet"><:= "v$VERSION" :></a>
 	created by Shiar <:= $sign{sep} :>
 	<a title="Licensed under the GNU Affero General Public License, version 3"
 	   href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPLv3</a> <:= $sign{sep} :>
 	last update <:
 		use Time::Format qw(time_format);
-		print time_format('yyyy-mm-dd', (stat 'vim-cmds.inc.pl')[9]);
+		print time_format('yyyy-mm-dd', (stat 'vim.inc.pl')[9]);
 	:>
 </p>