common: drop leading 'v' in version numbers

[sheet.git] / vimperator.plp

diff --git a/vimperator.plp b/vimperator.plp
index 88f5e9518a05240efc7185705bba16a4564a02ac..46bcf6e30e5ac7bfb94677dfc31037af41a0e9d5 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -2,7 +2,7 @@
 
 Html({
        title => 'vimperator cheat sheet',
-       version => 'v1.0',
+       version => '1.2',
        description => [
                "Interactive cheat sheet for the Vimperator Firefox extension,",
                "describing the function of each key.",
@@ -11,7 +11,6 @@ Html({
                vimperator firefox vim iceweasel sheet cheat reference overview
                commands keyboard browser
        '],
-       charset => $sign{charset},
        stylesheet => [qw'light dark circus mono red terse'],
        keys => 1,
 });
@@ -21,63 +20,30 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
-<li class="row">
-       <ul class="keys omni">
-       <li class="mv 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 'vimperator.inc.pl'});
+use Shiar_Sheet::Keyboard 2;
+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>
+<: $keys->print_legend('legend-types', ['g1' .. '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{args} :>
-                       <dd>Commands with two dots require variable arguments afterwards.
-               </dl>
+<: $keys->print_legend('legend-options', [qw( arg args )]) :>
 
                <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' :>