keys: load flags dependency within descriptions include

Complete setup from a single include, as both are closely related
and should not be distinctly selected.

diff --git a/less.eng.inc.pl b/less.eng.inc.pl
index 92610e9fe80230bdbb76170bb3c1b6b6891e57cc..131bf4d4f3339945617949180689a04b6b0a410e 100644 (file)
--- a/less.eng.inc.pl
+++ b/less.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
 use utf8;

-{

 
 

+{

 key => {
        "\e"=> "alt<>/meta",
 
 key => {
        "\e"=> "alt<>/meta",
 


@@ -127,4 +127,5 @@ flag => {
        more => [more => "A small subset is compatible with `more`."],
 },
 
        more => [more => "A small subset is compatible with `more`."],
 },
 

+def => do 'less.inc.pl',

 }
 }

diff --git a/less.plp b/less.plp
index e1950561dbad56ea785aeb655e7fb3b0431dc3a8..582eef4674cf0194d5982df5ffe198c03d57d319 100644 (file)
--- a/less.plp
+++ b/less.plp
@@ -23,7 +23,6 @@ Html({
 <:
 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 $@;

-$info->{def} = do 'less.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);

diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl
index a035b9633f0fe77aa7c177c2826b0fd2bdf70f05..0cd07831cd2e037c2c7c96dd63ddb27de8f55c86 100644 (file)
--- a/mplayer.eng.inc.pl
+++ b/mplayer.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
 use utf8;

-{

 
 

+{

 key => {
        '[' => "slow down 10%",
        ']' => "speed up 10%",
 key => {
        '[' => "slow down 10%",
        ']' => "speed up 10%",


@@ -67,4 +67,5 @@ flag => {
        ext => ["optional" => "Some features depend on setup and/or parameters."],
 },
 
        ext => ["optional" => "Some features depend on setup and/or parameters."],
 },
 

+def => do 'mplayer.inc.pl',

 }
 }

diff --git a/mplayer.plp b/mplayer.plp
index a45063ca4412a7d2f4f32014f6591f02e01f7299..110018ef3eab525bbe63fceed47eecd2d7cb6182 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -22,7 +22,6 @@ Html({
 <:
 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 $@;

-$info->{def} = do 'mplayer.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);

diff --git a/mutt.eng.inc.pl b/mutt.eng.inc.pl
index 08e1e2eb8c7e6d940a011dcc66f87b20d521003e..c67cb3beefa79e5e87eca1642352f776d8ab5364 100644 (file)
--- a/mutt.eng.inc.pl
+++ b/mutt.eng.inc.pl
@@ -222,4 +222,5 @@ flag => {
        arg => ["key<arg>" => "Commands with a dot need an argument afterwards."],
 },
 
        arg => ["key<arg>" => "Commands with a dot need an argument afterwards."],
 },
 

+def => do 'mutt.inc.pl',

 }
 }

diff --git a/mutt.plp b/mutt.plp
index 11ff4743dd518252f114c81bbb6b6958ccb08f5b..3ab95a030eabdaf75811f0f624db2669575a8ad0 100644 (file)
--- a/mutt.plp
+++ b/mutt.plp
@@ -22,7 +22,6 @@ Html({
 <:
 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 $@;

-$info->{def} = do 'mutt.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});

diff --git a/nethack.eng.inc.pl b/nethack.eng.inc.pl
index 62fed6478487c9aa49841cdaf309037016c27962..95e84afb37385acb6dbed64a0bae8399d3ca05e6 100644 (file)
--- a/nethack.eng.inc.pl
+++ b/nethack.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
 use utf8;

-{

 
 

+{

 key => {
        'b' =>   "step left down\nnumpad 1",
        'j' =>        "step down\nnumpad 2",
 key => {
        'b' =>   "step left down\nnumpad 1",
        'j' =>        "step down\nnumpad 2",


@@ -152,4 +152,5 @@ flag => {
        argm => ["key<argm>" => "Requires a direction afterwards."],
 },
 
        argm => ["key<argm>" => "Requires a direction afterwards."],
 },
 

+def => do 'nethack.inc.pl',

 }
 }

diff --git a/nethack.plp b/nethack.plp
index ae595b6f0ea0486dc4bc13589397ec5c1aa581a4..9c4c62de6cc6178e439237aeb11854eab452d688 100644 (file)
--- a/nethack.plp
+++ b/nethack.plp
@@ -22,7 +22,6 @@ Html({
 <:
 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 $@;

-$info->{def} = do 'nethack.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $_->{"\e"} = ['me mode'] for values %{ $info->{def} };
        # static reset button, even though it's not (officially) in the game
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $_->{"\e"} = ['me mode'] for values %{ $info->{def} };
        # static reset button, even though it's not (officially) in the game

diff --git a/readline.eng.inc.pl b/readline.eng.inc.pl
index ecf467c2aa63ad5b8d0244afe6ffeb63756cdb93..87eb061e10c2d8764d9275b1db0638ee030b9fea 100644 (file)
--- a/readline.eng.inc.pl
+++ b/readline.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
 use utf8;

-{

 
 

+{

 key => {
        '+<' => "history start",
        '+>' => "history end",
 key => {
        '+<' => "history start",
        '+>' => "history end",


@@ -98,4 +98,5 @@ flag => {
        ext => ["bash" => "Default assignment in Bash shells, but not common readline."],
 },
 
        ext => ["bash" => "Default assignment in Bash shells, but not common readline."],
 },
 

+def => do 'readline.inc.pl',

 }
 }

diff --git a/readline.plp b/readline.plp
index 53dc76fbf86000bc971ff596be687be34c8c5afa..ed5f36661b2fb0d6c0d8463faeace9094c8c8cf9 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -22,7 +22,6 @@ Html({
 <:
 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 $@;

-$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]);
 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]);

diff --git a/screen.eng.inc.pl b/screen.eng.inc.pl
index e0cdb5c8bd101a1999ead222bf70d790d35c530f..e13cb1b17b39567b81ef9b818ac54e9bf6290d0d 100644 (file)
--- a/screen.eng.inc.pl
+++ b/screen.eng.inc.pl
@@ -78,4 +78,5 @@ flag => {
        arg => ["key<arg>" => "Commands with a dot need a char argument afterwards."],
 },
 
        arg => ["key<arg>" => "Commands with a dot need a char argument afterwards."],
 },
 

+def => do 'screen.inc.pl',

 }
 }

diff --git a/screen.plp b/screen.plp
index aeed94936ff3fcb52bf8be0ecdca5bf100d09036..c6feb728aebc360a8d41f48b4ebd00e3a30f3505 100644 (file)
--- a/screen.plp
+++ b/screen.plp
@@ -23,7 +23,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'screen.eng.inc.pl' or die $@ // $!;
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'screen.eng.inc.pl' or die $@ // $!;

-$info->{def} = do 'screen.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});

diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 1a80065de4beb67caf3c607cbf9f07fd719d412c..03eabf31ab4e1aa9689ed0101a05020cce3bfe23 100644 (file)
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -478,4 +478,5 @@ flag => {
        'ext new vim7' => ["vim7", "New in vim version 7.x."],
 },
 
        'ext new vim7' => ["vim7", "New in vim version 7.x."],
 },
 

+def => do 'vi.inc.pl',

 }
 }

diff --git a/vi.plp b/vi.plp
index 750bbcf4314fec0a4c0106a155868eff1dd55fa8..203fdc8c39051812e773a38aad72ec1c65097f52 100644 (file)
--- a/vi.plp
+++ b/vi.plp
@@ -22,7 +22,6 @@ Html({
 <:
 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 $@;

-$info->{def} = do 'vi.inc.pl';

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});

diff --git a/vimperator.eng.inc.pl b/vimperator.eng.inc.pl
index e1630b543b84070cff275b34bd9294b16698df3a..2457fdb67ed9ccf06e7e4fee20a9ca71781e2e73 100644 (file)
--- a/vimperator.eng.inc.pl
+++ b/vimperator.eng.inc.pl
@@ -1,6 +1,5 @@
 use utf8;
 {
 use utf8;
 {

-

 key => {
        '~' => "open home<>dir",
        '@' => "play macro",
 key => {
        '~' => "open home<>dir",
        '@' => "play macro",


@@ -151,4 +150,5 @@ flag => {
        args => ["key<args>" => "Commands with two dots require variable arguments afterwards."],
 },
 
        args => ["key<args>" => "Commands with two dots require variable arguments afterwards."],
 },
 

+def => do 'vimperator.inc.pl',

 }
 }

diff --git a/vimperator.plp b/vimperator.plp
index 638c41146e30eca64085a063718d4c666db133f6..3fb7ba5cb3e3b9bd0b733a756f83c675ed447a2b 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -23,7 +23,6 @@ Html({
 <:
 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 $@;

-$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);
 $_->{"\e"} = ['mv mode', "normal mode"] for values %{ $info->{def} };
 delete $info->{def}->{''}->{"\e"};
 my $keys = Shiar_Sheet::Keyboard->new($info);