From f3ce23b458ade0fd2f8d634e2e3c380023bbb4e5 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sun, 18 Jun 2017 13:59:39 +0200 Subject: [PATCH] keys: replace legends by generic function --- keyboard.plp | 20 +++----------------- less.plp | 26 ++------------------------ mplayer.plp | 24 +----------------------- mutt.plp | 24 +----------------------- nethack.plp | 24 +----------------------- readline.plp | 24 +----------------------- screen.plp | 28 +--------------------------- vimperator.plp | 26 ++------------------------ 8 files changed, 12 insertions(+), 184 deletions(-) diff --git a/keyboard.plp b/keyboard.plp index f1d5634..92c2aa2 100644 --- a/keyboard.plp +++ b/keyboard.plp @@ -13,7 +13,8 @@ Html({

normal mode (default)

<: -use Shiar_Sheet::Keyboard 2; +use Shiar_Sheet::Keyboard 2.07; + my $usint = [ [ 'a' .. 'z'], [qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)], @@ -36,20 +37,5 @@ my $keys = Shiar_Sheet::Keyboard->new({ }); $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows}, [0]); -:> -
- -
-
-
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/less.plp b/less.plp index 582eef4..206de5e 100644 --- a/less.plp +++ b/less.plp @@ -21,32 +21,10 @@ Html({

normal pager (default)

<: -use Shiar_Sheet::Keyboard 2; +use Shiar_Sheet::Keyboard 2.07; my $info = do 'less.eng.inc.pl' or die $@; my $keys = Shiar_Sheet::Keyboard->new($info); $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows}, [1,0]); -:> - -
- -
-
-<: $keys->print_legend('legend-types', ['g1' .. 'g4', 'g7', 'g8']) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg more )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/mplayer.plp b/mplayer.plp index 110018e..5620792 100644 --- a/mplayer.plp +++ b/mplayer.plp @@ -25,27 +25,5 @@ my $info = do 'mplayer.eng.inc.pl' or die $@; my $keys = Shiar_Sheet::Keyboard->new($info); $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows}, [1,0]); -:> - -
- -
-
-<: $keys->print_legend('legend-types', [qw( g1 g2 g4 g6 g7 g9 )]) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg ext )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/mutt.plp b/mutt.plp index 3ab95a0..bac469f 100644 --- a/mutt.plp +++ b/mutt.plp @@ -25,27 +25,5 @@ my $info = do 'mutt.eng.inc.pl' or die $@; my $keys = Shiar_Sheet::Keyboard->new($info); $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows}); -:> - -
- -
-
-<: $keys->print_legend('legend-types', ['g1' .. 'g4', 'g6' .. 'g9']) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/nethack.plp b/nethack.plp index 9c4c62d..8a49a3d 100644 --- a/nethack.plp +++ b/nethack.plp @@ -27,27 +27,5 @@ $_->{"\e"} = ['me mode'] for values %{ $info->{def} }; # static reset button, even though it's not (officially) in the game $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]); -:> - -
- -
-
-<: $keys->print_legend('legend-types', ['g2' .. 'g4', 'g6' .. 'g8']) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg argi argm )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/readline.plp b/readline.plp index ed5f366..1c5350a 100644 --- a/readline.plp +++ b/readline.plp @@ -25,27 +25,5 @@ my $info = do 'readline.eng.inc.pl' or die $@; 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->print_legend('legend-types', ['g1', 'g2', 'g4', 'g6' .. 'g9']) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg new ext )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/screen.plp b/screen.plp index c6feb72..6f88b0a 100644 --- a/screen.plp +++ b/screen.plp @@ -26,31 +26,5 @@ my $info = do 'screen.eng.inc.pl' or die $@ // $!; my $keys = Shiar_Sheet::Keyboard->new($info); $keys->map($get{map}) or undef $get{map}; $keys->print_rows($get{rows}); -:> - -
- -
-
-<: - $keys->print_legend('legend-types', ['g1' .. 'g7', 'g9']); -:> -
- -
-<: - $keys->print_legend('legend-options', [qw'arg']); -:> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !defined $showkeys && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); diff --git a/vimperator.plp b/vimperator.plp index 3fb7ba5..bb4bd9a 100644 --- a/vimperator.plp +++ b/vimperator.plp @@ -21,34 +21,12 @@ Html({

normal mode (default)

<: -use Shiar_Sheet::Keyboard 2; +use Shiar_Sheet::Keyboard 2.07; my $info = do 'vimperator.eng.inc.pl' or die $@; $_->{"\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}); -:> - -
- -
-
-<: $keys->print_legend('legend-types', ['g1' .. 'g9']) :> -
- -
-<: $keys->print_legend('legend-options', [qw( arg args )]) :> - -
    -
  • keyboard map is - <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :> -
  • keys are - <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:= - !exists $get{keys} && ' by default' :> -
  • default style is - <:= defined $get{style} && 'set to ' :><:= $style :> -
-
-
+$keys->print_legends(\%get); -- 2.30.0