From 601c737a133afc2884c7e88d293268918d26f315 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Tue, 10 Mar 2015 02:56:07 +0100 Subject: [PATCH] keys: replace sign variable by placeholder substitution Clear text strings are easier to read and maintain and provide readable fallback in case substitution fails. --- Shiar_Sheet/KeySigns.pm | 4 +- Shiar_Sheet/Keyboard.pm | 18 +- less.eng.inc.pl | 34 ++-- mplayer.eng.inc.pl | 32 ++-- mutt.eng.inc.pl | 130 +++++++-------- nethack.eng.inc.pl | 48 +++--- readline.eng.inc.pl | 38 ++--- vi.eng.inc.pl | 352 ++++++++++++++++++++-------------------- vimperator.eng.inc.pl | 68 ++++---- 9 files changed, 366 insertions(+), 358 deletions(-) diff --git a/Shiar_Sheet/KeySigns.pm b/Shiar_Sheet/KeySigns.pm index c65385c..5de47cb 100644 --- a/Shiar_Sheet/KeySigns.pm +++ b/Shiar_Sheet/KeySigns.pm @@ -4,7 +4,7 @@ use utf8; use strict; use warnings; -our $VERSION = '1.03'; +our $VERSION = '1.04'; our %sign = ( arg => '·', # described as 'dot' @@ -18,7 +18,7 @@ our %sign = ( down => '▼', left => '◀', sep => '•', - _ => '' || "\x{200b}", # unofficial html, correct ZWNJ character might appear as placeholder + '' => '' || "\x{200b}", # unofficial html, correct ZWNJ character might appear as placeholder ); sub import { diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index aecd0bc..30b73bf 100644 --- a/Shiar_Sheet/Keyboard.pm +++ b/Shiar_Sheet/Keyboard.pm @@ -1,11 +1,12 @@ package Shiar_Sheet::Keyboard; +use 5.010; use strict; use warnings; no warnings 'uninitialized'; # save some useless checks for more legible code use Carp; -our $VERSION = 'v2.03'; +our $VERSION = 'v2.04'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -31,7 +32,7 @@ sub new { $self->{sign} ||= do { require Shiar_Sheet::KeySigns; - Shiar_Sheet::KeySigns->VERSION(1.03); + Shiar_Sheet::KeySigns->VERSION(1.04); \%Shiar_Sheet::KeySigns::sign; }; @@ -64,6 +65,13 @@ sub escapehtml { return $_; } +sub escapedesc { + my $self = shift; + local $_ = shift; + s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg; + return $_; +} + sub keyunalias { my $self = shift; my ($key, $ancestry) = @_; @@ -92,7 +100,7 @@ sub print_key { } my ($flags, $desc, $mnem) = @{$flags}; if (my $txt = $self->{key}->{$mode.$key}) { - ($desc, $mnem) = split /\n/, $txt; + ($desc, $mnem) = split /\n/, $self->escapedesc($txt); } # $key = $keytrans{$key} if defined $keytrans{$key}; @@ -154,7 +162,7 @@ sub print_rows { ' class="%s"', join ' ', @caseclass ); printf('%s: %s', # XXX insert   here to fix msie<=6 - $self->{mode}->{$mode} || "mode $basemode", + $self->escapedesc($self->{mode}->{$mode} || "mode $basemode"), "$rowdesc[$row] row $casedesc[$case]" ) unless $row < 0; print "\n"; @@ -177,7 +185,7 @@ sub print_legend { print qq{\t\t
\n}; printf("\t\t".'
%s'."\n\t\t\t".'
%s'."\n", - $_, @{ $self->{flag}->{$_} || ["($_)", '...'] } + $_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] } ) for @$flags; print "\t\t
"; } diff --git a/less.eng.inc.pl b/less.eng.inc.pl index dbf0194..e145a06 100644 --- a/less.eng.inc.pl +++ b/less.eng.inc.pl @@ -9,9 +9,9 @@ key => { 'g' => "(first) line", 'G' => "last line", 'h' => "help", - 'j' => $sign{down}, - 'k' => $sign{up}, - 'm' => "mark pos$sign{_}ition", + 'j' => "", + 'k' => "", + 'm' => "mark pos<>ition", 'n' => "next find", 'N' => "prev find", 'p' => "reset position\nbeginning or Percentage", @@ -30,10 +30,10 @@ key => { '!' => "shell command", '|' => "pipe till mark", - ':' => "com$sign{_}mand", + ':' => "com<>mand", '/' => "find", '?' => "find rev.", - '&' => "filter match$sign{_}es", + '&' => "filter match<>es", "'" => "goto mark", '-' => "toggle option", '_' => "show option", @@ -58,7 +58,7 @@ key => { '-b' => "buffer space", '-B' => "static buffer for pipes", '-c' => "clear on scroll", - '-d' => "dumb term$sign{_}inal", + '-d' => "dumb term<>inal", '-D' => "dos colours", '-e' => "exit after eof", '-E' => "exit at eof", @@ -66,16 +66,16 @@ key => { '-F' => "exit if 1 page", '-g' => "hilight last match", '-h' => "scroll back limit", - '-i' => "ignore lower$sign{_}c$sign{_}ase", + '-i' => "ignore lower<>c<>ase", '-I' => "ignore case", '-j' => "top offset", '-J' => "status column", - '-k' => "key bind$sign{_}ing$sign{_}s", - '-L' => qq[ignore lesso$sign{_}pen filter], - '-m' => "med. promp$sign{_}t tog$sign{_}gle", - '-M' => "long promp$sign{_}t tog$sign{_}gle", - '-n' => "count line num$sign{_}ber$sign{_}s", - '-N' => "show line n$sign{_}um$sign{_}ber$sign{_}s", + '-k' => "key bind<>ing<>s", + '-L' => qq[ignore lesso<>pen filter], + '-m' => "med. promp<>t tog<>gle", + '-M' => "long promp<>t tog<>gle", + '-n' => "count line num<>ber<>s", + '-N' => "show line n<>um<>ber<>s", '-o' => "stdin to log", '-O' => "log overwrite", '-p' => "initial search", @@ -90,11 +90,11 @@ key => { '-T' => "tags file", '-u' => 'parse \b \r', '-U' => 'escape \t \b \r', - '-w' => "hilight page d$sign{_}own", - '-W' => "hilight forw$sign{_}ard", + '-w' => "hilight page d<>own", + '-W' => "hilight forw<>ard", '-x' => "tab stops", '-X' => "no termcap init", - '-y' => "scroll limit fw$sign{_}d", + '-y' => "scroll limit fw<>d", '-z' => "page size", '-"' => "shell quotes", '-~' => "outside tildes toggle", @@ -118,7 +118,7 @@ flag => { mo => [file => 'Alter open file buffer (").'], mv => [misc => 'Other commands and options.'], - arg => ["key$sign{arg}" => "Commands with a dot need a char argument afterwards."], + arg => ["key" => "Commands with a dot need a char argument afterwards."], more => [more => "A small subset is compatible with `more`."], }, diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl index db884bf..bfdfb7a 100644 --- a/mplayer.eng.inc.pl +++ b/mplayer.eng.inc.pl @@ -11,33 +11,33 @@ key => { 'p' => "pause", '.' => "step forward", 'q' => "stop and quit", - '+' => "audio delay +$sign{_}.1s", - '-' => "audio delay -$sign{_}.1s", + '+' => "audio delay +<>.1s", + '-' => "audio delay -<>.1s", '/' => "volume decrease", '*' => "volume increase", 'm' => "mute sound", - '#' => "cycle audio tr$sign{_}ack$sign{_}s", - 'f' => "full$sign{_}screen", + '#' => "cycle audio tr<>ack<>s", + 'f' => "full<>screen", 'T' => "stay on top", - 'w' => "pan/sc. decr$sign{_}eas$sign{_}e", + 'w' => "pan/sc. decr<>eas<>e", 'e' => "pan/scan increase", 'o' => "osd state switch", 'd' => "frame drop mode", 'v' => "subtitle visibility", - 'b' => "next sub$sign{_}title", - 'j' => "prev$sign{_}ious sub$sign{_}title", - 'g' => "back in sub$sign{_}title$sign{_}s list", - 'y' => "forward in sub$sign{_}title$sign{_}s list", + 'b' => "next sub<>title", + 'j' => "prev<>ious sub<>title", + 'g' => "back in sub<>title<>s list", + 'y' => "forward in sub<>title<>s list", 'F' => "forced subtitles", 'a' => "align subtitles", 'c' => "cycle fs mode", 'n' => "restore video mode", - 'x' => "subtitle delay +$sign{_}.1$sign{_}s", - 'z' => "subtitle delay -$sign{_}.1$sign{_}s", + 'x' => "subtitle delay +<>.1<>s", + 'z' => "subtitle delay -<>.1<>s", 'r' => "subtitles up", 't' => "subtitles down", - 's' => "screen$sign{_}shot\n-vf screenshot", - 'S' => "record screen$sign{_}shot$sign{_}s\n-vf screenshot", + 's' => "screen<>shot\n-vf screenshot", + 'S' => "record screen<>shot<>s\n-vf screenshot", 'I' => "filename", '!' => "chapter back", '@' => "chapter forward", @@ -48,7 +48,7 @@ key => { '5' => "hue to red", '6' => "hue to blue", '7' => "saturate", - '8' => "de$sign{_}saturate", + '8' => "de<>saturate", }, mode => { @@ -63,8 +63,8 @@ flag => { mo => [playback => "Playback control."], me => [general => "Other MPlayer features."], - arg => ["key$sign{arg}" => "Commands with a dot need an argument afterwards."], - ext => ["optional" => "Some features depend on setup and/or parameters."], + arg => ["key" => "Commands with a dot need an argument afterwards."], + ext => ["optional" => "Some features depend on setup and/or parameters."], }, } diff --git a/mutt.eng.inc.pl b/mutt.eng.inc.pl index 8e22c6a..9409f02 100644 --- a/mutt.eng.inc.pl +++ b/mutt.eng.inc.pl @@ -2,29 +2,29 @@ use utf8; my %common = ( 'H' => "screen top", - 'j' => "entry $sign{down}", - 'k' => "entry $sign{up}", + 'j' => "entry ", + 'k' => "entry ", 'L' => "screen bottom", '^l'=> "redraw", 'M' => "screen middle", '^m'=> "select", - 'n' => "search $sign{down}", + 'n' => "search ", 'q' => "exit", 't' => "tag", - 'z' => "page $sign{down}", - 'Z' => "page $sign{up}", + 'z' => "page ", + 'Z' => "page ", '*' => "last entry", '=' => "first entry", ':' => "enter command", ';' => "apply to tagged", - '>' => "line $sign{down}", - '<' => "line $sign{up}", - ']' => "half page $sign{down}", - '[' => "half page $sign{up}", + '>' => "line ", + '<' => "line ", + ']' => "half page ", + '[' => "half page ", '?' => "help", '!' => "invoke shell", - '/' => "search $sign{down}", - '+/'=> "search $sign{up}", + '/' => "search ", + '+/'=> "search ", ); { @@ -37,67 +37,67 @@ key => { '$' => "save mailbox", '#' => "split up thread", '&' => "thread tagged", - '%' => "toggle reado$sign{_}nl$sign{_}y", + '%' => "toggle reado<>nl<>y", 'a' => "create alias", 'b' => "bounce", - '^b'=> "url$sign{_}view", + '^b'=> "url<>view", '+b'=> "search bodies", 'c' => "open folder", - 'C' => "copy messag$sign{_}e", - '+c'=> "open reado$sign{_}nly", + 'C' => "copy messag<>e", + '+c'=> "open reado<>nly", '+C'=> "make plain copy", 'd' => "delete", - 'D' => "delete patt$sign{_}er$sign{_}n", + 'D' => "delete patt<>er<>n", '^d'=> "delete thread", '+d'=> "delete subthread", 'e' => "edit", - '^e'=> "edit con$sign{_}tent type", + '^e'=> "edit con<>tent type", '+e'=> "edit+send copy", 'f' => "forward", 'F' => "toggle important", - '^f'=> "forget pass$sign{_}phras$sign{_}e", + '^f'=> "forget pass<>phras<>e", 'g' => "reply to all\nGroup reply", 'G' => "fetch POP\nGather new mail", 'h' => "toggle headers", - '^i'=> "unread msg $sign{down}", - '+^i'=> "unread msg $sign{up}", - 'j' => "messag$sign{_}e $sign{down}", - 'k' => "messag$sign{_}e $sign{up}", - 'J' => "any $sign{down}", - 'K' => "any $sign{up}", + '^i'=> "unread msg ", + '+^i'=> "unread msg ", + 'j' => "messag<>e ", + 'k' => "messag<>e ", + 'J' => "any ", + 'K' => "any ", '^k'=> "extract pub keys", '+k'=> "send public key", 'l' => "limit pattern", 'L' => "reply to list", '+l'=> "show current limit", - 'm' => "compo$sign{_}s$sign{_}e mail", + 'm' => "compo<>s<>e mail", 'N' => "toggle new", - '^n'=> "thread $sign{down}", - '+n'=> "subthr$sign{_}ead $sign{down}", + '^n'=> "thread ", + '+n'=> "subthr<>ead ", 'o' => "sort", 'O' => "sort reverse", 'p' => "print", 'P' => "to parent", - '^p'=> "thread $sign{up}", - '+p'=> "subthr$sign{_}ead $sign{up}", + '^p'=> "thread ", + '+p'=> "subthr<>ead ", '+P'=> "check for pgp", 'q' => "quit", - 'Q' => "query addr$sign{_}ess$sign{_}es", + 'Q' => "query addr<>ess<>es", 'r' => "reply to sender", - 'R' => "recall postpon$sign{_}e$sign{_}d", + 'R' => "recall postpon<>e<>d", '^r'=> "mark thread read", - '+r'=> "mark sub$sign{_}thread r$sign{_}ead", + '+r'=> "mark sub<>thread r<>ead", 's' => "move", '+s'=> "save and delete", - 'T' => "tag patt$sign{_}er$sign{_}n", + 'T' => "tag patt<>er<>n", '^t'=> "untag pattern", '+t'=> "tag thread", 'u' => "undo delete", - 'U' => "res$sign{_}tore pat$sign{_}t$sign{_}er$sign{_}n", + 'U' => "res<>tore pat<>t<>er<>n", '^u'=> "restore thread", '+u'=> "restore subthread", - 'v' => "attach$sign{_}ments", + 'v' => "attach<>ments", 'V' => "version", '+v'=> "(un)collapse thread", '+V'=> "(un)collapse threads", @@ -108,40 +108,40 @@ key => { (map { 'm'.$_ => $common{$_} } keys %common), - 'm|' => "pipe attach$sign{_}m$sign{_}ent", + 'm|' => "pipe attach<>m<>ent", 'ma' => "attach file", - 'mA' => "attach messag$sign{_}e", + 'mA' => "attach messag<>e", 'mb' => "edit bcc", 'mc' => "edit cc", 'mC' => "copy file", - 'md' => "desc$sign{_}ribe attach$sign{_}m$sign{_}ent", - 'mD' => "delete attach$sign{_}m$sign{_}ent", - 'm^d'=> "dispo$sign{_}sition tog$sign{_}gle", + 'md' => "desc<>ribe attach<>m<>ent", + 'mD' => "delete attach<>m<>ent", + 'm^d'=> "dispo<>sition tog<>gle", 'me' => "edit body", 'mE' => "edit all", 'm^e'=> "edit encoding", 'mf' => "edit fcc", - 'm^f'=> "forget pass$sign{_}phrase", + 'm^f'=> "forget pass<>phrase", 'm+f'=> "edit from", - 'mF' => "filter attach$sign{_}m$sign{_}ent", - 'mG' => "get attach$sign{_}m$sign{_}ent", + 'mF' => "filter attach<>m<>ent", + 'mG' => "get attach<>m<>ent", 'mh' => "display message", 'mi' => "run ispell", - 'ml' => "print attach$sign{_}m$sign{_}ent", - 'mm' => "edit attach$sign{_}m$sign{_}ent\nMime-appropriate open", + 'ml' => "print attach<>m<>ent", + 'mm' => "edit attach<>m<>ent\nMime-appropriate open", 'mM' => "edit mix", - 'm^m'=> "view attach$sign{_}m$sign{_}ent", - 'mn' => "new attach$sign{_}m$sign{_}ent", - 'mP' => "post$sign{_}pone", - 'mr' => "edit reply$sign{_}-to", - 'mR' => "rename attach$sign{_}m$sign{_}ent", + 'm^m'=> "view attach<>m<>ent", + 'mn' => "new attach<>m<>ent", + 'mP' => "post<>pone", + 'mr' => "edit reply<>-to", + 'mR' => "rename attach<>m<>ent", 'ms' => "edit subject", 'mS' => "s/mime options", 'mt' => "edit to", - 'm^t'=> "ctype attach$sign{_}m$sign{_}ent", + 'm^t'=> "ctype attach<>m<>ent", 'mw' => "copy to folder", 'mu' => "unlink toggle", - 'mU' => "encode attach$sign{_}m$sign{_}ent", + 'mU' => "encode attach<>m<>ent", 'my' => "send", 'wD' => "deleted", @@ -156,43 +156,43 @@ key => { '/~B' => "whole msg", '/~c' => "cc address", '/~C' => "to or cc address", - '/~d' => "date sent ran$sign{_}g$sign{_}e", + '/~d' => "date sent ran<>g<>e", '/~D' => "deleted", '/~e' => "sender", '/~E' => "expired", '/~f' => "from", '/~F' => "flagged", '/~g' => "signed", - '/~G' => "encryp$sign{_}ted", + '/~G' => "encryp<>ted", '/~h' => "header", - '/~H' => "spam attr$sign{_}ib$sign{_}ute", + '/~H' => "spam attr<>ib<>ute", '/~i' => "msg id", '/~k' => "pgp key", - '/~L' => "receiv$sign{_}d by", + '/~L' => "receiv<>d by", '/~l' => "mailing list", - '/~m' => "num$sign{_}ber ran$sign{_}g$sign{_}e", + '/~m' => "num<>ber ran<>g<>e", '/~n' => "score range", '/~N' => "new", '/~O' => "old", '/~p' => "to you", '/~P' => "by you", '/~Q' => "replies", - '/~r' => "receive date ran$sign{_}ge", + '/~r' => "receive date ran<>ge", '/~R' => "read", '/~s' => "subject", - '/~S' => "super$sign{_}seded", + '/~S' => "super<>seded", '/~t' => "to address", '/~T' => "tagged", - '/~u' => "subscr$sign{_}ibed list", + '/~u' => "subscr<>ibed list", '/~U' => "unread", '/~v' => "collapsed thread", '/~V' => "verified", - '/~x' => "refer$sign{_}ence", - '/~X' => "attach$sign{_}ments", + '/~x' => "refer<>ence", + '/~X' => "attach<>ments", '/~y' => "x-label", '/~z' => "size range", - '/~=' => "dupli$sign{_}cate", - '/~$' => "unrefer$sign{_}enced", + '/~=' => "dupli<>cate", + '/~$' => "unrefer<>enced", '/~(' => "in thread", }, @@ -213,7 +213,7 @@ flag => { mv => [leave => "Exit the opened folder."], me => [display => "Permanently alter/toggle current view."], - arg => ["key$sign{arg}" => "Commands with a dot need an argument afterwards."], + arg => ["key" => "Commands with a dot need an argument afterwards."], }, } diff --git a/nethack.eng.inc.pl b/nethack.eng.inc.pl index 8359f0c..3a8f133 100644 --- a/nethack.eng.inc.pl +++ b/nethack.eng.inc.pl @@ -30,23 +30,23 @@ key => { '^u'=> "run right up\nnumpad 5 9", 'g' => "run until interest", - 'm' => "m$sign{_}ove blind\nno pickup", - 'G' => "g any$sign{_}where\nfollow branches", + 'm' => "m<>ove blind\nno pickup", + 'G' => "g any<>where\nfollow branches", '?' => "help menu", '+?'=> "more help", '/' => "explain symbol", - '&' => "tell com$sign{_}m$sign{_}and", + '&' => "tell com<>m<>and", '<' => "climb up ladder", - '>' => "desc$sign{_}ent ladder", + '>' => "desc<>ent ladder", '.' => "rest (noop)", '_' => "travel to", - '+2'=> "two$sign{_}weapon toggle", + '+2'=> "two<>weapon toggle", 'a' => "apply tool", 'A' => "remove all armor", - '^a'=> "redo comm$sign{_}and\nAgain", - '+a'=> "adjust inv$sign{_}ent$sign{_}ory", + '^a'=> "redo comm<>and\nAgain", + '+a'=> "adjust inv<>ent<>ory", 'c' => "close door", 'C' => "call monster", '+c'=> "chat", @@ -55,18 +55,18 @@ key => { '^d'=> "kick", '+d'=> "dip", 'e' => "eat food", - 'E' => "en$sign{_}grave", + 'E' => "en<>grave", '+e'=> "weapon skills\nEnhance", 'f' => "fire quiver", 'F' => "fight monster", '+f'=> "force lock", - 'i' => "invent$sign{_}ory", - 'I' => "invent$sign{_}ory part", + 'i' => "invent<>ory", + 'I' => "invent<>ory part", '+i'=> "invoke object", '+j'=> "jump", '+l'=> "loot", - '+m'=> "mons$sign{_}ter abil$sign{_}ity", - '+n'=> "name item$sign{_}(s)", + '+m'=> "mons<>ter abil<>ity", + '+n'=> "name item<>(s)", 'o' => "open door", 'O' => "options", '+o'=> "offer sacrifice", @@ -84,7 +84,7 @@ key => { 's' => "search secrets", 'S' => "save game", '+s'=> "sit down", - 't' => "throw$sign{_}/shoot", + 't' => "throw<>/shoot", 'T' => "remove armor", '^t'=> "teleport", '+t'=> "turn undead", @@ -92,7 +92,7 @@ key => { 'v' => "version", 'V' => "verbose version", '+v'=> "compile details", - 'w' => "wield weap$sign{_}on", + 'w' => "wield weap<>on", 'W' => "wear armor", '+w'=> "wipe face", 'x' => "swap weapons\nXchange", @@ -103,28 +103,28 @@ key => { '^z'=> "suspend game", ':' => "look here", - ';' => "look else$sign{_}where", + ';' => "look else<>where", ',' => "pick up", - '@' => "toggle pick$sign{_}up", + '@' => "toggle pick<>up", '^' => "show trap", ')' => "show weapon", '[' => "show armor", '=' => "show rings", '"' => "show amulet", '(' => "show tools", - '*' => "show equip$sign{_}ment", + '*' => "show equip<>ment", '$' => "count gold", '+' => "list spells", - '\\'=> "discover$sign{_}ed obj$sign{_}ects", + '\\'=> "discover<>ed obj<>ects", '!' => "shell escape", - '#' => "more comm$sign{_}ands", + '#' => "more comm<>ands", 'DB' => 'drop blessed', 'DU' => 'drop uncursed', 'DC' => 'drop cursed', 'DX' => 'drop unknown', 'Da' => 'drop all', - 'Di' => "invent$sign{_}ory", + 'Di' => "invent<>ory", 'Du' => 'drop unpaid', 'Dm' => 'drop any', 'D%' => 'drop more', @@ -140,16 +140,16 @@ mode => { }, flag => { - pm => [direction => "Direction to move to or target a command ($sign{motion})."], + pm => [direction => "Direction to move to or target a command ()."], po => [move => "Other character movement."], co => [act => "Direct action command: takes a turn."], mi => [info => "Informational command: shows/does something without ending the turn."], mo => [invertory => "Display invertory menu."], mv => [menu => "Enters some other menu."], - arg => ["key$sign{arg}" => "Commands with a dot need at least one argument afterwards."], - argi => ["key$sign{argi}" => "Asks for an inventory item."], - argm => ["key$sign{argm}" => "Requires a direction afterwards."], + arg => ["key" => "Commands with a dot need at least one argument afterwards."], + argi => ["key" => "Asks for an inventory item."], + argm => ["key" => "Requires a direction afterwards."], }, } diff --git a/readline.eng.inc.pl b/readline.eng.inc.pl index f9f04e4..ab43dae 100644 --- a/readline.eng.inc.pl +++ b/readline.eng.inc.pl @@ -4,42 +4,42 @@ use utf8; key => { '+<' => "history start", '+>' => "history end", - '+?' => "list complet$sign{_}ion$sign{_}s", + '+?' => "list complet<>ion<>s", '^@' => "set mark", - '+#' => "prefix comm$sign{_}en$sign{_}t", + '+#' => "prefix comm<>en<>t", '+&' => "tilde expand", - '+*' => "complet$sign{_}e all", + '+*' => "complet<>e all", '+.' => "insert last", '^[' => "meta", - '+\\'=> "delete whitesp$sign{_}ace", + '+\\'=> "delete whitesp<>ace", '^]' => "find char", '^+]'=> "rev find char", '^_' => "undo", - '+~' => "user$sign{_}name exp$sign{_}and", + '+~' => "user<>name exp<>and", '+!' => "cmd expand", - '+@' => "host$sign{_}name exp$sign{_}and", + '+@' => "host<>name exp<>and", '+$' => "variable expand", '+^' => "history expand", '+/' => "filename expand", '^a' => "begin of line", - '^b' => "char back$sign{_}w$sign{_}ard$sign{_}s", - '+b' => "word back$sign{_}w$sign{_}ard$sign{_}s", - '^c' => "cancel comm$sign{_}and", - '+c' => "capital$sign{_}ise word", + '^b' => "char back<>w<>ard<>s", + '+b' => "word back<>w<>ard<>s", + '^c' => "cancel comm<>and", + '+c' => "capital<>ise word", '^d' => "delete char", - '+d' => "delete word rem$sign{_}ain$sign{_}der", + '+d' => "delete word rem<>ain<>der", # '^e' => "emacs mode", '^e' => "end of line", '^f' => "char forward", '+f' => "word forward", '^g' => "abort cmd, bell", - '^h' => "back$sign{_}space", + '^h' => "back<>space", '^+h'=> "delete bound word", - '^i' => "auto$sign{_}complet$sign{_}e\n(tab)", + '^i' => "auto<>complet<>e\n(tab)", '^+j'=> "vim mode", '^k' => "delete till eol", '^l' => "clear screen", @@ -54,17 +54,17 @@ key => { '^r' => "reverse history", '+r' => "full undo\nRevert", '^s' => "search history", - '^t' => "move char forw$sign{_}ard\nTranspose char", - '+t' => "move word forw$sign{_}ard\nTranspose word", + '^t' => "move char forw<>ard\nTranspose char", + '+t' => "move word forw<>ard\nTranspose word", '^u' => "delete till bol", # unix '+u' => "upcase word", - '^v' => "verbat$sign{_}im char", + '^v' => "verbat<>im char", '^w' => "delete word", # unix - '^x' => "extend$sign{_}ed", + '^x' => "extend<>ed", '^y' => "yank top", '+y' => "rotate yank", '^+y'=> "yank arg", - '^z' => "back$sign{_}ground", + '^z' => "back<>ground", '^x(' => "start macro", '^x)' => "end macro", @@ -89,7 +89,7 @@ flag => { mv => [misc => "Miscellaneous commands."], me => [mode => "Additional key functionality (click to view)."], - arg => ["key$sign{arg}" => "Commands with a dot need a char argument afterwards."], + arg => ["key" => "Commands with a dot need a char argument afterwards."], new => [">v2.0" => "Unavailable before readline version 2.1 (1997)."], ext => ["bash" => "Default assignment in Bash shells, but not common readline."], }, diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl index 7dcca54..3452e4a 100644 --- a/vi.eng.inc.pl +++ b/vi.eng.inc.pl @@ -5,77 +5,77 @@ key => { "\e"=> "normal mode", '~' => "case toggle", -'!' => "filt$sign{_}er lines", +'!' => "filt<>er lines", '@' => "play macro", '#' => "rev. find word", '$' => "eol", '%' => "goto match", '^' => '"soft" bol', -'&' => ":s rep$sign{_}eat", +'&' => ":s rep<>eat", '*' => "find word", -'(' => "begin senten$sign{_}ce", -')' => "end senten$sign{_}ce", +'(' => "begin senten<>ce", +')' => "end senten<>ce", '_' => '"soft" bol down', '+' => "next line", '`' => "goto mark", '0' => '"hard" bol', '^^'=> "edit alt. file", '-' => "prev line", -'=' => "re$sign{_}ind$sign{_}ent", +'=' => "re<>ind<>ent", '?' => "find rev.", ';' => "repeat t/f/T/F", ':' => "ex cmd line", "'" => "goto mark bol", -'"' => "use reg$sign{_}ister", -'\\' => "reser$sign{_}ved", -'^\\' => "to mode/$sign{_}ext$sign{_}ens$sign{_}ion$sign{_}s", +'"' => "use reg<>ister", +'\\' => "reser<>ved", +'^\\' => "to mode/<>ext<>ens<>ion<>s", ',' => "reverse t/T/f/F", -'<' => "un$sign{_}ind$sign{_}ent", +'<' => "un<>ind<>ent", '.' => "repeat last cmd", -'>' => "ind$sign{_}ent", +'>' => "ind<>ent", '/' => "find", -'[' => "move back$sign{_}ward$sign{_}s", +'[' => "move back<>ward<>s", '{' => "begin parag.", -']' => "move forw$sign{_}ard", +']' => "move forw<>ard", '}' => "end parag.", '^]'=> "go to tag", '|' => "goto (1st) col", -'a' => "app$sign{_}end", -'A' => "app$sign{_}end to eol", -'^a'=> "incr$sign{_}ement\nAdd one", +'a' => "app<>end", +'A' => "app<>end to eol", +'^a'=> "incr<>ement\nAdd one", 'b' => "prev word\nBack", 'B' => 'prev word', '^b'=> "page up", -'c' => "chan$sign{_}ge", -'C' => "chan$sign{_}ge to eol", +'c' => "chan<>ge", +'C' => "chan<>ge to eol", '^c'=> "abort", -'d' => "del$sign{_}ete", +'d' => "del<>ete", 'D' => "delete to eol", '^d'=> "scroll down", 'e' => "end word", 'E' => 'end word', '^e'=> "window down\nExtra line", 'f' => "fwd to char", -'F' => "back$sign{_}wd to char", +'F' => "back<>wd to char", '^f'=> "page down\npage Forward", 'g' => "extra cmds", -'G' => "eof/$sign{_}goto ln", +'G' => "eof/<>goto ln", '^g'=> ":file (info)", -'h' => $sign{left}, +'h' => "", 'H' => "screen top\nHome row", 'i' => "insert mode", 'I' => "insert at bol", '^i'=> "jump to newer\nIncrease position", -'j' => $sign{down}, +'j' => "", 'J' => "join lines", -'k' => $sign{up}, +'k' => "", 'K' => "help\nlooKup Keyword", -'l' => $sign{right}, +'l' => "", 'L' => "screen bottom\nLowermost Line", '^l'=> "redraw", 'm' => "set mark", -'M' => "screen mid$sign{_}dle", +'M' => "screen mid<>dle", 'n' => "next find", 'N' => "prev find", 'o' => "line below\nOpen", @@ -83,11 +83,11 @@ key => { '^o'=> "jump to older", 'p' => "paste after", 'P' => "paste before", -'q' => "rec$sign{_}ord macro\nQueue seQuence", +'q' => "rec<>ord macro\nQueue seQuence", 'Q' => "ex mode", '^q'=> "(xon)\nQome back", -'r' => "repl$sign{_}ace char", -'R' => "repl$sign{_}ace mode", +'r' => "repl<>ace char", +'R' => "repl<>ace mode", '^r'=> "redo", 's' => "subst char", 'S' => "subst line", @@ -103,74 +103,74 @@ key => { '^v'=> "visual block", 'w' => "next word", 'W' => 'next word', -'^w'=> "win$sign{_}dow cmds", +'^w'=> "win<>dow cmds", 'x' => "delete char", -'X' => "back$sign{_}space", -'^x'=> "subs$sign{_}tract", +'X' => "back<>space", +'^x'=> "subs<>tract", 'y' => "yank\n(copy)", 'Y' => "yank line", '^y'=> "window up\nYield", 'z' => "extra cmds", 'Z' => "quit", -'^z'=> ":sus$sign{_}pend\nzzz (as in sleep)", +'^z'=> ":sus<>pend\nzzz (as in sleep)", -'g~' => "case toggl$sign{_}e", -'g@' => "oper$sign{_}at$sign{_}or$sign{_}func", +'g~' => "case toggl<>e", +'g@' => "oper<>at<>or<>func", 'g#' => "rev. find string", -'g$' => "virt$sign{_}ual eol", -'g^' => qq'"soft" bol v$sign{_}irt$sign{_}ual', -'g&' => ":s rep$sign{_}eat glob$sign{_}al$sign{_}ly\nGlobal substitute", +'g$' => "virt<>ual eol", +'g^' => qq'"soft" bol v<>irt<>ual', +'g&' => ":s rep<>eat glob<>al<>ly\nGlobal substitute", 'g*' => "find string", 'g_' => qq'"soft" eol', 'g+' => "later undo", -'g`' => "to mark keepj$sign{_}umps", -'g8' => "char hex val$sign{_}ue$sign{_}s", +'g`' => "to mark keepj<>umps", +'g8' => "char hex val<>ue<>s", 'g0' => "virtual bol", 'g-' => "earlier undo", "g\e"=> "normal mode", 'g]' => "go to tselect", 'g^]'=> "go to tjump", 'g;' => "to prev change pos", -"g'" => "to mark keepj$sign{_}umps", +"g'" => "to mark keepj<>umps", 'g<' => "see prev cmd output", 'g?' => "rot13 encode", 'g,' => "to next change pos", 'ga' => "char value\nGet Ascii value", 'g^a'=> "mem usage stats", -'gd' => "local declar$sign{_}ation", -'gD' => "global declar$sign{_}ation", +'gd' => "local declar<>ation", +'gD' => "global declar<>ation", 'ge' => "back to word end", 'gE' => qq'back to word end', -'gf' => "edit file at cur$sign{_}sor\nGoto File", +'gf' => "edit file at cur<>sor\nGoto File", 'gF' => "edit file + jump", 'gg' => "first line", -'g^g'=> "cur$sign{_}sor pos info", +'g^g'=> "cur<>sor pos info", 'gh' => "select mode\nGet Highlighted", 'gH' => "select lines\nGet Highlighted", 'g^h'=> "select block\nGet Highlighted", 'gi' => "insert at last pos", 'gI' => "insert at soft bol", -'gj' => "$sign{down} screen", -'gJ' => "join leave spac$sign{_}ing", -'gk' => "$sign{up} screen", -'gm' => "cen$sign{_}ter screen", +'gj' => " screen", +'gJ' => "join leave spac<>ing", +'gk' => " screen", +'gm' => "cen<>ter screen", 'go' => ":goto (byte)", 'gp' => "paste still", 'gP' => "paste before still", -'gq' => "for$sign{_}mat", +'gq' => "for<>mat", 'gQ' => "ex mode manual :", -'gr' => "virt. repl$sign{_}ace char", -'gR' => "virt. repl$sign{_}ace mode", +'gr' => "virt. repl<>ace char", +'gR' => "virt. repl<>ace mode", 'gs' => "sleep\nGo to Sleep", 'gt' => "next tab\nGoto Tab", 'gT' => "tab back", -'gu' => "lower$sign{_}case", -'gU' => "up$sign{_}per$sign{_}case", -'gv' => "prev$sign{_}ious highl$sign{_}ight\nprecedinG Visual", -'gV' => "avoid resel$sign{_}ect$sign{_}ion", -'gw' => "for$sign{_}mat still", -'gx' => "Netrw$sign{_}BrowseX", +'gu' => "lower<>case", +'gU' => "up<>per<>case", +'gv' => "prev<>ious highl<>ight\nprecedinG Visual", +'gV' => "avoid resel<>ect<>ion", +'gw' => "for<>mat still", +'gx' => "Netrw<>BrowseX", "Z\e"=> "normal mode", 'ZQ' => " :q! (force)", @@ -179,116 +179,116 @@ key => { 'z^' => "page above", 'z+' => "page below", 'z-' => "line at bottom bol\ndon't (-) see any further", -'z=' => "sug$sign{_}gest spell$sign{_}ing", +'z=' => "sug<>gest spell<>ing", 'z.' => "line at center bol", "z\e"=> "normal mode", 'za' => "toggle fold", -'zA' => "toggle fold rec$sign{_}urs$sign{_}ive$sign{_}ly", +'zA' => "toggle fold rec<>urs<>ive<>ly", 'zb' => "line at bot. bol", 'zc' => "close fold", -'zC' => "close folds rec$sign{_}curs$sign{_}ive$sign{_}ly", +'zC' => "close folds rec<>curs<>ive<>ly", 'zd' => "delete fold", -'zD' => "delete folds rec$sign{_}urs$sign{_}ive", +'zD' => "delete folds rec<>urs<>ive", 'ze' => "cursor at right side", -'zE' => "elimi$sign{_}nate f$sign{_}olds", +'zE' => "elimi<>nate f<>olds", 'zf' => "create fold", 'zF' => "fold lines", -'zg' => "add spell$sign{_}ing\nGood word", -'zG' => "temp spell$sign{_}ing", -'zh' => "scroll $sign{left}", -'zH' => "scroll $sign{left} half scr$sign{_}een", +'zg' => "add spell<>ing\nGood word", +'zG' => "temp spell<>ing", +'zh' => "scroll ", +'zH' => "scroll half scr<>een", 'zi' => "toggle all folds", 'zj' => "next fold start", 'zk' => "prev fold end", -'zl' => "scroll $sign{right}", -'zL' => "scroll $sign{right} half scr$sign{_}een", +'zl' => "scroll ", +'zL' => "scroll half scr<>een", 'z^m'=> "line at top bol", 'zm' => "fold more", 'zM' => "close all folds", 'zn' => "fold none", -'zN' => "fold norm$sign{_}al", +'zN' => "fold norm<>al", 'zo' => "open fold", -'zO' => "open folds rec$sign{_}urs$sign{_}ive$sign{_}ly", +'zO' => "open folds rec<>urs<>ive<>ly", 'zr' => "reduce folding", 'zR' => "open all folds", 'zs' => "cursor at left side", 'zt' => "line at top", -'zu' => "undo spell$sign{_}ing", +'zu' => "undo spell<>ing", 'zv' => "unfold cursor line", -'zw' => "add missp$sign{_}ell$sign{_}ing\nWrong word", -'zW' => "temp missp$sign{_}ell$sign{_}ing", +'zw' => "add missp<>ell<>ing\nWrong word", +'zW' => "temp missp<>ell<>ing", 'zx' => "update folds", -'zX' => "re$sign{_}apply f$sign{_}olds", +'zX' => "re<>apply f<>olds", 'zz' => "line at center\nZee Zenter (with a funny accent)", "[`" => "previous lc mark", -'[#' => "previous open #if$sign{_}/#else", +'[#' => "previous open #if<>/#else", '[(' => "previous open (", -'[/' => "start of C com$sign{_}m$sign{_}ent", +'[/' => "start of C com<>m<>ent", '[{' => "previous open {", -'[[' => "section back$sign{_}ward$sign{_}s", +'[[' => "section back<>ward<>s", "[\e"=> "normal mode", -'[]' => qq'section back$sign{_}ward$sign{_}s', +'[]' => qq'section back<>ward<>s', -'[c' => "start of change backw$sign{_}ards", +'[c' => "start of change backw<>ards", '[d' => "define line", -'[D' => "defin$sign{_}ition", -'[^d'=> "to defin$sign{_}it$sign{_}ion", -'[i' => "first occur$sign{_}renc$sign{_}e line", -'[I' => "first occur$sign{_}renc$sign{_}e", -'[^i'=> "to first occur$sign{_}renc$sign{_}e", -'[m' => "start of funct$sign{_}ion", -'[p' => "P reind$sign{_}ent$sign{_}ed", +'[D' => "defin<>ition", +'[^d'=> "to defin<>it<>ion", +'[i' => "first occur<>renc<>e line", +'[I' => "first occur<>renc<>e", +'[^i'=> "to first occur<>renc<>e", +'[m' => "start of funct<>ion", +'[p' => "P reind<>ent<>ed", '[P' => "[p", -'[s' => "last missp$sign{_}ell$sign{_}ing", +'[s' => "last missp<>ell<>ing", '[S' => "last bad word", '[z' => "start of open fold", "]`" => "next lc mark", -']#' => "next open #endif$sign{_}/#else", +']#' => "next open #endif<>/#else", '])' => "next open )", -']/' => "end of C com$sign{_}m$sign{_}ent", -'][' => qq'section forw$sign{_}ard', +']/' => "end of C com<>m<>ent", +'][' => qq'section forw<>ard', "]\e"=> "normal mode", -']]' => "section forw$sign{_}ard", +']]' => "section forw<>ard", ']}' => "next open }", -']c' => "start of change forw$sign{_}ards", +']c' => "start of change forw<>ards", ']d' => "next define line", ']D' => "next define", ']^d'=> "to next define", -']i' => "next occur$sign{_}renc$sign{_}e line", -']I' => "next occur$sign{_}renc$sign{_}e", -']^i'=> "to occur$sign{_}renc$sign{_}e", -']m' => "end of funct$sign{_}ion", -']p' => "p reind$sign{_}ent$sign{_}ed", -']s' => "next missp$sign{_}ell$sign{_}ing", +']i' => "next occur<>renc<>e line", +']I' => "next occur<>renc<>e", +']^i'=> "to occur<>renc<>e", +']m' => "end of funct<>ion", +']p' => "p reind<>ent<>ed", +']s' => "next missp<>ell<>ing", ']S' => "next bad word", ']z' => "end of open fold", -'^w<' => "width decr$sign{_}ease", -'^w>' => "width incr$sign{_}ease", +'^w<' => "width decr<>ease", +'^w>' => "width incr<>ease", '^w^' => "split, edit alt file", '^w_' => "set height", -'^w+' => "height incr$sign{_}ease", -'^w-' => "height decr$sign{_}ease", +'^w+' => "height incr<>ease", +'^w-' => "height decr<>ease", '^w=' => "same height", "^w\e"=> "normal mode", '^w]' => "split, to tag", -'^w}' => "pre$sign{_}view tag", +'^w}' => "pre<>view tag", '^w|' => "set width", -'^wb' => "go to bot$sign{_}tom", +'^wb' => "go to bot<>tom", '^wc' => ":close", '^w^c'=> "abort", -'^wd' => "split, to def$sign{_}inition", +'^wd' => "split, to def<>inition", '^wf' => "split, file edit", '^wF' => "^wf, jump to line", '^wg' => "extra cmds", '^wh' => "go left", '^wH' => "move far left", -'^wi' => "split, to decl of id$sign{_}ent$sign{_}ifier", +'^wi' => "split, to decl of id<>ent<>ifier", '^wj' => "go down", '^wJ' => "move to bottom", '^wk' => "go up", @@ -297,69 +297,69 @@ key => { '^wL' => "move far right", '^wn' => "open new", '^wo' => ":only current", -'^wp' => "go to prev$sign{_}ious", -'^wP' => "go to pre$sign{_}view", +'^wp' => "go to prev<>ious", +'^wP' => "go to pre<>view", '^wq' => ":quit current", -'^wr' => "rotate down$sign{_}ward$sign{_}s", -'^wR' => "rotate up$sign{_}ward$sign{_}s", -'^ws' => "split horiz$sign{_}ont$sign{_}al$sign{_}ly", +'^wr' => "rotate down<>ward<>s", +'^wR' => "rotate up<>ward<>s", +'^ws' => "split horiz<>ont<>al<>ly", '^wt' => "go to top", -'^wv' => "split vert$sign{_}ic$sign{_}al$sign{_}ly", +'^wv' => "split vert<>ic<>al<>ly", '^ww' => "go to next\nWrap around", -'^wW' => "go above$sign{_}/left", -'^wx' => "ex$sign{_}chan$sign{_}ge", -'^wz' => "close pre$sign{_}view", +'^wW' => "go above<>/left", +'^wx' => "ex<>chan<>ge", +'^wz' => "close pre<>view", "^wg\e"=> "normal mode", -'^wg]' => "split, :ts$sign{_}elect", -'^wg}' => ":ptj$sign{_}ump to tag", -'^wg^]'=> "split, :tj$sign{_}ump", +'^wg]' => "split, :ts<>elect", +'^wg}' => ":ptj<>ump to tag", +'^wg^]'=> "split, :tj<>ump", '^wgf' => "file in tab", -'^wgF' => "^wgf, to line$sign{_}nr", +'^wgF' => "^wgf, to line<>nr", 'v!' => "external filter", 'v:' => "cmd on range", -'v<' => "un$sign{_}indent", -'v=' => "re$sign{_}ind$sign{_}ent", -'v>' => "ind$sign{_}ent", +'v<' => "un<>indent", +'v=' => "re<>ind<>ent", +'v>' => "ind<>ent", 'v~' => "toggle case", "v\e"=> "normal mode", 'v^]'=> "jump to tag", -'va' => "ex$sign{_}tend area", -'vA' => "ap$sign{_}pend to block", # block -'vc' => "repl$sign{_}ace area", -'vC' => "repl$sign{_}ace full lines", # like vS, but blocks are extended until eol +'va' => "ex<>tend area", +'vA' => "ap<>pend to block", # block +'vc' => "repl<>ace area", +'vC' => "repl<>ace full lines", # like vS, but blocks are extended until eol 'v^c'=> "abort", 'vd' => "delete area", 'vD' => "delete lines", 'vg' => "extra cmds", 'v^g'=> "select mode", -'v^h'=> "back$sign{_}space", # delete in select mode, left otherwise -'vi' => "extend inner a$sign{_}r$sign{_}ea", +'v^h'=> "back<>space", # delete in select mode, left otherwise +'vi' => "extend inner a<>r<>ea", 'vI' => "insert to block", # block 'vJ' => "join lines", -'vK' => "help sel$sign{_}ect$sign{_}ion", +'vK' => "help sel<>ect<>ion", 'vo' => "to other corner", 'vO' => "to other side", 'v^o'=> "visual once", # select -'vp' => "repl$sign{_}ace w/ paste", -'vP' => "repl$sign{_}ace w/ paste", -'vr' => "fill up w/ ch$sign{_}ar", -'vS' => "repl$sign{_}ace lines", -'vu' => "lower$sign{_}case", -'vU' => "upper$sign{_}case", -'vv' => "char$sign{_}wise", -'vV' => "line$sign{_}wise", -'v^v'=> "block$sign{_}wise", +'vp' => "repl<>ace w/ paste", +'vP' => "repl<>ace w/ paste", +'vr' => "fill up w/ ch<>ar", +'vS' => "repl<>ace lines", +'vu' => "lower<>case", +'vU' => "upper<>case", +'vv' => "char<>wise", +'vV' => "line<>wise", +'v^v'=> "block<>wise", 'vy' => "yank area", 'vY' => "yank lines", "vg\e"=> "visual mode", 'vg?' => "rot13 encode", -'vgJ' => "join literal$sign{_}ly", -'vgq' => "for$sign{_}mat", -'vgw' => "for$sign{_}mat still", +'vgJ' => "join literal<>ly", +'vgq' => "for<>mat", +'vgw' => "for<>mat still", "va'" => "quoted string", 'va<' => "<> block", @@ -368,8 +368,8 @@ key => { 'vab' => "() block", 'vaB' => "{} Block", -'vap' => "para$sign{_}graph", -'vas' => "senten$sign{_}ce", +'vap' => "para<>graph", +'vas' => "senten<>ce", 'vat' => "xml tag block", 'vaw' => "word", 'vaW' => 'word', @@ -384,60 +384,60 @@ key => { #'c^p' => "complete", #todo #'c^r' => \'i^r', # and then some... # ## "insert register", -#'c^y' => "selec$sign{_}tion to clip$sign{_}b$sign{_}oard", +#'c^y' => "selec<>tion to clip<>b<>oard", 'i^@' => "last insert", -'i^^' => "toggle :lmap usag$sign{_}e", +'i^^' => "toggle :lmap usag<>e", "i\e" => "normal mode", -'i^]' => "abbrev$sign{_}iate", -'i^_' => "toggle lang$sign{_}uage", +'i^]' => "abbrev<>iate", +'i^_' => "toggle lang<>uage", -'i^a' => "insert prev$sign{_}ious", +'i^a' => "insert prev<>ious", 'i^b' => "former i^_", 'i^c' => "abort, no abbr", -'i^d' => "un$sign{_}ind$sign{_}ent", +'i^d' => "un<>ind<>ent", 'i^e' => "ins char below", -'i^f' => "set indent$sign{_}ation", +'i^f' => "set indent<>ation", 'i^g' => "extra cmds", -'i^h' => "back$sign{_}space", +'i^h' => "back<>space", 'i^i' => "tab", 'i^j' => "enter", -'i^k' => "di$sign{_}graph\nKey code", +'i^k' => "di<>graph\nKey code", 'i^l' => "im leave ins mode", 'i^m' => "enter", 'i^n' => "find next keyword", -'i^o' => "exec$sign{_}ute cmd", +'i^o' => "exec<>ute cmd", 'i^p' => "find prev keyword", -'i^r' => "insert reg$sign{_}ister", +'i^r' => "insert reg<>ister", 'i^t' => "indent", 'i^u' => "delete line", -'i^v' => "literal or ch$sign{_}ar$sign{_}cod$sign{_}e\nVerbatim or by Value", +'i^v' => "literal or ch<>ar<>cod<>e\nVerbatim or by Value", 'i^w' => "delete word back", -'i^x' => "ex$sign{_}pand mode", +'i^x' => "ex<>pand mode", 'i^y' => "ins char above", -'i^z' => ":sus$sign{_}pend in im", +'i^z' => ":sus<>pend in im", "i^g\e"=> "insert mode", -'i^gk' => "$sign{up} start col$sign{_}umn", -'i^gj' => "$sign{down} start col$sign{_}umn", -'i^gu' => "break undo seq$sign{_}uence", +'i^gk' => " start col<>umn", +'i^gj' => " start col<>umn", +'i^gu' => "break undo seq<>uence", # other i^g keys (even esc) are not recognized "i^x\e" => "normal mode", -'i^x^]' => "tag comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^d' => "def$sign{_}ine compl$sign{_}et$sign{_}e", +'i^x^]' => "tag comp<>l<>et<>e", +'i^x^d' => "def<>ine compl<>et<>e", 'i^x^e' => "window up", -'i^x^f' => "file comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^i' => "ident comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^k' => "dict comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^l' => "line comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^n' => "next comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^o' => "omni comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^p' => "prev comp$sign{_}l$sign{_}ete", -'i^x^s' => "spell sugg$sign{_}est", -'i^x^t' => "thes$sign{_}aur$sign{_}us compl$sign{_}et$sign{_}e", -'i^x^u' => "cus$sign{_}tom comp$sign{_}l$sign{_}et$sign{_}e", -'i^x^v' => "ex cmd compl$sign{_}et$sign{_}e", +'i^x^f' => "file comp<>l<>et<>e", +'i^x^i' => "ident comp<>l<>et<>e", +'i^x^k' => "dict comp<>l<>et<>e", +'i^x^l' => "line comp<>l<>et<>e", +'i^x^n' => "next comp<>l<>et<>e", +'i^x^o' => "omni comp<>l<>et<>e", +'i^x^p' => "prev comp<>l<>ete", +'i^x^s' => "spell sugg<>est", +'i^x^t' => "thes<>aur<>us compl<>et<>e", +'i^x^u' => "cus<>tom comp<>l<>et<>e", +'i^x^v' => "ex cmd compl<>et<>e", 'i^x^y' => "window down", # XXX ex mode if you want to go completely wild @@ -463,7 +463,7 @@ mode => { flag => { ci => ["info", "Info command: shows/does something without altering anything."], - pm => ["motion", "Moves the cursor, or defines the range for an operator ($sign{motion})."], + pm => ["motion", "Moves the cursor, or defines the range for an operator ()."], po => ["positioning", "Other movement (jumps, window (re)positioning)."], co => ["command", "Direct action command."], mi => ["ins mode", "Enters Insert or Replace mode."], @@ -471,8 +471,8 @@ flag => { mv => ["vis mode", "Enters Visual or Select mode."], me => ["key cmd", "Additional key commands (click for overview)."], - arg => ["key$sign{arg}", "Commands with a dot need a char argument afterwards."], - motion => ["key$sign{motion}", "Requires a motion afterwards, operates between cursor and destination."], + arg => ["key", "Commands with a dot need a char argument afterwards."], + motion => ["key", "Requires a motion afterwards, operates between cursor and destination."], 'ext vim6' => ["vim", "Not in original Vi (assessment incomplete)."], 'ext new vim7' => ["vim7", "New in vim version 7.x."], }, diff --git a/vimperator.eng.inc.pl b/vimperator.eng.inc.pl index 0aa3945..9ca14cc 100644 --- a/vimperator.eng.inc.pl +++ b/vimperator.eng.inc.pl @@ -2,7 +2,7 @@ use utf8; { key => { - '~' => "open home$sign{_}dir", + '~' => "open home<>dir", '@' => "play macro", '^' => "left of page", '$' => "right of page", @@ -11,40 +11,40 @@ key => { '^^'=> "last tab", '?' => "find rev.", '/' => "find", - '[' => "focus forw$sign{_}ard", + '[' => "focus forw<>ard", ']' => "focus back", - ':' => "comm$sign{_}and line mode", - ';' => "extend$sign{_}ed hint$sign{_}s mode", + ':' => "comm<>and line mode", + ';' => "extend<>ed hint<>s mode", "'" => "jump to mark", '|' => "toggle source", - 'a' => "add bookm$sign{_}ark", - 'A' => "toggle bookm$sign{_}ark$sign{_}ed", - '^a'=> "incr$sign{_}em$sign{_}ent url nr", + 'a' => "add bookm<>ark", + 'A' => "toggle bookm<>ark<>ed", + '^a'=> "incr<>em<>ent url nr", 'b' => "to buffer", 'B' => "list buffers", '^b'=> "page up", '^c'=> "stop loading", '^d'=> "scroll down", 'd' => "close tab", - 'D' => "close tab left$sign{_}ward$sign{_}s", + 'D' => "close tab left<>ward<>s", 'i' => "caret mode", - 'f' => "quick$sign{_}hint mode", + 'f' => "quick<>hint mode", 'F' => "f in tab", '^f'=> "page down", 'g' => "extra cmds", 'G' => "last/% line", '^g'=> "file name", - 'h' => $sign{left}, + 'h' => "", 'H' => "page back", - 'j' => $sign{down}, - 'k' => $sign{up}, - 'l' => $sign{right}, - 'L' => "page forw$sign{_}ard", + 'j' => "", + 'k' => "", + 'l' => "", + 'L' => "page forw<>ard", 'M' => "mark url", 'm' => "mark line", 'n' => "find next", - 'N' => "find prev$sign{_}ious", + 'N' => "find prev<>ious", '^n'=> "next tab", 'o' => "open", 'O' => "alter url", @@ -52,18 +52,18 @@ key => { 'P' => "p in tab", 'q' => "record macro", 'r' => "reload page", - 'R' => "reload uncach$sign{_}e$sign{_}d", + 'R' => "reload uncach<>e<>d", 't' => "tab open new", - 'T' => "tab open curr$sign{_}ent", + 'T' => "tab open curr<>ent", '^v'=> "pass single", '^u'=> "scroll up", 'u' => "restore closed tab", - '^x'=> "decr$sign{_}em$sign{_}ent url nr", + '^x'=> "decr<>em<>ent url nr", 'y' => "copy url", - 'Y' => "copy select$sign{_}ion", + 'Y' => "copy select<>ion", 'z' => "zoom", 'Z' => "quit", - '^z'=> "pass throu$sign{_}gh", + '^z'=> "pass throu<>gh", 'g0' => "first tab", 'g$' => "last tab", @@ -71,18 +71,18 @@ key => { 'gb' => "repeat buffer cmd", 'gB' => "reverse gb", 'gf' => "view source", - 'gF' => "source extern$sign{_}al", + 'gF' => "source extern<>al", 'g^g'=> "file details", 'gg' => "first line", - 'gh' => "open home$sign{_}page", - 'gH' => "tab with home$sign{_}page", + 'gh' => "open home<>page", + 'gH' => "tab with home<>page", 'gi' => "last input field", 'gn' => "tabopen url mark\nGo in New tab", 'go' => "open url mark", - 'gP' => "$sign{alias}P inactive", + 'gP' => "P inactive", 'gt' => "switch tab", 'gT' => "tab back", - 'gu' => "parent dir$sign{_}ectory", + 'gu' => "parent dir<>ectory", 'gU' => "site root", ';;' => "focus", @@ -100,19 +100,19 @@ key => { ';t' => "open in tab", ';T' => "tab prompt", ';v' => "view source", - ';w' => "open in wind$sign{_}ow", - ';W' => "wind$sign{_}ow prompt", + ';w' => "open in wind<>ow", + ';W' => "wind<>ow prompt", ';y' => "copy url", ';Y' => "copy text", - ']f' => "next frame$sign{_}set", + ']f' => "next frame<>set", ']]' => "open next", - '[f' => "previous frame$sign{_}set", + '[f' => "previous frame<>set", '[[' => "open prev", - 'zi' => "en$sign{_}large text\nZoom In", - 'zm' => "en$sign{_}large more\nZoom More", + 'zi' => "en<>large text\nZoom In", + 'zm' => "en<>large more\nZoom More", 'zo' => "shrink text\nZoom Out", 'zr' => "tinier text\nZoom Reduce", 'zz' => "reset text size\nZoom Zero", @@ -123,7 +123,7 @@ key => { 'zZ' => "zoom reset\nZoom Zero", 'ZQ' => "quit no save", - 'ZZ' => "quit save ses$sign{_}s$sign{_}ion", + 'ZZ' => "quit save ses<>s<>ion", }, mode => { @@ -147,8 +147,8 @@ flag => { mv => ['mode' => "Enter a different mode."], me => ['key cmd' => "Additional key commands (click for overview)."], - arg => ["key$sign{arg}" => "Commands with a dot need a char argument afterwards."], - args => ["key$sign{args}" => "Commands with two dots require variable arguments afterwards."], + arg => ["key" => "Commands with a dot need a char argument afterwards."], + args => ["key" => "Commands with two dots require variable arguments afterwards."], }, } -- 2.30.0