X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f22a9debc2c3c50828c31ff028057734a4aadea6..9e57a0c381c63dcd3ec4803da1616a5f34bf694c:/readline.plp

diff --git a/readline.plp b/readline.plp
index cc70d05..1a0e638 100644
--- a/readline.plp
+++ b/readline.plp
@@ -2,15 +2,14 @@
 
 Html({
 	title => 'readline cheat sheet',
-	version => 'v1.0',
+	version => '1.1',
 	description => [
 		"Reference sheet of default key bindings for GNU readline,",
-		"used in line-editing in most Unix software, notably emacs and bash.",
+		"used for line-editing in most Unix software, notably Emacs and Bash.",
 	],
 	keywords => [qw'
 		readline gnu bash emacs sheet cheat reference overview keyboard editing curses
 	'],
-	charset => $sign{charset},
 	stylesheet => [qw'light dark circus mono red terse'],
 	keys => 1,
 });
@@ -20,60 +19,28 @@ Html({
 
 <h2>default emacs mode</h2>
 
-<ul id="rows">
-
-<li class="row">
-	<ul class="keys omni">
-	<li class="me" onclick="setmode()"><b>Esc</b> +
-	</ul>
-</li>
-
 <:
-use Shiar_Sheet::Keyboard;
-my $keys = Shiar_Sheet::Keyboard->new({do 'readline.inc.pl'});
+use Shiar_Sheet::Keyboard 2;
+my $info = do 'readline.eng.inc.pl' or die $@;
+$info->{def} = do 'readline.inc.pl';
+my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '^x=213', [4,3,2]);
 :>
-</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>Move the cursor.
-		<dt class="co">history
-			<dd>Replace contents involving kill ring, undo, or command history.
-		<dt class="mi">change
-			<dd>Alter current text (filtering or completion).
-		<dt class="mo">delete
-			<dd>Remove text.
-		<dt class="mv">misc
-			<dd>Miscellaneous commands.
-		<dt class="me">mode
-			<dd>Additional key functionality (click to view).
-		</dl>
+<: $keys->print_legend('legend-types', ['g1', 'g2', '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 class="new">&gt;v2.0
-			<dd>Unavailable before readline version 2.1 (1997).
-		<dt class="ext">bash
-			<dd>Default assignment in Bash shells, but not common readline.
-		</dl>
+<: $keys->print_legend('legend-options', [qw( arg new ext )]) :>
 
 		<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' :>