X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6d38d53c6cacbb5dabe6dc663c500d8ef8bb62d0..d22e7febda8720bc38069f7061adb43b98143c48:/vimperator.plp

diff --git a/vimperator.plp b/vimperator.plp
index 74846f5..08ea859 100644
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -2,17 +2,16 @@
 
 Html({
 	title => 'vimperator cheat sheet',
-	version => 'v1.2',
+	version => '1.3',
 	description => [
-		"Interactive cheat sheet for the Vimperator Firefox extension,",
-		"describing the function of each key.",
+		"Interactive cheat sheet for the Vimperator (or Pentadactyl)",
+		"Firefox extension, describing the function of each key.",
 	],
 	keywords => [qw'
-		vimperator firefox vim iceweasel sheet cheat reference overview
-		commands keyboard browser
+		vimperator firefox pentadactyl vim sheet cheat reference overview
+		commands keyboard browser vimfx vimium cvim
 	'],
-	charset => $sign{charset},
-	stylesheet => [qw'light dark circus mono red terse'],
+	stylesheet => [qw( light dark circus mono red )],
 	keys => 1,
 });
 
@@ -21,66 +20,11 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
 <:
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
-$info->{def} = do 'vimperator.inc.pl';
-$_->{"\e"} = ['mv mode', "normal mode"] for values %{ $info->{def} };
-delete $info->{def}->{''}->{"\e"};
 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>Displays something without any permanent consequences.
-		<dt class="pm">motion
-			<dd>Move cursor, scroll window, focus buffer element.
-		<dt class="po">tab
-			<dd>Tab or window navigation/selection.
-		<dt class="co">buffer
-			<dd>Page interaction.
-		<dt class="cp">open
-			<dd>Browse to a location in the current tab.
-		<dt class="mi">tab open
-			<dd>Browse somewhere in a new tab.
-		<dt class="mo">browser
-			<dd>Other browser action.
-		<dt class="mv">mode
-			<dd>Enter a different mode.
-		<dt class="me">key cmd
-			<dd>Additional key commands (click for overview).
-		</dl>
-	</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{args} :>
-			<dd>Commands with two dots require variable arguments afterwards.
-		</dl>
-
-		<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><:=
-				!exists $get{keys} && ' by default' :>
-		<li>default <strong>style</strong> is
-			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
-		</ul>
-	</div>
-</div>
+$keys->print_legends(\%get);