save a few unnecessary blank characters

Author: c

tests/bench1.el

@@ -25,6 +25,6 @@
  "\
               │
            bc╶┴─╮
-           ╰─┰──╯ 
-━━━━━━△━━◀━━━┛   
+           ╰─┰──╯
+━━━━━━△━━◀━━━┛  
 ")

tests/bench2.el

@@ -22,11 +22,11 @@
 (uniline-bench
  "C-c C-c i n i t i a l SPC t e x t e <backspace> <return> SPC SPC g o o d <return> C-a M-x u n i l i n e - m o d e RET <up> <up> C-SPC <down> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <insert> <down> <down> <right> <right> <right> R <end> <return> <kp-subtract> <right> q <return> <left> <kp-subtract> <down> <left> <left> <return> <up> <up> <right> <right> <down> <kp-subtract> <up> <right> <right> <right> <up> <up> <up> <return> <down> <down> <down> <up> <up> <right> <down> <down> <down> C-SPC <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <up> <up> <up> <insert> <up> <down> <down> c <end> C-SPC <insert> y <return> <return> <down> <down> <down> <right> <right> <right> <right> = <down> <left> <left> <left> <left> <left> <left> <insert> s s s <left> <left> <left> <left> <left> <insert> o <left> <left> <left> <left> <left> <left> <up>"
  "\
-                    ╷ 
+                    ╷
                     │ 
-  ╭────────────╮ ╭──╯ ╭────────────╮ ╭──╯ 
-  │initial text│ q    │initial text│ q    
-  ││ good      ├─╯    ││ good      ├─╯    
-  ╰──────╥─────╯      ╰───╥────────╯      
+  ╭────────────╮ ╭──╯ ╭────────────╮ ╭──╯
+  │initial text│ q    │initial text│ q   
+  ││ good      ├─╯    ││ good      ├─╯   
+  ╰──────╥─────╯      ╰───╥────────╯     
          ╚═════·════▫═════╝
 ")

tests/bench4.el

@@ -23,12 +23,12 @@
  "<return> <down> <right> <right> <right> <right> <down> <down> <right> <right> <right> <right> <down> <left> M <left> = <up> <up> <up> <right> <right> <right> <right> <right> <right> <down> <down> <down> <left> <left> <insert> a <left> <left> <left> <left> <left> <left> <left> <insert> a a a <left> <down> <down> <down> <right> <right> <right> <right> <up> <up> <up> <return> <up> <up> <right> <right> <insert> s <down> <right> <right> <insert> s s <down> <down> <down> <left> <left> <left> <left> <left> <left> <insert> x <up> <insert> o o o o o <up> <up> <up> <up> <right> <right> <right> <right> <right> <right> <right> <right> <right> C-SPC <down> <down> <down> <down> <down> <down> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <insert> c <right> <return> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <right> <up> <up> <up> <up> <up> <up> C-SPC <insert> y <return>"
 "\
  
-       ╔═════╗       ╔═════╗ 
-       ║ □   ║       ║ □   ║ 
-       ║   ■ ║       ║   ■ ║ 
-   ╔←══M═══◁═╝   ╔←══M═══◁═╝ 
-   ║ ◦ ║         ║ ◦ ║       
-   ║ ╳ ║         ║ ╳ ║       
-   ╚═══╝         ╚═══╝       
-                 
+       ╔═════╗       ╔═════╗
+       ║ □   ║       ║ □   ║
+       ║   ■ ║       ║   ■ ║
+   ╔←══M═══◁═╝   ╔←══M═══◁═╝
+   ║ ◦ ║         ║ ◦ ║      
+   ║ ╳ ║         ║ ╳ ║      
+   ╚═══╝         ╚═══╝      
+                
 ")

tests/bench5.el

@@ -25,9 +25,9 @@
  
  
      aaaa aa╭─────╦╤╤══aaaaaaaa
-       aaaa │aaa  ║┏┿━━━┓aaaaaaaa  
-         aaa│ aaaa║┃│aaa┃║ aaaaaaaa 
-           a╰─────╫╂╯  a┃a   aaaaaaaa 
-                  ║┗━━━━┛║         
+       aaaa │aaa  ║┏┿━━━┓aaaaaaaa 
+         aaa│ aaaa║┃│aaa┃║ aaaaaaaa
+           a╰─────╫╂╯  a┃a   aaaaaaaa
+                  ║┗━━━━┛║        
                   ╚══════╝
 ")

tests/uniline-bench.el

@@ -71,7 +71,9 @@ RESULT is a string representing the expected result."
     (switch-to-buffer-other-window "*uniline-expected*")
     (insert result)
     (goto-char (point-min))
-    (compare-windows nil)))
+    (compare-windows nil))
+
+  uniline-bench-result)
 
 (defun uniline-bench-create ()
   "Interactively create a bench.

uniline.el

@@ -149,14 +149,11 @@ Exchange left with right, up with down."
       ('uniline--direction-lf← 'uniline--direction-ri→)
       (_ (error "Bad direction")))))
 
