lib-renderline: Introduce word-wrap.

If word-wrap is set, make all spaces wrap-points, except at the start of
the line.
Enable this in email reading, and in mark-down.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/Developer/06-rendering.md b/DOC/Developer/06-rendering.md
index 9ee9424e2d2f6f0cc62c0cf9f38e1c359ae640a6..780b3747eddd877ed82aac97b168ab7f484c6fb8 100644 (file)
--- a/DOC/Developer/06-rendering.md
+++ b/DOC/Developer/06-rendering.md
@@ -289,6 +289,10 @@ found in the stack:
 - "prefix" - This marked-up text will be display first.  It will not be
   shifted even when the main text is shifted left.
 
+- "word-wrap" - This can be "0" or non-zero.  If non-zero then text
+  is wrapped on white-space (space, tab, any UNICODE space) that is not
+  at the start of the line.
+
 The pane also sets some attributes when handling these messages:
 
 - "prefix_len" - the length of the appearance of the prefix

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 8a912fbc18203a5b6206e2a5ee100619d5afb1e5..8e899127cedf90f2258a7731fdead4eac69c903a 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -21,6 +21,7 @@ Current priorities
 - [ ] use common UI for dynamic abbrev and spell (and more?)
 - [ ] Finish render-lines rewrite
 
+- [ ] word-wrap subject (only) in email summary line
 - [ ] switch-buffer in pop-up window - shouldn't kill the popup
 - [ ] file in pop-up window in 'view' mode by default
       From 'grep' this is probably OK.  For Cx-44, it isn't.
@@ -48,6 +49,9 @@ Current priorities
 - [ ] whitespace: don't show errors unless doc has been changed.???
 - [ ] mailto: links should be sent to nm (if active)
 - [ ] press K:Enter on a link should do something
+- [ ] Maybe "word-wrap" should be a list of characters to wrap on??
+      But I might want "comma and following spaces".  How do I say that?
+      Possibly declare some chars that cause a map-attr callback??
 
 - [ ] split notmuch into two databases, last 6 months and the rest.
 - [ ] script to move messages every week - but not deleted messages
@@ -106,7 +110,7 @@ Bugs to be fixed
       autoloads.  I need a complete redesign of autoload
 - [ ] use mimetypes.guess_type() to interpret filenames in email attachments??
 - [ ] don't allow non-text email parts to appear as text.  Maybe hex??
-- [ ] word-wrap all text in email display
+- [X] word-wrap all text in email display
 - [X] rexel should include the charset id in the rxl, not keep it static.
 - [X] search for "\s" loops infinitely. - is currently on several spaces
 - [ ] ->replace_pane, ->replace_popup can be deleted (Abort) but we
@@ -159,6 +163,8 @@ Bugs to be fixed
       to edit at end-of-file
 - [ ] When viewing a diff which pages of "+" (at the end), refresh is quite slow
 - [ ] repeated alarm(10)/alarm(0) calls slow things down
+- [ ] if the first char if a line is marked for <wrap> it disappears
+      without cursor.  This is bad.
 
 Requirements for a v1.0 release
 -------------------------------
@@ -563,7 +569,7 @@ Module features
 - [ ] when I unhide an email part which is a single v.long line,
     redraw gets confused and point goes off-screen, which seems
     to leave it confused.
-- [ ] in text/plain, wrap long lines on 'space'. - make this a config in lib-markup
+- [X] in text/plain, wrap long lines on 'space'. - make this a config in lib-markup
 - [ ] maybe hide signature, unless small
 - [ ] When click on first char in tagged range, I don't see the tag and
    don't get a Mouse-Activate event.

diff --git a/lib-renderline.c b/lib-renderline.c
index 989de357f5ba13505fd02dbeaefb3905e3cb1df5..e926d383fe754f87012f643fc75e43b12e8c5520 100644 (file)
--- a/lib-renderline.c
+++ b/lib-renderline.c
@@ -24,6 +24,7 @@
 #define _GNU_SOURCE /*  for asprintf */
 #include <stdio.h>
 #include <ctype.h>
+#include <wctype.h>
 #include "core.h"
 #include "misc.h"
 
