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 2cbaffe4087f8da9db5c7e41394a25fb9d014229..246900deccdad9871c6ba75cb48f803378dd7aac 100644 (file)
--- 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} };
 
        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];
 
        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
                } # basemode
                print qq{\t</ul>\n};
        } # row

+
+       print "</ul>\n";

 }
 
 sub print_legend {
 }
 
 sub print_legend {

diff --git a/less.plp b/less.plp
index b3632038f95be5d110770de4d419b9b6f6ac3e12..1b427237e66d59d7bf623280df2845a00b0e4bd5 100644 (file)
--- a/less.plp
+++ b/less.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal pager (default)</h2>
 
 
 <h2>normal pager (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'less.eng.inc.pl' or die $@;
 <:
 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]);
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/mplayer.plp b/mplayer.plp
index 689ee84d69486d42f724fff4c35a10e3ca122f03..200b355a433d5c309e8844277cec040289821006 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>index (default)</h2>
 
 
 <h2>index (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mplayer.eng.inc.pl' or die $@;
 <:
 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]);
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/mutt.plp b/mutt.plp
index 3ce3d027c9fc01e3ab53e8f1ef8ae9e8f4a1cfc6..40959656e4bd8cdd79507f0e0664cdcee5047894 100644 (file)
--- a/mutt.plp
+++ b/mutt.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>index (default)</h2>
 
 
 <h2>index (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mutt.eng.inc.pl' or die $@;
 <:
 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});
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/nethack.plp b/nethack.plp
index 7e46c37c5e4d95ff1efea00d0f4a30c74d88fcd1..b00fb9c194156bc97e119066ff29ab7a9d1622d4 100644 (file)
--- a/nethack.plp
+++ b/nethack.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>normal gameplay</h2>
 
 
 <h2>normal gameplay</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'nethack.eng.inc.pl' or die $@;
 <:
 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]);
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/readline.plp b/readline.plp
index 6d8c4995ba67ef19adf5096c1b7c50089d07a6ed..c0eb58a280f7da6df1a9a3bcf35175adef68a98d 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>default emacs mode</h2>
 
 
 <h2>default emacs mode</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'readline.eng.inc.pl' or die $@;
 <:
 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]);
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '^x=213', [4,3,2]);
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/screen.plp b/screen.plp
index a99dc98d840f800e033c8b14853afb26ed036f6c..f4ceecb08416fcd136b8dc2fb1a1f151396f97d3 100644 (file)
--- a/screen.plp
+++ b/screen.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
 
 <h2>normal mode (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'screen.inc.pl' or die $! // $@;
 <:
 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});
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/vi.plp b/vi.plp
index dc82a16394e5ae2812f4ff99c450da1c6df4c771..e3cd1e85e68e530a87b79d1fa41eef82d0a1aa24 100644 (file)
--- a/vi.plp
+++ b/vi.plp
@@ -20,8 +20,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
 
 <h2>normal mode (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vi.eng.inc.pl' or die $@;
 <:
 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});
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>

-</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/vimperator.plp b/vimperator.plp
index 74846f57af3ea0aa5a08e1123eafebdcd3ca0a5a..d939c9adf7034a9be7cd6c9097fc4f0ef775eeb0 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -21,8 +21,6 @@ Html({
 
 <h2>normal mode (default)</h2>
 
 
 <h2>normal mode (default)</h2>
 

-<ul id="rows">
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
 <:
 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});
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 :>

-</ul>

 
 <hr>
 
 
 <hr>