screen: separate language include

Like all other keyboard pages.

diff --git a/screen.eng.inc.pl b/screen.eng.inc.pl
new file mode 100644 (file)
index 0000000..2d4c22e
--- /dev/null
+++ b/screen.eng.inc.pl
@@ -0,0 +1,81 @@
+use utf8;
+
+{
+key => {
+       'a' => "literal a",
+       'A' => "title", # title
+       '^a'=> "command key",
+       'b' => "send break", # break
+       'B' => "reopen break", # pow_break
+       'c' => "new", # screen
+       'C' => "clear", # clear
+       'd' => "detach", # detach
+       'D' => "detach logout", # pow_detach
+       'f' => "flow", # flow
+       'F' => "fit",
+       '^g'=> "vbell", # vbell
+       'h' => "hardcopy", # hardcopy
+       'H' => "log", # log
+       'i' => "prop<>erties", # info
+       'I' => "login on", #XXX
+       '^i'=> "focus", # focus
+       'k' => "kill", # kill
+       'l' => "redraw", # redisplay
+       'L' => "login", # login
+       'm' => "last msg", # lastmsg
+       'M' => "moni<>tor", # monitor
+       'n' => "next", # next
+       'N' => "number", # number
+       'O' => "login off", #XXX
+       '^o'=> "other", # other
+       'p' => "previous", # prev
+       'q' => "xon", # xon
+       'Q' => "only", # only
+       'r' => "wrap", # wrap
+       's' => 'xoff', # xoff
+       't' => "time", # time
+       'v' => "version",
+       '^v'=> "digraph", # digraph
+       'w' => "windows", # windows
+       'W' => "width", # width
+       'x' => "lock screen", # lockscreen
+       'X' => "remove", # remove
+       'z' => "suspend", # suspend
+       'Z' => "reset",
+
+       "'" => "select", # select
+       '"' => "window<>list -b", # windowlist -b
+       ':' => "colon", # colon
+       "\e"=> "copy", # copy
+       '^]'=> "paste .", # paste .
+       '|' => "split vert", # split -v
+       '{' => "history", # history
+       '}' => "history", # history
+       '=' => "remove buf", # removebuf
+       '*' => "displays", # displays
+       '.' => "dump<>termcap", # dumptermcap
+       ',' => "license", # license
+       '-' => "select -", # select -
+       '_' => "silence", # silence
+       '>' => "writebuf", # writebuf
+       '<' => "readbuf", # readbuf
+},
+
+mode => {
+       '' => 'index',
+},
+
+flag => {
+       g0 => ["info"],
+       g1 => ["display"],
+       g2 => ["select"],
+       g3 => ["config"],
+       g4 => ["window"],
+       g5 => ["buffer"],
+       g6 => ["contents"],
+       g8 => ["screen"],
+
+       arg => ["key<arg>" => "Commands with a dot need a char argument afterwards."],
+},
+
+}

diff --git a/screen.inc.pl b/screen.inc.pl
index dcc8ab0e8e425cb8747ba92eab13f64620e924bb..194aae2a5f4aa554c42c623daf1ae6e88fe9f9da 100644 (file)
--- a/screen.inc.pl
+++ b/screen.inc.pl
@@ -1,106 +1,88 @@
 use utf8;