@@ -31,6 +32,9 @@ struct render_list {
        struct render_list *next;
        const char      *text_orig;
        const char      *text safe, *attr safe; // both are allocated
+       bool            wrap; /* set for LWS when word-wrap enabled, and when
+                              * "wrap" attr seen.
+                              */
        short           x, width;
        short           cursorpos;
        const char      *xypos; /* location in text_orig where given x,y was found */
@@ -54,7 +58,8 @@ static int draw_some(struct pane *p safe, struct pane *focus safe,
                     struct render_list **rlp safe,
                     int *x safe,
                     const char *start safe, const char **endp safe,
-                    const char *attr safe, int margin, int cursorpos, int xpos,
+                    const char *attr safe, bool wrap,
+                    int margin, int cursorpos, int xpos,
                     int scale)
 {
        /* Measure the text from 'start' to '*endp', expecting to
@@ -82,9 +87,12 @@ static int draw_some(struct pane *p safe, struct pane *focus safe,
        if (len == 0 && cursorpos < 0)
                /* Nothing to do */
                return OK;
+
+       if (!wrap && strstr(attr, ",wrap,"))
+               wrap = True;
        if ((*rlp == NULL ||
             ((*rlp)->next == NULL && (*rlp)->text_orig == NULL)) &&
-           strstr(attr, ",wrap,") && cursorpos < 0)
+           wrap && cursorpos < 0)
                /* The text in a <wrap> marker that causes a wrap is
                 * suppressed unless the cursor is in it.
                 * This will only ever be at start of line.  <wrap> text
@@ -132,6 +140,7 @@ static int draw_some(struct pane *p safe, struct pane *focus safe,
        rl->text_orig = start;
        rl->text = str;
        rl->attr = strdup(attr);
+       rl->wrap = wrap;
        rl->width = cr.x;
        rl->x = *x;
        *x += rl->width;
@@ -199,7 +208,7 @@ static int flush_line(struct pane *p safe, struct pane *focus safe, int dodraw,
        if (!*rlp)
                return 0;
        for (rl = *rlp; wrap_pos && rl; rl = rl->next) {
-               if (strstr(rl->attr, ",wrap,") && rl != *rlp) {
+               if (rl->wrap && rl != *rlp) {
                        if (!in_wrap) {
                                last_wrap = rl;
                                in_wrap = 1;
@@ -638,7 +647,10 @@ DEF_CMD(renderline)
        int wrap_margin = 0; /* left margin for wrap - carried forward from
                              * line to line. */
        int in_tab = 0;
-       int shift_left = atoi(pane_attr_get(focus, "shift_left") ?:"0");
+       int shift_left = pane_attr_get_int(focus, "shift_left", 0);
+       bool word_wrap = pane_attr_get_int(focus, "word-wrap", 0) != 0;
+       bool in_lws = False;
+       bool seen_non_space = False;
        int wrap = shift_left < 0;
        char *prefix = pane_attr_get(focus, "prefix");
        int line_height = 0;
@@ -696,7 +708,7 @@ DEF_CMD(renderline)
                const char *s = prefix + strlen(prefix);
                update_line_height_attr(p, focus, &line_height, &ascent, NULL,
                                        "bold", prefix, scale);
-               draw_some(p, focus, &rlst, &x, prefix, &s, ",bold,",
+               draw_some(p, focus, &rlst, &x, prefix, &s, ",bold,", False,
                          0, -1, -1, scale);
                rd->prefix_len = x + shift_left;
        } else
@@ -815,21 +827,45 @@ DEF_CMD(renderline)
                if (line == line_start + offset)
                        rd->curs_width = mwidth;
                if (ch >= ' ' && ch != '<') {
+                       bool was_in_lws = in_lws;
                        line += 1;
                        /* Only flush out if string is getting a bit long.
                         * i.e.  if we have reached the offset we are
                         * measuring to, or if we could have reached the
                         * right margin.
+                        * Alternately, if we are doing word-wrap and we
+                        * have found start or end of a word.
                         */
                        if ((*line & 0xc0) == 0x80)
                                /* In the middle of a UTF-8 */
                                continue;
+                       if (word_wrap) {
+                               wint_t wch = ch;
+                               const char *trimmed_line = line - 1;
+                               if (ch & 0x80) {
+                                       const char *l = start + utf8_round_len(start, trimmed_line-start);
+                                       trimmed_line = l;
+                                       wch = get_utf8(&l, NULL);
+                               }
+                               if (!iswspace(wch)) {
+                                       seen_non_space = True;
+                                       if (in_lws)
+                                               line = trimmed_line;
+                                       in_lws = False;
+                               } else if (!in_lws&& seen_non_space && iswspace(wch)) {
+                                       in_lws = True;
+                                       line = trimmed_line;
+                               }
+                       }
                        if (offset == (line - line_start) ||
                            (line-start) * mwidth >= p->w - x ||
-                           (posx > x && (line - start)*mwidth > posx - x)) {
+                           (posx > x && (line - start)*mwidth > posx - x) ||
+                           was_in_lws != in_lws
+                       ) {
                                ret = draw_some(p, focus, &rlst, &x, start,
                                                &line,
                                                buf_final(&attr),
+                                               was_in_lws,
                                                wrap ? mwidth : 0,
                                                offset - (start - line_start),
                                                posx, scale);
@@ -838,7 +874,7 @@ DEF_CMD(renderline)
                        continue;
                }
                ret = draw_some(p, focus, &rlst, &x, start, &line,
-                               buf_final(&attr),
+                               buf_final(&attr), in_lws,
                                wrap ? mwidth : 0,
                                in_tab ?:offset - (start - line_start),
                                posx, scale);
@@ -848,8 +884,9 @@ DEF_CMD(renderline)
                if (ch == '<') {
                        line += 1;
                        if (*line == '<') {
+                               in_lws = False;
                                ret = draw_some(p, focus, &rlst, &x, start, &line,
-                                               buf_final(&attr),
+                                               buf_final(&attr), in_lws,
                                                wrap ? mwidth : 0,
                                                in_tab ?:offset - (start - line_start),
                                                posx, scale);
@@ -924,8 +961,10 @@ DEF_CMD(renderline)
                        int xc = (wrap_offset + x) / mwidth;
                        /* Note xc might be negative, so "xc % 8" won't work here */
                        int w = 8 - (xc & 7);
+                       if (seen_non_space)
+                               in_lws = True;
                        ret = draw_some(p, focus, &rlst, &x, start, &line,
-                                       buf_final(&attr),
+                                       buf_final(&attr), in_lws,
                                        wrap ? mwidth*2: 0,
                                        offset == (start - line_start)
                                        ? in_tab : -1,
@@ -945,8 +984,9 @@ DEF_CMD(renderline)
                        buf[2] = 0;
                        b = buf+2;
                        buf_concat(&attr, ",underline,fg:red,");
+                       in_lws = False;
                        ret = draw_some(p, focus, &rlst, &x, buf, &b,
-                                       buf_final(&attr),
+                                       buf_final(&attr), in_lws,
                                        wrap ? mwidth*2: 0,
                                        offset - (start - line_start),
                                        posx, scale);
@@ -964,7 +1004,7 @@ DEF_CMD(renderline)
                        posx = -1;
 
                draw_some(p, focus, &rlst, &x, start, &line,
-                         buf_final(&attr),
+                         buf_final(&attr), False,
                          wrap ? mwidth : 0, offset - (start - line_start),
                          posx, scale);
        }

diff --git a/python/config.py b/python/config.py
index e51548c159cecd0fa71c3275b32f521b017b7bf6..5df740d029874efdc676d651a13a76f8cdbf9cd9 100644 (file)
--- a/python/config.py
+++ b/python/config.py
@@ -28,6 +28,7 @@ def config_appeared(key, focus, **a):
         else:
             focus.call("doc:append:view-default", ",textfill,whitespace,autospell")
         focus["fill-width"] = "72"
+        focus["word-wrap"] = "1"
         focus["fill:start-re"] = ("^("
                                   "[^a-zA-Z0-9\\n]*$|" # empty/puctuation line
                                   " *-|"               # list item

diff --git a/python/module-notmuch.py b/python/module-notmuch.py
index 5d4c45841c5e4261b3d2a46dbc8afd0675fd72f5..c3b2c42da2e33267ccf56458b0654e6f69ba8133 100644 (file)
--- a/python/module-notmuch.py
+++ b/python/module-notmuch.py
@@ -3102,6 +3102,8 @@ class notmuch_message_view(edlib.Pane):
         self.have_prev = False
         self.call("doc:request:mark:moving")
 
+        self['word-wrap'] = '1' # Should this be different in different parts?
+
         choose = {}
         m = edlib.Mark(focus)
         while True:

diff --git a/tests.d/00-basic b/tests.d/00-basic
index 0a7b3595ebc93b498588025a981e4160fe1133da..34b74de75c3073ddae8b169d433ff2b3d6c74ae0 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -162,7 +162,7 @@ Display 80,30 52A1D57F778AF3B6D8401C75EFD32183 6,7
 Key ":A-0"
 Display 80,30 00BF59DCCD2402BDF95916B26B5F8C56 6,7
 Key ":C-V"
-Display 80,30 1D07C0D97E2D7722A66F0A9C5CD69452 6,0
+Display 80,30 AF2A0CF0F52B181C077EE11D3288F41B 6,0
 Key ":A-<"
 Display 80,30 8F30DCB483C65D442FBEFA53E624FBB8 1,0
 Key ":A->"
@@ -496,23 +496,23 @@ Display 80,30 18FE585A658E38C1054418396CDDD8F4 39,12
 Key ":C-X"
 Display 80,30 1DDA3EB8BD545775122754FBB14890C3 39,12
 Key "-3"
-Display 80,30 93BAD10AE18F56D18B91321564552127 1,22
+Display 80,30 4425CE52CD5A81D5229798940048C51E 1,22
 Key ":C-X"
-Display 80,30 6FE2505BEADCA467A26B52AD9327C82E 1,22
+Display 80,30 03F2BF2B224BBADB9E75582C0E6AA757 1,22
 Key "-2"
-Display 80,30 937F9E6FE92662C7EC3C4A5DBF5BD72B 1,6
+Display 80,30 1FEDB4DD12EA32BB1D17BCA16206CF9B 1,6
 Key ":C-X"
-Display 80,30 3C2F1BCA3B334FEE24EBC489AAD872E4 1,6
+Display 80,30 1AD9BF42BFFD42D681A496C9DDB953C7 1,6
 Key "-3"
-Display 80,30 AD4FD5B6F4035A924BD22ABD2A8E74BD 3,13
+Display 80,30 D0CF1DA86303D064C9F1AE801D7D78D1 5,12
 Key ":C-X"
-Display 80,30 46337993C95581637BE2B49B68DBF0CD 3,13
+Display 80,30 01CA85EACF31394601C1CAAE1E18F2B8 5,12
 Key "-1"
-Display 80,30 0C795A70D27A442720F40EF69DA0CBC1 1,6
+Display 80,30 F8A3DAE457BDDA2A77CA2497866396C0 1,5
 Key "-1"
-Display 80,30 CE7447128644DDFEF07F68051B9794F4 1,6
+Display 80,30 AA7C15947078EAA89C0CBAB58A931FD5 1,5
 Key ":C-X"
-Display 80,30 216BE107057E64F0A88488E69779BE01 1,6
+Display 80,30 9E98619598E1956593E790204F1F985A 1,5
 Key "-0"
 Display 80,30 364DEA58754FE5A8DBB8D97B3E42095B 39,6
 Key ":C-P"
@@ -605,4 +605,4 @@ Key ":C-X"
 Display 80,30 84F4B35BF26F9D5EEBB67D572ADD0BBF 1,0
 Key ":C-C"
 Display 80,30 4790F2887DC559E9927F4059D9F4365D 1,0
-Close 1534
+Close 1531

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index 75ab7a29aa633266b45312fbedf759ae1a3be881..eb7a808a397fb9e790b89d880f88a53508974b8e 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -14,30 +14,30 @@ Display 80,30 65D38912E152D9A94769EDDEB3071090 51,13
 Key ":Tab"
 Display 80,30 6991E8A38B8624A9F11C41F69D334015 50,13
 Key ":Enter"
-Display 80,30 130FAB671C1565B268B62804D3B59FB3 1,0
+Display 80,30 562B6885C13C5F734242568965D3C2CB 1,0
 Mouse ":Press-1" 20,17
-Display 80,30 41A4216D09ECB16972A7B29435E5850A 20,17
+Display 80,30 0F7EAF652C24578C47F0C3432B868C1E 20,17
 Mouse ":Release-1" 20,17
 Mouse ":Press-1" 60,16
-Display 80,30 3C69CCE7B7DFA20AEB9AF11F2C159A85 60,16
+Display 80,30 5F2D2593F520941A5414515217A760A9 60,16
 Mouse ":Release-1" 60,16
 Key ":C-E"
-Display 80,30 EFCB815FE98A2D42B37F6E159FAFD221 76,16
+Display 80,30 178F128D102F096777B8293EF8909A0C 76,16
 Mouse ":Press-1" 66,13
-Display 80,30 CB843509472F61D00CEC51514C1F1FDF 66,13
+Display 80,30 6FA984463764150D5EECCC5E37A2EB05 66,13
 Mouse ":Release-1" 66,13
 Mouse ":Press-1" 65,22
-Display 80,30 4B89233E9971BCEE6EAC5FE2FDF8AFF2 65,22
+Display 80,30 E866A95289367EA6DDE64164CAF69E32 65,22
 Mouse ":Release-1" 65,22
 Mouse ":Press-1" 60,11
-Display 80,30 B728B4232C21208D3DC7B45FF4C7B19C 60,11
+Display 80,30 40A3D58AAFB06F59089C5BE234A5F5E0 60,11
 Mouse ":Release-1" 60,20
-Display 80,30 4C376FF775364EDE0B8146B0265C61C6 60,20
+Display 80,30 8E8082504996C7B67C722FA28FD8C9D3 60,20
 Mouse ":Press-1" 17,7
-Display 80,30 8B131BD244BF7FF05079B271F78832C2 17,7
+Display 80,30 1C10965CDBF1E3EC69BAFF211EBB3F50 17,7
 Mouse ":Release-1" 17,20
-Display 80,30 8CC5BC6FFCACFE766D80F1D9549D3507 17,20
+Display 80,30 077B19693D60222586F389C4E4540CDD 17,20
 Mouse ":Press-1" 8,4
-Display 80,30 B49EF63C805ECB6DEA21C57F632AE9A3 8,4
+Display 80,30 FE6ECE58AD651C8EFEB99547303F5181 8,4
 Mouse ":Release-1" 8,4
 Close 223

diff --git a/tests.d/01-textfill b/tests.d/01-textfill
index 0fb96766ccbebd57cb7d59890c77f23345fd678a..2107154d17b3dd0c21b28122235ea271b9884294 100644 (file)
--- a/tests.d/01-textfill
+++ b/tests.d/01-textfill
@@ -40,7 +40,7 @@ Display 80,30 3267DBA94D2C8BA146C7816E43F4F227 67,10
 Key ":C-D"
 Display 80,30 63B9564F6A5BD2DDEA280212C9E7474A 67,10
 Key "- "
-Display 80,30 CA5821BB49AE8CFFBA3E9EB43125A527 68,10
+Display 80,30 33CE2FE921502609852CA854B5B1E25F 68,10
 Key ":A-q"
 Display 80,30 00BB9109EB9CACB57CE28D71D3165ADC 1,11
 Key ":C-N"
@@ -52,407 +52,406 @@ Display 80,30 2EC19FCF440300548AF919755DE08936 1,14
 Key ":Backspace"
 Display 80,30 ED81581F8B4B99472DB0B50454C57C73 69,13
 Key "- "
-Display 80,30 1CE7F427E2E88EB54686B1083884CDAB 70,13
+Display 80,30 2320F2149D76199CF1D6FD25F71541AF 1,14
 Key ":C-N"
-Display 80,30 1FF7EA39240C791E8918B3549A51EF80 66,15
+Display 80,30 3CE82BC5C779C4FF5526516B5CA7C542 1,15
 Key ":C-D"
-Display 80,30 7CEC8ADE0E3F081138816DCB9D34E3D6 66,15
+Display 80,30 39946F9E7E0408C9FFB963D599076E34 1,15
 Key "- "
-Display 80,30 3851DE59F70637BD5521E9F71059B3C4 67,15
+Display 80,30 9E4154D4F8672A3FCB9B5E27F3B827E6 2,15
 Key ":C-N"
-Display 80,30 08E0BE29B262EEF632E22631956CDD81 31,17
+Display 80,30 D5AF8447DACCCAE2361C1955E3E073CE 2,16
 Key ":C-F"
-Display 80,30 E2B7A1F840BF5CDD388F261658AEB723 1,18
+Display 80,30 D5AF8447DACCCAE2361C1955E3E073CE 3,16
 Key ":C-P"
-Display 80,30 08E0BE29B262EEF632E22631956CDD81 1,17
+Display 80,30 9E4154D4F8672A3FCB9B5E27F3B827E6 3,15
 Key ":C-P"
-Display 80,30 3851DE59F70637BD5521E9F71059B3C4 1,15
+Display 80,30 4E5968B57C8295959035A8AB21D0DBF7 3,13
 Key ":C-E"
-Display 80,30 3851DE59F70637BD5521E9F71059B3C4 52,16
+Display 80,30 4E5968B57C8295959035A8AB21D0DBF7 70,14
 Key ":C-D"
-Display 80,30 0624E2842BE230FE7BABBE2A52B2C724 52,16
+Display 80,30 E2EA3A967DB6B56B45F1E86B1D268BBD 70,14
 Key "- "
-Display 80,30 73E660AEF0369981B1A79CFF7D152127 53,16
+Display 80,30 FCE6C7585B3001812C1D3621166B22EE 71,14
 Key ":A-q"
-Display 80,30 5A68CB2F2D7BA6B98FF610CBA8FA43A8 60,16
+Display 80,30 E54D98CCD85AF4D1D6DF7D08EC7F237D 1,15
 Key ":A-3"
-Display 80,30 95E0F858BFC684886FFAC61956E441D4 60,16
+Display 80,30 1618FB72934E87CEAC6C7955B9BDF12D 1,15
 Key ":A-0"
-Display 80,30 FD8E620AB50B3EE4E6D5C812B7FE7827 60,16
+Display 80,30 2F32D6B32812839A187E64AF4BB30B28 1,15
 Key ":A-q"
-Display 80,30 D5D08379548C4F80BCC262BA2F461FF5 1,23
+Display 80,30 2B0A1D7D3805623B530E57D0EC8E18F9 1,18
 Key ":A-q"
 Key ":C-P"
-Display 80,30 D6441E611CC472180CA4243497FCDF8F 1,22
+Display 80,30 507063AD2488699FE5F634C26F191D4F 1,17
 Key ":C-P"
-Display 80,30 59EDC48D021C91283420729A3D3A3D04 1,21
+Display 80,30 0514D315989286C694C51265C0978CDF 1,16
 Key ":C-P"
-Display 80,30 0FDCF20E7D85B0034810F8009C03C4CE 1,20
+Display 80,30 E16BB97CE4E6A45312941DE7D39A2910 1,15
 Key ":C-P"
-Display 80,30 B4F2176D07EA112BC03CDAB4655FB498 1,19
+Display 80,30 0875D52D7B11B3DBEA7288E1EE8F746C 1,14
 Key ":C- "
 Key ":C-N"
-Display 80,30 18A590422B057E9728430F898EFB3DD3 1,20
+Display 80,30 4478E56B37C74E8601856CA96220E14B 1,15
 Key ":C-N"
-Display 80,30 4EF9E2278B406DB859D9A46E9720AB99 1,21
+Display 80,30 CF01CBE26DB4F2BE0F8DA12A2B87B504 1,16
 Key ":C-N"
-Display 80,30 64DF1E74EEE2966DEDEC9600DF7E34C6 1,22
+Display 80,30 833542A10E659F2C2DAC756948960B61 1,17
 Key ":C-N"
-Display 80,30 4285398770FBFB7AE0687E021D0899E3 1,23
+Display 80,30 0A9DC0E32C2505C1AAC5D8A232AB9A9F 1,18
 Key ":C-N"
-Display 80,30 64F2D8DE2D61EEF47EBD7372A31E8BCB 1,24
+Display 80,30 BD0F17FA0FD764D9AD83F09D2333514E 1,19
 Key ":C-N"
-Display 80,30 0849D5B34ACB2DC4FC17212B233D400A 1,25
+Display 80,30 51773A0583BC8C579A650AB0C3CFA63D 1,20
 Key ":C-N"
-Display 80,30 8238EFE9A4538129D26B746E1A5E5F1C 1,26
+Display 80,30 A689C566465AF38D4BAEC43C572A211A 1,21
 Key ":C-N"
-Display 80,30 1BC676B8D07461C12285E04915C86364 1,27
+Display 80,30 277202DF6EE8E4414B63BDBA195D899A 1,22
 Key ":C-N"
-Display 80,30 69C332144F862DB3BC59DB72F05BBB50 1,27
+Display 80,30 1509D09E76576B8FE45F5F88204F12C8 1,23
 Key ":A-q"
-Display 80,30 F2535EF347EB49B2185E4960B050AFEE 1,27
+Display 80,30 58B6443EE9E69E25332803F6B3BEDBB0 1,23
 Key ":C-P"
-Display 80,30 1D2C74DB0C408422129BA088A7C8FB66 1,26
+Display 80,30 85CB051C35FF1995EC2FD6317C30DD85 1,22
 Key ":C-P"
-Display 80,30 C80929790645EF12EBC5501FF456E594 1,25
+Display 80,30 54692C6644CB95B8E2DC1460E9096E20 1,21
 Key ":C-P"
-Display 80,30 8630CA9E22136AFFB5EBFE80FB2FD660 1,24
+Display 80,30 8B8C7A95C9462E5F0896EDCEC45FD057 1,20
 Key ":C-P"
-Display 80,30 6364A16E67A207375551782A338F996E 1,23
+Display 80,30 5396A022B2F2D2DC73765600C4435B04 1,19
 Key ":C-P"
-Display 80,30 D512BA6345EA6299F4EFD9979F9484B5 1,22
+Display 80,30 2B0A1D7D3805623B530E57D0EC8E18F9 1,18
 Key ":C-P"
-Display 80,30 6D756CA65DF25E24F87D24EF8F648E2F 1,21
+Display 80,30 507063AD2488699FE5F634C26F191D4F 1,17
 Key ":C-P"
-Display 80,30 07AF31EC7A3F7A9CB8D693C1AF66DD16 1,20
+Display 80,30 0514D315989286C694C51265C0978CDF 1,16
 Key ":C-O"
-Display 80,30 F4652B3D7D189996D42142247DEECB36 1,20
+Display 80,30 936BDC35DD5F32E62C10D41078CF89EE 1,16
 Key ":C-N"
-Display 80,30 707C3DBAF4901AD7E6752171E50D379D 1,21
+Display 80,30 10B03F324AAE7E9B83955B13E64E9A48 1,17
 Key ":A-6"
-Display 80,30 0B6362A4559A03CD8C9531976CEE5DF3 1,21
+Display 80,30 D654F5900EA430AC59A54F421C68CBFE 1,17
 Key ":A-0"
-Display 80,30 6BDCEDA0ACDF3FE547016873DAD93C34 1,21
+Display 80,30 3ED15CF65B71A66479C18B45581C93C3 1,17
 Key ":A-q"
-Display 80,30 EE0343A984BA930495F2194618ED9B33 1,21
+Display 80,30 BC8649326C72A3EA455A3B0E4E49D99D 1,17
 Key "--"
-Display 80,30 74B5C5BCBEF4D810C04902CBC79D39F0 2,21
+Display 80,30 FFF534A624A1ACA9D3941D73A2E5EE0E 2,17
 Key "- "
-Display 80,30 69E0AFEBF5754C4BCA757DC5C5C7DE5E 3,21
+Display 80,30 FBE4C89DFB7593468E1FBDE8F07B450A 3,17
 Key ":C-N"
-Display 80,30 335011E1BF30E15C378BFD70B93B1568 3,22
+Display 80,30 1788120FAFFBBE98FA603927833FA120 3,18
 Key ":C-B"
-Display 80,30 335011E1BF30E15C378BFD70B93B1568 2,22
+Display 80,30 1788120FAFFBBE98FA603927833FA120 2,18
 Key ":C-B"
-Display 80,30 335011E1BF30E15C378BFD70B93B1568 1,22
+Display 80,30 1788120FAFFBBE98FA603927833FA120 1,18
 Key "- "
-Display 80,30 17263364D8B548B5D336EAC46557C8D4 2,22
+Display 80,30 38C39AEC8A4AF4717D27F44C11C3AA2E 2,18
 Key "- "
-Display 80,30 A9F2B2A38537321228E3180D02F494A1 3,22
+Display 80,30 4483C3D631AC5395BBB44E78315CFC92 3,18
 Key ":A-q"
-Display 80,30 777D5F9399CFD25BD0F3288E255BC058 3,22
+Display 80,30 96AF0D23CE6BA58B0A28E4BC9C3B81DC 3,18
 Key ":C-P"
-Display 80,30 7325964BEF2054BF64C6AD00822A9565 3,21
+Display 80,30 BBCBCEB5343C580BB6C1D3C55FC764C4 3,17
 Key ":C-F"
-Display 80,30 7325964BEF2054BF64C6AD00822A9565 4,21
+Display 80,30 BBCBCEB5343C580BB6C1D3C55FC764C4 4,17
 Key ":C-D"
-Display 80,30 1C03B1365BA2605DC51BEE50B7D25108 4,21
+Display 80,30 ADEB92B9DF39F96557D056B0FCB6C808 4,17
 Key "-1"
-Display 80,30 E62C7934F226344445B8EE430D9082E4 5,21
+Display 80,30 3B15F079F8E7FC009608863BED521C5B 5,17
 Key "-/"
-Display 80,30 506EC3E53D0B6456A6C4B3C7E0A2C3D8 6,21
+Display 80,30 AE53A49E4EA66F84D06373D71DC7A41E 6,17
 Key ":C-E"
-Display 80,30 506EC3E53D0B6456A6C4B3C7E0A2C3D8 62,21
+Display 80,30 AE53A49E4EA66F84D06373D71DC7A41E 59,17
 Key ":C-D"
-Display 80,30 21F49306A5F3170FA7E9B272C0606CEF 62,21
+Display 80,30 C940A8EEE36C8F2CD52586A18C4D5FBA 59,17
 Key "- "
-Display 80,30 52D5657B6197545AF267C32D56602D73 14,22
+Display 80,30 C331A38D629AB63A20F52A948A658B76 60,17
 Key ":C-E"
-Display 80,30 52D5657B6197545AF267C32D56602D73 70,22
+Display 80,30 C331A38D629AB63A20F52A948A658B76 41,18
 Key ":C-D"
-Display 80,30 16A5FFAA7FAE3D26FF187C680FB59C27 70,22
+Display 80,30 DB1A04D52FDADE498CD4BDD9D28DEB0F 41,18
 Key ":C-E"
-Display 80,30 16A5FFAA7FAE3D26FF187C680FB59C27 51,23
+Display 80,30 DB1A04D52FDADE498CD4BDD9D28DEB0F 22,19
 Key ":C-D"
-Display 80,30 9CEEA289555F7158A289F784E14BF75D 51,23
+Display 80,30 B47724AAB3634A63EB9BF1F0E2BB9FB1 22,19
 Key ":C-E"
-Display 80,30 9CEEA289555F7158A289F784E14BF75D 32,24
+Display 80,30 B47724AAB3634A63EB9BF1F0E2BB9FB1 68,19
 Key ":C-D"
-Display 80,30 9DF6447285F85C660E0F8345D1DB0881 32,24
+Display 80,30 FB6E3FE299AE4C3E8A538BECD7C23548 68,19
 Key ":C-E"
-Display 80,30 9DF6447285F85C660E0F8345D1DB0881 12,25
+Display 80,30 FB6E3FE299AE4C3E8A538BECD7C23548 68,19
 Key ":C-D"
-Display 80,30 318A99F3864DFA99BEDB845967251A98 12,25
+Display 80,30 70790E21CC46AEF33B09AF049077577B 68,19
 Key ":C-E"
-Display 80,30 318A99F3864DFA99BEDB845967251A98 68,25
+Display 80,30 70790E21CC46AEF33B09AF049077577B 59,20
 Key ":C-D"
-Display 80,30 73B2BFCB66D74987A01DB57CDEC3A2CD 68,25
+Display 80,30 05362AA63B554866975996DB89FB3F4D 59,20
 Key ":C-E"
-Display 80,30 73B2BFCB66D74987A01DB57CDEC3A2CD 47,26
+Display 80,30 05362AA63B554866975996DB89FB3F4D 48,21
 Key "- "
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 21,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 19,23
 Key ":A-x"
-Display 80,30 040CE6391D72E72761B7D963F927846A 26,13
+Display 80,30 53BA3C931B14CE033063078E272E1D76 26,13
 Key "-f"
-Display 80,30 D39FF2FC9A6427CEA2F1D721F5E31CEE 27,13
+Display 80,30 9BC32E03C44ED3C01B48808C6EF9D590 27,13
 Key "-i"
-Display 80,30 D173D443746D607B6F1D53A58418E26B 28,13
+Display 80,30 9A5C05F175CC8F2EDD93F47BDD0698F8 28,13
 Key "-l"
-Display 80,30 2E6725209D464EFE0E52F2370226571B 29,13
+Display 80,30 FAD586C061E6E7AABDA4DC346FBA3633 29,13
 Key "-l"
-Display 80,30 BDC796451AC90F2B1B4F81FF0362B6A8 30,13
+Display 80,30 3AB8358FE2D7E23DA7C10A08A6605F97 30,13
 Key ":Enter"
-Display 80,30 222A27553B7FBB2D573539030D1E970C 21,27
+Display 80,30 CE142473DEDBB2D137DD33D9431F3677 19,23
 Key ":A-x"
-Display 80,30 040CE6391D72E72761B7D963F927846A 26,13
+Display 80,30 53BA3C931B14CE033063078E272E1D76 26,13
 Key "-f"
-Display 80,30 D39FF2FC9A6427CEA2F1D721F5E31CEE 27,13
+Display 80,30 9BC32E03C44ED3C01B48808C6EF9D590 27,13
 Key "-i"
-Display 80,30 D173D443746D607B6F1D53A58418E26B 28,13
+Display 80,30 9A5C05F175CC8F2EDD93F47BDD0698F8 28,13
 Key "-l"
-Display 80,30 2E6725209D464EFE0E52F2370226571B 29,13
+Display 80,30 FAD586C061E6E7AABDA4DC346FBA3633 29,13
 Key "-l"
-Display 80,30 BDC796451AC90F2B1B4F81FF0362B6A8 30,13
+Display 80,30 3AB8358FE2D7E23DA7C10A08A6605F97 30,13
 Key ":Tab"
-Display 80,30 6C91254CCCF88762159F14AEF038164B 35,13
+Display 80,30 78E253191187620EC92325694FC14C50 35,13
 Key ":Enter"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 21,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 19,23
 Key "- "
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 22,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 20,23
 Key ":C-_"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 21,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 19,23
 Key ":C-_"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 20,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 18,23
 Key ":C-P"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 20,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 18,22
 Key ":C-F"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 21,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 19,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 22,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 23,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 33,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 25,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 34,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 29,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 37,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 36,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 46,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 37,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 49,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 44,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 53,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 54,22
 Key ":A-f"
-Display 80,30 7EC09CD7F43ED0F28F1D532B53C67B55 60,26
+Display 80,30 A74496517C8E752068C2E7A44DBA58BA 61,22
 Key ":A-f"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 4,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 5,23
 Key ":A-f"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 9,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 12,23
 Key ":A-f"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 16,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 17,23
 Key ":A-f"
-Display 80,30 FDCF8EC396781A70B7613E903CE26667 17,27
+Display 80,30 AA565079382562AFE5C628EB2C7B7F4D 18,23
 Key ":Enter"
-Display 80,30 CF421E2726C9AD3F964E1CDBC0BA640A 1,27
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 1,24
 Key "- "
-Display 80,30 695B4E58A3F1B0383B6E81BDB50FF776 2,27
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 2,24
 Key "- "
-Display 80,30 CB8231CC8E9F5FDE5F29EC1AD29B287F 3,27
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 3,24
 Key "- "
-Display 80,30 3FF854480B9085782B72136A25CF47E0 4,27
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 4,24
 Key ":Backspace"
-Display 80,30 CB8231CC8E9F5FDE5F29EC1AD29B287F 3,27
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 3,24
 Key ":A-q"
-Display 80,30 7DD45AFF9E9FF1A48CF3D09DD4C38C9A 18,26
 Key ":C-P"
-Display 80,30 6C50FFD490CCC72E5A2091CE44098642 18,25
+Display 80,30 B38D870D2F9AB5FBDE6DD0EA7816D56B 3,23
 Key ":C-P"
-Display 80,30 BC70582462B28CD4F22CB23BD46E524D 18,24
+Display 80,30 B870E0E6D2D93CD087AF23C4F5020E0A 3,22
 Key ":C-P"
-Display 80,30 61274C17E53FC65A78AF91D538F9B4CB 18,23
+Display 80,30 85BA9184ABA9EAB3EAE3FCA9E7CCDB8F 3,21
 Key ":C-E"
-Display 80,30 61274C17E53FC65A78AF91D538F9B4CB 56,23
+Display 80,30 85BA9184ABA9EAB3EAE3FCA9E7CCDB8F 47,21
 Key ":C-D"
-Display 80,30 ECBC056EA8E0F65EBCB220B3C90FDF93 56,23
+Display 80,30 EB3F97EBAD5F1BCFC68A3EE3B4C6CC05 47,21
 Key "- "
-Display 80,30 F7D05734D6F2B467D948E03480EF5C94 57,23
+Display 80,30 AA4ABFE2B6E7F29C47EB84FA28B84BC9 48,21
 Key ":C-E"
-Display 80,30 F7D05734D6F2B467D948E03480EF5C94 37,24
+Display 80,30 AA4ABFE2B6E7F29C47EB84FA28B84BC9 32,22
 Key "- "
-Display 80,30 BC70582462B28CD4F22CB23BD46E524D 60,24
+Display 80,30 B870E0E6D2D93CD087AF23C4F5020E0A 62,22
 Key ":Backspace"
-Display 80,30 BC70582462B28CD4F22CB23BD46E524D 59,24
+Display 80,30 B870E0E6D2D93CD087AF23C4F5020E0A 61,22
 Key ":C-N"
-Display 80,30 6C50FFD490CCC72E5A2091CE44098642 59,25
+Display 80,30 B38D870D2F9AB5FBDE6DD0EA7816D56B 18,23
 Key ":C-N"
-Display 80,30 7DD45AFF9E9FF1A48CF3D09DD4C38C9A 56,26
+Display 80,30 6DE8992653BA3E378782E6C27F4D4A6A 3,24
 Key ":C-N"
-Display 80,30 273DF7A5258282A84D9E0A7154322391 58,27
+Display 80,30 662C23F3B945AB9C4484F229A30CA0ED 1,25
 Key ":C-N"
-Display 80,30 B62E38F548D8BF7D08E83F6DDADEACC7 55,27
+Display 80,30 450FB70A7F181AC6168D3214DAA06779 61,26
 Key ":C-N"
-Display 80,30 E466771C3BA4396CFD1BF7A027EC9BE3 52,27
+Display 80,30 897E8E2A860E34884E03AF9836E6AA9A 61,27
 Key ":C-N"
-Display 80,30 EFBB6B711F70305A55754B9E64B73992 56,27
+Display 80,30 71F8F3416DC743E9720E69085FE6D1BA 61,27
 Key ":C-N"
-Display 80,30 9F55885F911494E17D548C5D70064CA2 54,27
+Display 80,30 21571D4B56310A5573DADC84A2EC7236 61,27
 Key ":C-N"
-Display 80,30 5CEA32AF5762F5CE872971D154C1F1FD 1,27
+Display 80,30 B4DA665F841F0ECA5DD9414B597B0B03 11,27
 Key ":C-N"
-Display 80,30 C04E9DF0CC2EFFD3F9D175E59ADF0375 59,27
+Display 80,30 70CA5A4FD2172AF6C535294E48A6521E 56,27
 Key ":C-N"
-Display 80,30 CB0C0F885A17D10FEEC92EE825D69550 59,27
+Display 80,30 69389501B3F3271BE7259E067732458C 60,27
 Key ":C-N"
-Display 80,30 3EB5BEC05845A04AD6F5D29A7E325892 59,27
+Display 80,30 3DE2EB42B53B7DA1F15A36ACF3C0DF99 61,27
 Key ":C-N"
-Display 80,30 34512A6C986455C9E01725E3AD382B63 31,27
+Display 80,30 22D66CEF40E4377530D1F4F18C1DFCD1 37,27
 Key ":C-N"
-Display 80,30 7D31FC876796CE794477DA5A89208417 1,27
+Display 80,30 4C080AA48A5FE8663AC2AA638E9CC604 1,27
 Key ":C-L"
-Display 80,30 79AA4F8A94AACD2F132A074A9E296F6D 1,13
+Display 80,30 7EF1685482A7B4C2C52D6011941E5561 1,13
 Key ":C-N"
-Display 80,30 77E5AB262DC5D8A928A0BEEB6533BDC7 9,14
+Display 80,30 8CBD465A72EF0E166C9F08626AE01596 61,14
 Key ":C-N"
-Display 80,30 9AA8A98638E01D2B6989ED5C10E1CE51 9,15
+Display 80,30 6921261EFEAB864BBF8F5B521DB9573E 61,15
 Key ":C-N"
-Display 80,30 72A2C05E1E22A438F17652E42AD86359 1,16
+Display 80,30 E5AED3A88010497484494DEAABAF5CD2 61,16
 Key ":C-N"
-Display 80,30 33F9B9E17D29AD63EEB8B57D405A1E1F 59,17
+Display 80,30 CC0279CBD9A9EE70CF50C90E417F38A4 31,17
 Key ":C-N"
-Display 80,30 A226499EBF97BCE4BD94DD68D0B85674 59,18
+Display 80,30 1640E5FA35BBAC8C487F96B03C97117B 1,18
 Key "- "
-Display 80,30 23F4C6E895504C2543F2FBCA9521CC46 60,18
+Display 80,30 1640E5FA35BBAC8C487F96B03C97117B 2,18
 Key "-t"
-Display 80,30 9E4FEF8FF31581158B20E4441195D95A 61,18
+Display 80,30 7A72E018E65F8CAE6E0E6D88C8BA1BC0 3,18
 Key "-e"
-Display 80,30 B2655DF07105BDC047C6391797EB8E6A 62,18
+Display 80,30 D57BD23A9A5768E600EF8A08572505D2 4,18
 Key "-x"
-Display 80,30 421E51149BB0DA46B1CACB9AFA083178 63,18
+Display 80,30 854F79B5C20DE7F0176E216DACE0CB17 5,18
 Key "-t"
-Display 80,30 B558E4F8698874183C41F61FF07900B0 64,18
+Display 80,30 4E23D9A3461A1625FE4EA76CDA6CB614 6,18
 Key "- "
-Display 80,30 F8EE14E872F5D7241D9FC453C0CA54BA 65,18
+Display 80,30 4E23D9A3461A1625FE4EA76CDA6CB614 7,18
 Key "-t"
-Display 80,30 D5B3A8B046DE1949EF363C05C4E75019 66,18
+Display 80,30 A3FA6AB285F9088725C6739A363BF7E1 8,18
 Key "-e"
-Display 80,30 31BE5A5C463E29A8E9E4CCAFB951FFFD 67,18
+Display 80,30 AB8880C1A9B3DC808767DCC6842257CA 9,18
 Key "-x"
-Display 80,30 CD7C9976AA00F7F0E0287157F63A0EC9 68,18
+Display 80,30 966E2449B7E50D3856B58AF60D9EE013 10,18
 Key "-t"
-Display 80,30 3B89B67AFBFCFF83CAD7D74668A96141 69,18
+Display 80,30 19C054B73E630CC620CADA9516842552 11,18
 Key "- "
-Display 80,30 F3B24362C23883A7D031A93AEADEF039 70,18
+Display 80,30 19C054B73E630CC620CADA9516842552 12,18
 Key "-t"
-Display 80,30 9BA2E9E3AC0C2C4953FFAE34C978E817 71,18
+Display 80,30 BB86D37337C95A28A53527AFF30A1EBB 13,18
 Key "-e"
-Display 80,30 C5E89DEBAC94D92CD66D54801083FB38 72,18
+Display 80,30 27435844707576427EE64A9CB272EFB0 14,18
 Key "-x"
-Display 80,30 E1676618B96CA520644DF083447F2CFB 73,18
+Display 80,30 000F14310C57FA7A910E529926CFFBFD 15,18
 Key "-t"
-Display 80,30 4476C16D9796F670993AB383032745C7 74,18
+Display 80,30 79B2AADC0AEFB6E0E90542739DFD4E8A 16,18
 Key "- "
-Display 80,30 1962170A7805BB38C1C185790465DCD8 75,18
+Display 80,30 79B2AADC0AEFB6E0E90542739DFD4E8A 17,18
 Key "-t"
-Display 80,30 49FE9B31FE30C121ED4A100AEDAE81CA 76,18
+Display 80,30 1165ACD30F099A013A8E4D7D54200580 18,18
 Key "-e"
-Display 80,30 7C182059AC1F8BF143BD06609C10D180 77,18
+Display 80,30 C847A7BD0B020230D36C6FBF49254B12 19,18
 Key "-x"
-Display 80,30 F623882D35B37F016A2084D685E19564 78,18
+Display 80,30 11A1919F93EB1F688A400A2EB144400D 20,18
 Key "-t"
-Display 80,30 0AB1F9CE32F2984BE9CEC966F01E295E 1,19
+Display 80,30 081B0113664779CFD0D412B18D3E1A6E 21,18
 Key "- "
-Display 80,30 C50CB4C57BCE33637247B632595C803E 2,19
+Display 80,30 081B0113664779CFD0D412B18D3E1A6E 22,18
 Key "-t"
-Display 80,30 07194D5A1B1AC655C737F2B0828DAE7E 3,19
+Display 80,30 3FBD81B403503578FAB6193FAE6887C2 23,18
 Key "-e"
-Display 80,30 1C91B32C3DB270AD5375F95468009AD2 4,19
+Display 80,30 B39C53368BE950A534D1B99ED4F6D2E4 24,18
 Key "-x"
-Display 80,30 A996881FDDE3122870A933A6B97D5773 5,19
+Display 80,30 DEA005D4A8A39691925BB42B01C24844 25,18
 Key "-t"
-Display 80,30 629AA09675E413FDF3B584B771A9C081 6,19
+Display 80,30 9D40AEAB8C25B94EC300CA568C91F835 26,18
 Key "- "
-Display 80,30 C8B2116C69732B92A03FE28A63AD86BF 7,19
+Display 80,30 9D40AEAB8C25B94EC300CA568C91F835 27,18
 Key "-t"
-Display 80,30 7CDF2EC0FDFC1AF2B9F9D5DFC537E103 8,19
+Display 80,30 5C2D40916B30457BEEB96CDD7AC86CA3 28,18
 Key "-e"
-Display 80,30 2F6CB4DDAB0D930CA303C8F0AAF2D2AF 9,19
+Display 80,30 94E55D835C8AD018096BB3991221299C 29,18
 Key "-x"
-Display 80,30 6225CD3057408BECD806200FCA063B13 10,19
+Display 80,30 CCFB43454CFA49345BA3B10A4C607E54 30,18
 Key "-t"
-Display 80,30 429852597156FA593DD0C8B20A780AFF 11,19
+Display 80,30 9E168F92E7B6AF34382C0189C251FBC1 31,18
 Key "- "
-Display 80,30 ABFF256F1D9A001E842003B16EFAC2DA 12,19
+Display 80,30 9E168F92E7B6AF34382C0189C251FBC1 32,18
 Key "-t"
-Display 80,30 CA0DD6FE66DEA9E3AACD10A3D799DC4F 13,19
+Display 80,30 286F9075083B1519ED4A4F6C9E5C9BF9 33,18
 Key "-e"
-Display 80,30 39BD979759DFBE4BED2D5BFD7F6C8478 14,19
+Display 80,30 6AB8806AF92CC542493D4FA8B68DDC81 34,18
 Key "-x"
-Display 80,30 6AB13D8D2E6A2200770B6DFE80550826 15,19
+Display 80,30 9A59CBD86E0F45A8A53E3C92DE8C439F 35,18
 Key "-t"
-Display 80,30 FF5219903BDAA9168EA20B19F618AA50 16,19
+Display 80,30 AA4EFBB4960F51679A527B7635737245 36,18
 Key "- "
-Display 80,30 43BAE5A7304AC4511CF7EDB3D6442B57 17,19
+Display 80,30 AA4EFBB4960F51679A527B7635737245 37,18
 Key "-t"
-Display 80,30 F0A9C9BF337CB1A53EC52CD964A33A24 18,19
+Display 80,30 D49180B9DC6C9B2B70A4356B3F39A5AD 38,18
 Key "-e"
-Display 80,30 8C23B576E9BEDA226033C6C329FCDD6B 19,19
+Display 80,30 66ED8862C120FCA175FF04B4C0537753 39,18
 Key "-x"
-Display 80,30 A494956410D38E5D85CB06914C98B972 20,19
+Display 80,30 D20C045348A408868C8773F1C6989B79 40,18
 Key "-t"
-Display 80,30 6854839507CAC6054FB0DD13157E34EC 21,19
+Display 80,30 6EE2F0B5142A0A8A8B3AF1C099707D9E 41,18
 Key "- "
-Display 80,30 B0DA99F75F02E22D67DE4843A2ECF66A 22,19
+Display 80,30 6EE2F0B5142A0A8A8B3AF1C099707D9E 42,18
 Key "-t"
-Display 80,30 D8EE25D0C50ECBE576BF214C143E8F84 23,19
+Display 80,30 B09A75499EF15125C77B2470785F575F 43,18
 Key "-e"
-Display 80,30 3D1C331A73BD6BF5618480AC5BFCC4AA 24,19
+Display 80,30 6CAFCA61E6F249593B17EEB965A89C90 44,18
 Key "-x"
-Display 80,30 A1412B4F70CE44C9FC69553901CEB2D7 25,19
+Display 80,30 18380661B2718340D6AA55FA9D6F421A 45,18
 Key "-t"
-Display 80,30 1AEB88EE52F54769623E34E3D08BC2C7 26,19
+Display 80,30 77408C738DA7CE5E8E9AE1225A5EFA28 46,18
 Key "- "
-Display 80,30 1F4F829ABD1B603217C37F4EC3196DB9 27,19
+Display 80,30 77408C738DA7CE5E8E9AE1225A5EFA28 47,18
 Key "-t"
-Display 80,30 83CAAE5A76E8BFB89A18985E91B4A96B 28,19
+Display 80,30 6CAD8E0F1A94993EF2E9CE114816A841 48,18
 Key "-e"
-Display 80,30 2464E305C18A8CC764C4923B0940D513 29,19
+Display 80,30 2ADCDF3836E1E3D53ACDEC5035E58A49 49,18
 Key "-x"
-Display 80,30 ADB7B9A2A8A00471686B26C3A4A020ED 30,19
+Display 80,30 5B9BDA198B8B1E8CFF3C4E4ABF8D9E56 50,18
 Key "-t"
-Display 80,30 F966F5B5F21EA7A3C78C123338005DDB 31,19
+Display 80,30 E210F1BE477E44C6D5063DEA55761ABE 51,18
 Key "- "
-Display 80,30 04DB365D508C6F0BF87CB57F1305E64F 32,19
+Display 80,30 E210F1BE477E44C6D5063DEA55761ABE 52,18
 Key "-t"
-Display 80,30 305759EA05347FE78CC16802B24C4ED5 33,19
+Display 80,30 62BE9AA8A0DC1D545C4D7561FF4B1000 53,18
 Key "-e"
-Display 80,30 BA36139DBE3C1570C639AD1FE5BDF21A 34,19
+Display 80,30 E47C3B11F1EAF21F9B64150E9B7AE489 54,18
 Key "-x"
-Display 80,30 C93122C5C84352BE608DBC7777D931E1 35,19
+Display 80,30 8C0F388777CBB6616B557B99307A3669 55,18
 Key "-t"
-Display 80,30 7ADCBD5AB850B16907262636B7161E28 36,19
+Display 80,30 034B254EDE664CA3B73A52DC4015AB32 56,18
 Key "-."
-Display 80,30 DB9472E99F83D1887F53C2C0025445EC 37,19
+Display 80,30 F0253A522A22F0E49BC8397183031E59 57,18
 Key ":A-q"
-Display 80,30 247D968D318E86804B7EC803C767F361 16,20
+Display 80,30 8910C21DF2329272905F3F23DDCB8830 53,18
 Key ":C-X"
-Display 80,30 51DFE15C1A40974C3C0C9116F47CF666 16,20
+Display 80,30 489E56718B5B843296D37E6C59186B10 53,18
 Key ":C-F"
-Display 80,30 52BE27431CDAC718EAF1CB183AF05DA7 49,13
+Display 80,30 85BB946DFDED9B99948A2A81318CF825 49,13
 Key "-c"
-Display 80,30 68E6E4724FBC494361B06DD010B5E157 50,13
+Display 80,30 DE94CC6C8BE1FB205B287994FD0E1F03 50,13
 Key "-o"
-Display 80,30 5A0A38B4C3201A2F392FE07C1C0D598B 51,13
+Display 80,30 7B4D1AA992D434EBC7D5E796D04FD6AD 51,13
 Key "-r"
-Display 80,30 C67B12722D23C1EBA43DCD91C43CF8E4 52,13
+Display 80,30 CD0734DA843CD1205F0269FA1382206D 52,13
 Key "-e"
-Display 80,30 167096FDC775CD41512C6D2F4F8659E2 53,13
+Display 80,30 8EA2627AA2FE5DF73109EDE5BE5F7503 53,13
 Key "--"
-Display 80,30 07E3C6C81E908C8A022E67B0CE6D716F 54,13
+Display 80,30 9891C6F7E04EFD76D0D4CB1406AE5B58 54,13
 Key "-d"
-Display 80,30 BD26563D7536901AF2E67E3FCD257310 55,13
+Display 80,30 42A4B090EADF169062CB5EDF49150C29 55,13
 Key "-o"
-Display 80,30 1DB1CD7FFAA81F4D2D599EC29C49CE95 56,13
+Display 80,30 EB3761E817B99DB5FF459F82708B4D72 56,13
 Key ":Tab"
-Display 80,30 0D0E0B07791F3933F4A759E85E097DDE 51,13
+Display 80,30 230EBA68988DCB35206596B883D80544 51,13
 Key ":Enter"
 Display 80,30 E3B878C4CAE0DCA2336E3E55E7F3E644 1,0
 Key ":C-N"
@@ -574,4 +573,4 @@ Key "-n"
 Display 80,30 3C9E22EF0D9BA903520243834F73EA14 21,10
 Key "-n"
 Display 80,30 59BA738F647352E2E8224F038B032610 12,13
-Close 1009
+Close 1001

diff --git a/tests.d/02-diff b/tests.d/02-diff
index 97a5bb929bc7cbc5af3e03a808620c80695b594c..9f51ed003a6ff3173af0416ebff4d4aefccf2859 100644 (file)
--- a/tests.d/02-diff
+++ b/tests.d/02-diff
@@ -36,31 +36,31 @@ Display 80,30 EB87DBCB8E5CD8AB28B2BBBBE4B02A6E 1,16
 Key ":C-N"
 Display 80,30 FFA447CF168F1FC2B8BC863AD709D026 1,18
 Key ":Enter"
-Display 80,30 EAFACEFF55F31FCF01E7BF94D753A164 1,6
+Display 80,30 97D6BDC69A6E76EAAB9038DFB358B2CA 1,6
 Key ":C-L"
-Display 80,30 EAFACEFF55F31FCF01E7BF94D753A164 1,6
+Display 80,30 97D6BDC69A6E76EAAB9038DFB358B2CA 1,6
 Key ":C-X"
-Display 80,30 E5B0B673A504C3545075DBEA3C1CBA7A 1,6
+Display 80,30 A0878B0A95EE7145C0AD480B9F439EEE 1,6
 Key "-o"
-Display 80,30 EAFACEFF55F31FCF01E7BF94D753A164 1,18
+Display 80,30 97D6BDC69A6E76EAAB9038DFB358B2CA 1,18
 Key ":C-V"
-Display 80,30 18B07450007A761430761190501DD83A 1,15
+Display 80,30 AACA0A9C827964E94E723CB7A2DADFA5 1,15
 Key ":C-N"
-Display 80,30 A2B8ADD7686FE0BB72A47F058924C943 1,16
+Display 80,30 D9A209BB906BC43293559A5AB7C5D338 1,16
 Key ":C-N"
-Display 80,30 5D7CD01E78986B252E09B158CF0A12B2 1,17
+Display 80,30 0A494C4C3E0BE5624E42E3B756854A9D 1,17
 Key ":C-N"
-Display 80,30 85BD122642A0758CD74F5DCB3AABFBB7 1,18
+Display 80,30 11B40F5DBF12FD0D850792A99284C563 1,18
 Key ":C-N"
-Display 80,30 036F3500A90F3B97F24CAF62D4B5284C 1,19
+Display 80,30 0C1A7672F18A2542683619ADDE83EC7A 1,19
 Key ":C-N"
-Display 80,30 AFEA999D5D3BAB133D5008997D9A9387 1,20
+Display 80,30 405216F0042D99BC9EC9B64A8664ACF1 1,20
 Key ":C-N"
-Display 80,30 C45E814636C347E67A602D0B3AFF412F 1,21
+Display 80,30 8E32DF7378E8CE692DFFC3E7B88606AE 1,21
 Key ":C-N"
-Display 80,30 3AD68F18F7415C411D1B86040C9BC07E 1,22
+Display 80,30 DCF601232BFC46DE6ED4B309C73F2FBB 1,22
 Key ":C-N"
-Display 80,30 D89A175772A688667284B857BEA2ED01 1,23
+Display 80,30 D7486C85759F42C5534B76251FAAA618 1,23
 Key ":Enter"
 Display 80,30 E8AD9B74A8F5CE0F4AE9396CCD16F145 1,6
 Key ":C-X"

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 8f12a53472a5170a62ed2043d16849bfe80b4ad3..ce6e45c3139bf315c8af0a002cf30422f89bd661 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -67,7 +67,6 @@ Display 80,30 D23D21D0B80BFBB0DA018CF768D8A6D9 52,13
 Key ":Enter"
 Display 80,30 F6604B8CA9B5A2A73DA48F8AC7CFE127 11,10
 Display 80,30 517673C86DF8C4E1F9B296BDEE0F3BE7 11,10
-Display 80,30 517673C86DF8C4E1F9B296BDEE0F3BE7 11,10
 Key ":Enter"
 Display 80,30 446DD5C10A088B805D54291EE0F0862D 1,1
 Display 80,30 E3ACF4433B7F90BDF1A870808B398A70 1,1
@@ -86,11 +85,11 @@ Display 80,30 F56A70A8762C9924864031FF300BC82D 1,7
 Key "-`"
 Display 80,30 E25F41CAEC24248BCE10C24D5E65B459 1,9
 Key "-`"
-Display 80,30 618DF53D9974B01C818E8C6D6387474D 1,6
+Display 80,30 158EEC65146C6D478A3D1A5745F5A76A 1,6
 Key ":A-0"
-Display 80,30 4B9092D1F23E98AE73B7F42E5EA538F8 1,6
+Display 80,30 C2AC2B8D15CC48670D5141EFF957264C 1,6
 Key ":C-X"
-Display 80,30 3B28E5D893BD15B860AA9B9C14DCAAF6 1,6
+Display 80,30 7B939320029ED80340F538DD50C9AD6D 1,6
 Key "-`"
 Display 80,30 6806FEBD8EE77BBE2C4062131CFF5AB0 1,1
 Key "-`"
@@ -172,7 +171,6 @@ Key ":C-N"
 Display 80,30 69126819D74FE4A8AE563A43676680C6 11,13
 Key ":C-N"
 Display 80,30 69126819D74FE4A8AE563A43676680C6 11,14
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,14
 Key ":C-N"
 Display 80,30 69126819D74FE4A8AE563A43676680C6 11,15
 Key ":C-N"
@@ -228,11 +226,11 @@ Display 80,30 77DE215D2A223574768436FA0878E211 1,6
 Key "-`"
 Display 80,30 8690106A3ED94DA174E00058C545A5AB 1,8
 Key "-`"
-Display 80,30 7B2857DD608BE60DD3E0F2C36D11BF70 1,6
+Display 80,30 7329A093DFEAE856D516554F7BF15E0E 1,6
 Key ":A-0"
-Display 80,30 F0C7D29E08013CBC06C5C5A058E9F053 1,6
+Display 80,30 2CD8042C79ECD24B862A5A1C60752498 1,6
 Key ":C-X"
-Display 80,30 3C7E9C6CEDE090155D861B5FCCFB4BD9 1,6
+Display 80,30 CE274EEFE02ED52770921F9FEE8B01E7 1,6
 Key "-`"
 Display 80,30 6806FEBD8EE77BBE2C4062131CFF5AB0 1,1
 Key "-`"
@@ -245,4 +243,4 @@ Key ":C-X"
 Display 80,30 FA17B346317A69478E56D0FFAEE3BD13 1,7
 Key ":C-C"
 Display 80,30 C6ED20B5EF84117E136B0EEC0F58C031 1,7
-Close 868
+Close 866

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index b6a85ae46ef45759cd1da5ac0222ade9200a32b2..1ddb2f5a7f3018c48cb54849ca61eeb67bd4d3f8 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -80,145 +80,145 @@ Display 80,30 5A7DC5EB785739D4FA2A7BD0958A8E26 41,16
 Key ":C-E"
 Display 80,30 BE98479F701C043184E0D93DDABC3106 73,16
 Key ":Enter"
-Display 80,30 2D29B3DD2CB83045E121A1E3660324CD 41,0
+Display 80,30 6622A2FFF7AF5BD68E9D0A4A90D95A3D 41,0
 Key ":C-N"
-Display 80,30 723CB966708B5C5AB876AE9FC7E2C7C3 41,2
+Display 80,30 EE0BD2E7F3357510E9AEB48D049FA667 41,2
 Key ":C-N"
-Display 80,30 BC8C925F309130C749242E855131F7BD 41,3
+Display 80,30 AD898327EC6BF99D337B4BD692114623 41,3
 Key ":A-f"
-Display 80,30 BC8C925F309130C749242E855131F7BD 52,3
+Display 80,30 AD898327EC6BF99D337B4BD692114623 52,3
 Key "-:"
-Display 80,30 DF707F3F86234F7E9A827EB5C062B00A 53,3
+Display 80,30 BAB2B07D9F5BFF86D777703B32A0209A 53,3
 Key "-c"
-Display 80,30 D996B064F2686E91C181B371D2C881F7 54,3
+Display 80,30 E9E6D66999FCB0758AE045A173846077 54,3
 Key "-o"
-Display 80,30 D7BED341787ADCFBB992ED78D2144FDE 55,3
+Display 80,30 43927A509E3204EB94B0F1856C1A2EB3 55,3
 Key "-l"
-Display 80,30 CC1C1CC11C196E098C07D2CFC7D38A1C 56,3
+Display 80,30 BC0A4368DE3CA70863DE2DF360C959B2 56,3
 Key "-o"
-Display 80,30 1F8AF2793311FE2F2A762DBD463488EE 57,3
+Display 80,30 095AE35976FC701810A7F71358A7132F 57,3
 Key "-r"
-Display 80,30 6A84ED88C9ACDA55ACD36CD54B53C540 58,3
+Display 80,30 5BE6D7AC6598CC2D41ECD7E0439F61C1 58,3
 Key "-:"
-Display 80,30 51C597208DD4A414A4AFE2A1A5094129 59,3
+Display 80,30 B3681DB13BAEE1FA510F884A1571FA7A 59,3
 Key "-#"
-Display 80,30 F36F71AD9F7D2FDC7DCB42599CADC86F 60,3
+Display 80,30 7C92A513EAB56737029F06ABDA547F07 60,3
 Key "-b"
-Display 80,30 903ACDE9CBFDBAB086B1AE2305B4EB3F 61,3
+Display 80,30 6E91D892A693AFB04F18529515E10FA8 61,3
 Key "-8"
-Display 80,30 D2A407FA26421CB84B0CDA4F5D2ED41E 62,3
+Display 80,30 66AAA0A4D0BCCEEB53D2D6874A3924A2 62,3
 Key "-c"
-Display 80,30 54BFC3BF5B34D5BF104BEDE0C794AFA4 63,3
+Display 80,30 299BA41550477788CB810EB5796CC9E1 63,3
 Key "-5"
-Display 80,30 261A5D3E821E9932712037845C1B2EF7 64,3
+Display 80,30 02DCD40F0AD01E8EFF3C56178ABDB81B 64,3
 Key "-c"
-Display 80,30 96F6C9544F88E9AD92D14E2AA9AC6A48 65,3
+Display 80,30 F4751A9631DFE4FBE02035DAC831E0E9 65,3
 Key "-d"
-Display 80,30 F22DB0A00EB5553F6CB8ADF7B3530F6B 66,3
+Display 80,30 4B703CD928D6B6892D4214A453C2132A 66,3
 Key "-,"
-Display 80,30 E88E2D6B962F3C862E310093B28D557A 67,3
+Display 80,30 D1DACD224D3527D89BA4FC463C5009E8 67,3
 Key ":C-D"
-Display 80,30 D294FC7BA1202D06CFB6AD98B1CD5F2B 67,3
+Display 80,30 2064527AE5B1565C5FFC52DB5E7929B8 67,3
 Key ":A-<"
-Display 80,30 F2E0F92EF33DA2A3E6B5E7C963F90BB8 41,0
+Display 80,30 E6C92F2484F98D5CA6C6A0E33167BC59 41,0
 Key ":C-X"
-Display 80,30 27D83ACE9F983650D3D30283B1D9A003 41,0
+Display 80,30 A8F9FE1748773196443483354983CF1D 41,0
 Key ":C-S"
-Display 80,30 6A0EA60D8101143E81B030368AA1A1C7 41,0
+Display 80,30 E22BC16BF218ADC2140C50BB32B2098F 41,0
 Key ":C-V"
-Display 80,30 723F0458401FBB2B8EE91FF2E330C364 41,14
+Display 80,30 2C517227CD9C40323535228A34DB21E2 41,14
 Key ":C-V"
-Display 80,30 3B328DBDA68F45B61927CFF26C04DE2B 41,23
+Display 80,30 EDEEBF3D24A8B345AF073ECF83940037 41,23
 Key ":C-V"
-Display 80,30 58B83018BB0E7C6BF86FEEA853B7D0E7 41,23
+Display 80,30 2F7D1A5070B33DBD620F18BECB2804AD 41,23
 Key ":C-V"
-Display 80,30 8AF4F30D9AE7F72B6C2CE83062FB8A1B 41,19
+Display 80,30 0C54087E8C51AEE2C35C71B9D6C3D8ED 41,19
 Key ":C-V"
-Display 80,30 3DC89B674296F8F0EEBA32AF913A0CCB 41,25
+Display 80,30 B9CFDB4ED666AD12DDFDD965B4453559 41,25
 Key ":C-V"
-Display 80,30 CB4B810BA885BAFC7B6926DE70E4AE0A 41,19
+Display 80,30 160366CB25D4A05C96CBCDCDB3BD1290 41,19
 Key ":C-V"
-Display 80,30 E0BC8AEBBCBA9E2DCD119CC0365D32F4 41,25
+Display 80,30 B2521AF2109AE8FE5800703D5AC224F6 41,25
 Key ":C-V"
-Display 80,30 BE456097FB843B20B3B7A0440F3A8B67 41,21
+Display 80,30 51D7E5AF33768C314D51781ADFE3623A 41,21
 Key ":C-V"
-Display 80,30 CD005511873C7F4F5BA64CB38611F7BD 41,20
+Display 80,30 A9F9626F471A47D44C8F18B4485B44BB 41,20
 Key ":C-V"
-Display 80,30 1D95A578C44DC390B601563886C6A6C4 41,27
+Display 80,30 7067E0FB35DD732D7151D045A9086B11 41,27
 Key ":A-v"
-Display 80,30 D28AEA7D77B6FEEADA52BF66ADB0820D 41,19
+Display 80,30 688138D683EA789B7BE7A1765649EAC9 41,19
 Key ":A-v"
-Display 80,30 63BCC4810C580652636EEBC1EA9BB70D 41,4
+Display 80,30 79CEC11F65DF64D7C825A1F02062CAC7 41,4
 Key ":A-v"
-Display 80,30 DF3166618B75991D58669065A0FC7E6E 41,3
+Display 80,30 D5C390C70ECC4D9669D51BC2DA0799DE 41,3
 Key ":A-v"
-Display 80,30 24988827E9C260FC7732215D39F34703 41,6
+Display 80,30 3A714807720490DD5D6BFB0D3EB5F69B 41,6
 Key ":C-X"
-Display 80,30 B98A84BD3FFB4073BEA3FF502ABB2C6D 41,6
+Display 80,30 1365BCB0D4EB140F6166292E23A6D2F1 41,6
 Key "-o"
-Display 80,30 24988827E9C260FC7732215D39F34703 41,6
+Display 80,30 3A714807720490DD5D6BFB0D3EB5F69B 41,6
 Key "- "
-Display 80,30 C98F2DAD7602B9373411CAB1180C5F32 41,6
+Display 80,30 F77C806B3CCE3F43B6C5FF7BECB305F0 41,6
 Key "- "
-Display 80,30 26AAA5FF0FB53CE6F09E28737E89F4CC 41,6
+Display 80,30 481D4800FB498E8895E6D00B564602BB 41,6
 Key ":Backspace"
-Display 80,30 C57B318B84914EB7A5AA55B1FCF756DD 41,6
+Display 80,30 0FBC1329342148552DE703406EF027CD 41,6
 Key ":Backspace"
-Display 80,30 FDAE252AB12E082CC914F06CBE18846A 41,6
+Display 80,30 8FF226C9A6B6BE119E217F2A0FA2F7C1 41,6
 Key ":C-X"
-Display 80,30 49AE523E91063113DD9CD224B8EC1E7C 41,6
+Display 80,30 B95031AAB9ACC24E3C35DE40353EC9CB 41,6
 Key "-o"
-Display 80,30 FDAE252AB12E082CC914F06CBE18846A 41,6
+Display 80,30 8FF226C9A6B6BE119E217F2A0FA2F7C1 41,6
 Key ":A-<"
-Display 80,30 596A9EBEFD49BEF6BBB115E42E64F9B5 41,0
+Display 80,30 19B982DC41459102239E385F5F0CCE37 41,0
 Key ":C-V"
-Display 80,30 15A6375488AAAB2A50F6537A57C69FF4 41,14
+Display 80,30 09B7B72CE0098ADD6AC47D7EC6B22046 41,14
 Key ":C-V"
-Display 80,30 141DB06AD827E40CEA0DB459D70F26B1 41,23
+Display 80,30 0AA8E1D866CAD7097116B1B208571F09 41,23
 Key ":C-S"
-Display 80,30 B0170AB49201ACFEEBAADB56BD92580C 70,0
+Display 80,30 83B0A8195C4EE7F5D590CAF8DBC89DCB 70,0
 Key "-e"
-Display 80,30 2E14A636535200CAA1A824EB3AE7DEB4 71,0
-Display 80,30 9E0F7CEA7310D628BEB25CF97031EA5A 71,0
+Display 80,30 32F4F18085D6064433679A72831479F9 71,0
+Display 80,30 7E28E0C5364141DB241C6E336CC176EF 71,0
 Key "-m"
-Display 80,30 7BDACD6E9BC1D42692F10A131891B30A 72,0
+Display 80,30 13231011B05599302C4279FD88045CCE 72,0
 Key "-p"
-Display 80,30 4E6FA27F57A29A1EDEE4403C5B20B40E 73,0
-Display 80,30 B66FC1265DE66359945402C362BC6BB8 73,0
+Display 80,30 C533336568A908841389615FDE7D5050 73,0
+Display 80,30 E33F9B839B44914A26684DB6DC3CD2CC 73,0
 Key ":Enter"
-Display 80,30 E82BA22E6B4C3593A91600521C28DAF7 52,13
+Display 80,30 65CF34CC2BD33348C2C97B43BB83F683 52,13
 Key ":C-L"
-Display 80,30 0B0303CA8A43537FFC33265CB28BD319 52,13
+Display 80,30 D392421CFF1C1187E7B4B23FF3813E12 52,13
 Key ":C-S"
-Display 80,30 BC1AFEA3CF728F32D35D4BA2AF7C4FCE 70,0
+Display 80,30 186BE83701C0F5E420EB88E71B23E151 70,0
 Key ":C-S"
-Display 80,30 E8E27AF5E40D19C8D32D176112DCA3DC 73,0
-Display 80,30 4BFE535B8BDFAA26E4663769EACD822E 73,0
+Display 80,30 8BC5B51C9721D4B137FF6E26A7C406BC 73,0
+Display 80,30 E6C0BEEAB7C8162ABEA456B326C756B6 73,0
 Key ":C-S"
-Display 80,30 48046EAA95F9A3BD2B63B546651EAE24 72,0
-Display 80,30 5CC9B8DB70BF934ED27A97327CBB5171 72,0
+Display 80,30 63204C5BB326DFF2976C49AFA291C9AA 72,0
+Display 80,30 6B14FE93FB08242DE6B5E2EB912C36A7 72,0
 Key ":Enter"
-Display 80,30 5C36EDC7853F89170F73B5F164533E92 52,21
+Display 80,30 115C23E3799179BB735893DD13F0651A 52,21
 Key ":C-V"
-Display 80,30 B7E0CD0828B88C82E16A55C7B2BC0F7A 41,25
+Display 80,30 36271D6C0E5326F26F9F2410886D0773 41,25
 Key ":C-V"
-Display 80,30 A2958EB3DA369084F3AA0A8C220474CF 41,20
+Display 80,30 1A0CC647E04782D9452236838EA9AE48 41,20
 Key ":A->"
-Display 80,30 FF65421FEB73C244C30DB3B48D8A4124 41,25
+Display 80,30 6044A055F507E6EF2C9F35453818B8FE 41,25
 Key ":C-L"
-Display 80,30 823639C8507D536789580A7847BD0EC0 41,25
+Display 80,30 1942AE31D352FA199ECE3F59A805CCCA 41,25
 Key ":A-v"
-Display 80,30 73978155BF4B1B3212FC262FBFD84613 41,2
+Display 80,30 D3CE230276140D096DF4C0BA8D18896A 41,2
 Key ":C-P"
-Display 80,30 AB1ADACD12B90DF6D3083DC10465FAF5 41,1
+Display 80,30 BDEAA417E9B18268AC9E8195224045DA 41,1
 Key ":C-P"
-Display 80,30 56341A7F668835792510096246A70118 41,0
+Display 80,30 28CECA2215DDD338AA7038223497644A 41,0
 Key ":C-P"
-Display 80,30 67F8A05F0060198894A9330F6F24220D 41,0
+Display 80,30 652BB358FE661DCFE40F0D8659E8EEE1 41,0
 Key ":C-L"
-Display 80,30 75CBF7F3D896372F1CCF941AC9892853 41,13
+Display 80,30 248AA32CC716A3C412191298582A82BD 41,13
 Key ":C-X"
-Display 80,30 FCE1BE6800E1CE4B2AD1DE31C48976CC 41,13
+Display 80,30 FBA91029719D49956F70E72B42856A95 41,13
 Key ":C-C"
-Display 80,30 E4C4E7F45C2F1A2CDC54EC1B5BC05C5B 41,13
+Display 80,30 6B5AACDD8610D755C6CCFD94043F1F9E 41,13
 Close 1420