From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 26 Mar 2012 15:44:30 +0000 (+0200)
Subject: keys: common #rows container
X-Git-Tag: v1.5~43
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/504fe3dc4ec761922a00398fe5811f08fafbde41

keys: common #rows container

Output entire keyboard in Shiar_Sheet::Keyboard::print_rows() as contained
exceptions are gone since commit v1.4-61-g6d38d53c6c (2012-03-26)
[keys: replace omni-present escape keys].
---

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 2cbaffe..246900d 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -124,6 +124,8 @@ sub print_rows {
 	my $defrows = shift || [2, 1, 0];
 	my @modes = sort keys %{ $self->{def} };
 
+	print '<ul id="rows">'."\n\n";
+
 	for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
 		my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
@@ -164,6 +166,8 @@ sub print_rows {
 		} # basemode
 		print qq{\t</ul>\n};
 	} # row
+
+	print "</ul>\n";
 }
 
 sub print_legend {
diff --git a/less.plp b/less.plp
index b363203..1b42723 100644
--- a/less.plp
+++ b/less.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal pager (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'less.eng.inc.pl' or die $@;
@@ -31,7 +29,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 :>
-</ul>
 
 <hr>
 
diff --git a/mplayer.plp b/mplayer.plp
index 689ee84..200b355 100644
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>index (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mplayer.eng.inc.pl' or die $@;
@@ -30,7 +28,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 :>
-</ul>
 
 <hr>
 
diff --git a/mutt.plp b/mutt.plp
index 3ce3d02..4095965 100644
--- a/mutt.plp
+++ b/mutt.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>index (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mutt.eng.inc.pl' or die $@;
@@ -30,7 +28,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>
-</ul>
 
 <hr>
 
diff --git a/nethack.plp b/nethack.plp
index 7e46c37..b00fb9c 100644
--- a/nethack.plp
+++ b/nethack.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>normal gameplay</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'nethack.eng.inc.pl' or die $@;
@@ -32,7 +30,6 @@ $_->{"\e"} = ['me mode'] for values %{ $info->{def} };
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);
 :>
-</ul>
 
 <hr>
 
diff --git a/readline.plp b/readline.plp
index 6d8c499..c0eb58a 100644
--- a/readline.plp
+++ b/readline.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>default emacs mode</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'readline.eng.inc.pl' or die $@;
@@ -30,7 +28,6 @@ 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>
 
diff --git a/screen.plp b/screen.plp
index a99dc98..f4ceecb 100644
--- a/screen.plp
+++ b/screen.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'screen.inc.pl' or die $! // $@;
@@ -30,7 +28,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>
-</ul>
 
 <hr>
 
diff --git a/vi.plp b/vi.plp
index dc82a16..e3cd1e8 100644
--- a/vi.plp
+++ b/vi.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vi.eng.inc.pl' or die $@;
@@ -30,7 +28,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>
-</ul>
 
 <hr>
 
diff --git a/vimperator.plp b/vimperator.plp
index 74846f5..d939c9a 100644
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
@@ -33,7 +31,6 @@ my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>
-</ul>
 
 <hr>