+{
 
 # screen version 4.00.03jw4
 
-{
-
-def => {
 '' => {
-       desc => 'index',
-
-       'a' => ['g6', "literal a"],
-       'A' => ['g8 args', "title"], # title
-       '^a'=> ['', "command key"],
-       'b' => ['g6', "send break"], # break
-       'B' => ['g6', "reopen break"], # pow_break
+       'a' => ['g6'],
+       'A' => ['g8 args'], # title
+       '^a'=> [''],
+       'b' => ['g6'], # break
+       'B' => ['g6'], # pow_break
        '^b'=> 'b',
-       'c' => ['g8', "new"], # screen
-       'C' => ['g1', "clear"], # clear
+       'c' => ['g8'], # screen
+       'C' => ['g1'], # clear
        '^c'=> 'c',
-       'd' => ['g8', "detach"], # detach
-       'D' => ['g8', "detach logout"], # pow_detach
+       'd' => ['g8'], # detach
+       'D' => ['g8'], # pow_detach
        '^d'=> 'd',
-       'f' => ['g3', "flow"], # flow
-       'F' => ['g3', "fit"],
+       'f' => ['g3'], # flow
+       'F' => ['g3'],
        '^f'=> 'f',
-       '^g'=> ['g3', "vbell"], # vbell
-       'h' => ['g5', "hardcopy"], # hardcopy
-       'H' => ['g4', "log"], # log
+       '^g'=> ['g3'], # vbell
+       'h' => ['g5'], # hardcopy
+       'H' => ['g4'], # log
        '^h'=> '^p',
-       'i' => ['g0', "prop$sign{_}erties"], # info
-       'I' => ['g4', "login on"], #XXX
-       '^i'=> ['g1', "focus"], # focus
-       'k' => ['g4', "kill"], # kill
+       'i' => ['g0'], # info
+       'I' => ['g4'], #XXX
+       '^i'=> ['g1'], # focus
+       'k' => ['g4'], # kill
        'K' => 'k',
-       'l' => ['g1', "redraw"], # redisplay
-       'L' => ['g4', "login"], # login
+       'l' => ['g1'], # redisplay
+       'L' => ['g4'], # login
        '^l'=> 'l',
-       'm' => ['g0', "last msg"], # lastmsg
-       'M' => ['g4', "moni$sign{_}tor"], # monitor
+       'm' => ['g0'], # lastmsg
+       'M' => ['g4'], # monitor
        '^m'=> 'm',
-       'n' => ['g2', "next"], # next
-       'N' => ['g0', "number"], # number
+       'n' => ['g2'], # next
+       'N' => ['g0'], # number
        '^n'=> 'n',
-       'O' => ['g4', "login off"], #XXX
-       '^o'=> ['g2', "other"], # other
-       'p' => ['g2', "previous"], # prev
+       'O' => ['g4'], #XXX
+       '^o'=> ['g2'], # other
+       'p' => ['g2'], # prev
        '^p'=> 'p',
-       'q' => ['g3', "xon"], # xon
-       'Q' => ['g1', "only"], # only
+       'q' => ['g3'], # xon
+       'Q' => ['g1'], # only
        '^q'=> 'q',
-       'r' => ['g3', "wrap"], # wrap
+       'r' => ['g3'], # wrap
        '^r'=> 'r',
        's' => ['g3', 'xoff'], # xoff
        '^s'=> 's',
-       't' => ['g0', "time"], # time
+       't' => ['g0'], # time
        '^t'=> 't',
-       'v' => ['g0', "version"],
-       '^v'=> ['g6 arg arg linkdigraphs', "digraph"], # digraph
-       'w' => ['g0', "windows"], # windows
-       'W' => ['g3', "width"], # width
+       'v' => ['g0'],
+       '^v'=> ['g6 arg arg linkdigraphs'], # digraph
+       'w' => ['g0'], # windows
+       'W' => ['g3'], # width
        '^w'=> 'w',
-       'x' => ['g8', "lock screen"], # lockscreen
-       'X' => ['g1', "remove"], # remove
+       'x' => ['g8'], # lockscreen
+       'X' => ['g1'], # remove
        '^x'=> 'x',
-       'z' => ['g8', "suspend"], # suspend
-       'Z' => ['g8', "reset"],
+       'z' => ['g8'], # suspend
+       'Z' => ['g8'],
        '^z'=> 'z',
 
-       "'" => ['g2 arg', "select"], # select
-       '"' => ['g2', "window$sign{_}list -b"], # windowlist -b
-       ':' => ['g3', "colon"], # colon
-       "\e"=> ['g5', "copy"], # copy
+       "'" => ['g2 arg'], # select
+       '"' => ['g2'], # windowlist -b
+       ':' => ['g3'], # colon
+       "\e"=> ['g5'], # copy
        '[' => '^[',
        '^['=> "\e",
-       '^]'=> ['g6', "paste ."], # paste .
+       '^]'=> ['g6'], # paste .
        ']' => '^]',
-       '|' => ['g1', "split vert"], # split -v
-       '{' => ['g6', "history"], # history
-       '}' => ['g6', "history"], # history
-       '=' => ['g5', "remove buf"], # removebuf
+       '|' => ['g1'], # split -v
+       '{' => ['g6'], # history
+       '}' => ['g6'], # history
+       '=' => ['g5'], # removebuf
        '^?'=> '^h',
-       '*' => ['g0', "displays"], # displays
-       '.' => ['g8', "dump$sign{_}termcap"], # dumptermcap
-       ',' => ['g0', "license"], # license
-       '-' => ['g2', "select -"], # select -
-       '_' => ['g4', "silence"], # silence
-       '>' => ['g5', "writebuf"], # writebuf
-       '<' => ['g5', "readbuf"], # readbuf
+       '*' => ['g0'], # displays
+       '.' => ['g8'], # dumptermcap
+       ',' => ['g0'], # license
+       '-' => ['g2'], # select -
+       '_' => ['g4'], # silence
+       '>' => ['g5'], # writebuf
+       '<' => ['g5'], # readbuf
        '^@'=> 'n',
 },
-},
-
-flag => {
-       g0 => ["info"],
-       g1 => ["display"],
-       g2 => ["select"],
-       g3 => ["config"],
-       g4 => ["window"],
-       g5 => ["buffer"],
-       g6 => ["contents"],
-       g8 => ["screen"],
-
-       arg => ["key$sign{arg}", "Commands with a dot need a char argument afterwards."],
-},
 
 }

diff --git a/screen.plp b/screen.plp
index 0e188c19c3c4f05955f3eb7eb06865147a92f83e..755dfd13239d42cbd4fb689b00da0f4d2418d3f1 100644 (file)
--- a/screen.plp
+++ b/screen.plp
@@ -2,7 +2,7 @@
 
 Html({
        title => 'screen cheat sheet',
-       version => 'v1.0',
+       version => 'v1.1',
        description => [
                "Interactive cheat sheet for the Screen terminal manager,",
                "describing the function of each key.",
@@ -22,7 +22,8 @@ Html({
 
 <:
 use Shiar_Sheet::Keyboard 2;
-my $info = do 'screen.inc.pl' or die $@ // $!;
+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});