-(defun uniline--move-to-column (x)
+(defsubst uniline--move-to-column (x)
   "Move to column X staying on the same line.
-Add blanks if line is too short: ensure that cursor
-points to a character, not \\n.
+Add blanks if line is too short.
 Move to 0 if X negative."
-  (let ((x (max x 0))) ;; let is faster than setq when byte-compiled
-    (move-to-column (1+ x) t)
-    (move-to-column     x  t)))
+  (move-to-column (max x 0) t))
 
 (defun uniline--move-to-delta-column (x)
   "Move X characters, staying on the same line.
@@ -195,11 +192,10 @@ or blank characters at the end of target line.
 Y=0 means first line in buffer."
   (move-to-column
    (prog1
-       (1+ (current-column))
+       (current-column)
      (goto-char (point-min))
      (uniline--forward-line-force y))
-   t)
-  (backward-char))
+   t))
 
 (defun uniline--move-to-delta-line (y)
   "Move Y lines while staying on the same column.
@@ -208,10 +204,9 @@ or blank characters at the end of target line.
 Y may be negative to move backward."
   (move-to-column
    (prog1
-       (1+ (current-column))
+       (current-column)
      (uniline--forward-line-force y))
-   t)
-  (backward-char))
+   t))
 
 (defun uniline--move-to-col-lin (y x)
   "Move to line Y and column X.
@@ -221,8 +216,7 @@ Y=0 means first line of buffer.
 X=0 means first column of buffer."
   (goto-char (point-min))
   (uniline--forward-line-force y)
-  (move-to-column (1+ x) t)
-  (move-to-column     x  t))
+  (uniline--move-to-column x))
 
 (eval-when-compile ; not needed at runtime
   (defmacro uniline--move-in-direction (dir &optional nb)
@@ -255,6 +249,14 @@ In the bottom & right directions the buffer is infinite."
       ('uniline--direction-lf← '(bolp))
       (_ (error "Bad direction")))))
 
+(defun uniline--char-after ()
+  "Same as `char-after', except for right and bottom edges of buffer.
+Outside the buffer, return a blank character."
+  (let ((c (char-after)))
+    (if (or (not c) (eq c ?\n))
+        ?  ;; eol & eob are considered blank
+      c)))
+
 ;;;╭─────────────────────────────────────────────────────╮
 ;;;│Reference tables of ┼ 4 half-lines UNICODE characters│
 ;;;╰─────────────────────────────────────────────────────╯
@@ -1015,7 +1017,7 @@ north-east, south-west, etc.
   (or
    (eolp)
    (delete-char 1))
-  (insert char)
+  (insert (if (eq char ?\n) ?  char))
   (backward-char))
 
 ;;;╭────────────────────────────────────────────────────────╮
@@ -1037,7 +1039,9 @@ nil: no action except cursor movements
     "Return a bit pattern (a 4halfs).
 It represents a UNICODE character like ┬ found at (point).
 Return nil if the character is not a 4halfs character."
-    (aref uniline--char-to-4halfs (or (char-after) ? ))))
+    (aref
+     uniline--char-to-4halfs
+     (uniline--char-after))))
 
 (eval-when-compile ; not needed at runtime
   (defsubst uniline--insert-4halfs (4halfs)
@@ -1080,7 +1084,7 @@ character at point."
       (uniline--insert-char ? ))
   (let ((bits
          (or
-          (aref uniline--block-char-to-4quadb (char-after))
+          (aref uniline--block-char-to-4quadb (uniline--char-after))
           (and force 0))))
     (if bits
         (uniline--insert-char
@@ -1092,7 +1096,7 @@ character at point."
     "Helper function to clear half a quadrant-block at point.
 Assume that point is on a quadrant-block character.
 Clear the half of this character pointing in DIR direction."
-    `(let ((bits (aref uniline--block-char-to-4quadb (char-after))))
+    `(let ((bits (aref uniline--block-char-to-4quadb (uniline--char-after))))
        (if bits
            (uniline--insert-char
             (aref
@@ -1372,7 +1376,7 @@ Then the leakage of the two glyphs fills in E:
             repeat ,size
             do
             (setq hand
-                  (prog1 (char-after)
+                  (prog1 (uniline--char-after)
                     (uniline--insert-char hand)))
             (uniline--move-in-direction ,dir))
            (uniline--insert-char hand))))))
@@ -1783,7 +1787,7 @@ of the same command."
       (setq repeat (- repeat)
             back (not back)))
   (let ((line ; something like (3 x ((a ?▲ ?▶ ?▼ ?◀) (a ?↑ ?→ ?↓ ?←) …))
-         (gethash (char-after)
+         (gethash (uniline--char-after)
                   (if back
                       uniline--glyphs-reverse-hash-bw
                     uniline--glyphs-reverse-hash-fw))))
@@ -1890,7 +1894,10 @@ See `uniline--insert-glyph'."
 
 (defun uniline--rotate-arrow (dir)
   "Rotate an arrow so it points toward DIR."
-  (let ((ligne (gethash (char-after) uniline--glyphs-reverse-hash-fw)))
+  (let ((ligne
+         (gethash
+          (uniline--char-after)
+          uniline--glyphs-reverse-hash-fw)))
     (when (car ligne) ;; if (point) is on a directional arrow
       (uniline--insert-char ;; then change its direction
        (nth (1+ dir) (cadr ligne))))))