X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f22a9debc2c3c50828c31ff028057734a4aadea6..29ddea2e5d8272fb8c8242359c878bd533ef72c0:/vi.plp

diff --git a/vi.plp b/vi.plp
index 67326cb..deb30ec 100644
--- a/vi.plp
+++ b/vi.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'vi cheat sheet',
-	version => 'v1.2',
+	version => '1.3',
 	description => [
 		"Interactive cheat sheet for vi text editors, notably Vim,",
 		"describing each key in various modes.",
@@ -10,7 +10,6 @@ Html({
 	keywords => [qw'
 		vi vim nvi sheet cheat reference overview commands keyboard
 	'],
-	charset => $sign{charset},
 	stylesheet => [qw'light dark circus mono red terse'],
 	keys => 1,
 });
@@ -20,65 +19,32 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
-<li class="row">
-	<ul class="keys omni">
-	<li class="mo chr27" onclick="setmode()"><b>Esc</b> normal mode
-		<!-- not as static anymore, but never bothered; just see ^[ -->
-	</ul>
-</li>
-
 <:
-use Shiar_Sheet::Keyboard;
-my $keys = Shiar_Sheet::Keyboard->new({do 'vi.inc.pl'});
+use Shiar_Sheet::Keyboard 2;
+my $info = do 'vi.eng.inc.pl' or die $@;
+$info->{def} = do 'vi.inc.pl';
+my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>
-</ul>
 
 <hr>
 
 <div class="help">
 	<div class="left">
-		<dl class="legend legend-types">
-		<dt class="ci">info
-			<dd>Info command: shows/does something without altering anything.
-		<dt class="pm">motion
-			<dd>Moves the cursor, or defines the range for an operator (<:= $sign{motion} :>).
-		<dt class="po">positioning
-			<dd>Other movement (jumps, window (re)positioning).
-		<dt class="co">command
-			<dd>Direct action command.
-		<dt class="mi">ins mode
-			<dd>Enters Insert or Replace mode.
-		<dt class="mo">mode
-			<dd>Enters a different mode.
-		<dt class="mv">vis mode
-			<dd>Enters Visual or Select mode.
-		<dt class="me">key cmd
-			<dd>Additional key commands (click for overview).
-		</dl>
+<:
+		$keys->print_legend('legend-types', ['g1' .. 'g4', 'g6' .. 'g9']);
+:>
 	</div>
 
 	<div class="right">
-		<dl class="legend legend-options">
-		<dt>key<:= $sign{arg} :>
-			<dd>Commands with a dot need a char argument afterwards.
-		<dt>key<:= $sign{motion} :>
-			<dd>Requires a motion afterwards, operates between cursor and destination.
-		<dt class="ext vim6">vim
-			<dd>Not in original Vi (assessment incomplete).
-		<dt class="ext new vim7">vim7
-			<dd>New in vim version 7.x.
-		</dl>
+<:
+		$keys->print_legend('legend-options', [qw'arg motion', 'ext vim6', 'ext new vim7']);
+:>
 
 		<ul class="legend legend-set">
 		<li>keyboard <strong>map</strong> is
 			<:= $get{map} ? 'set to ' : '' :><em><:= $keys->{map} :></em>
-		<li><strong>ascii</strong> mode is
-			<:= defined $sign{-ascii} && 'forced ' :><em><:=
-				$sign{-ascii} ? 'on' : 'off' :></em>
 		<li><strong>keys</strong> are
 			<em><:= $showkeys ? 'always shown' : 'hidden if unassigned' :></em><:=
 				!defined $showkeys && ' by default' :>