From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 31 Dec 2020 00:06:01 +0000 (-0800)
Subject: ascii: Support dashed lines in output.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd5a61766a5a599e9cf6b010e48bf1f57c9a1c4c;p=pspp

ascii: Support dashed lines in output.

Unicode has thick lines too, so that's another opportunity for future
expansion.
---

diff --git a/src/output/ascii.c b/src/output/ascii.c
index f7ab30338a..f019fda4e1 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -72,6 +72,7 @@
 enum
   {
     ASCII_LINE_NONE,
+    ASCII_LINE_DASHED,
     ASCII_LINE_SINGLE,
     ASCII_LINE_DOUBLE,
     ASCII_N_LINES
@@ -87,40 +88,78 @@ get_ascii_box (void)
 {
   enum {
     _ = ASCII_LINE_NONE,
+    d = ASCII_LINE_DASHED,
     S = ASCII_LINE_SINGLE,
     D = ASCII_LINE_DOUBLE,
   };
 
   static const struct box_chars ascii_box =
     {
-      /* r  b  l   t:  _    S    D */
-      .c[_][_][_] = { ' ', '|', '#', },
-      .c[_][_][S] = { '-', '+', '#', },
-      .c[_][_][D] = { '=', '#', '#', },
-      .c[_][S][_] = { '|', '|', '#', },
-      .c[_][S][S] = { '+', '+', '#', },
-      .c[_][S][D] = { '#', '#', '#', },
-      .c[_][D][_] = { '#', '#', '#', },
-      .c[_][D][S] = { '#', '#', '#', },
-      .c[_][D][D] = { '#', '#', '#', },
-      .c[S][_][_] = { '-', '+', '#', },
-      .c[S][_][S] = { '-', '+', '#', },
-      .c[S][_][D] = { '#', '#', '#', },
-      .c[S][S][_] = { '+', '+', '#', },
-      .c[S][S][S] = { '+', '+', '#', },
-      .c[S][S][D] = { '#', '#', '#', },
-      .c[S][D][_] = { '#', '#', '#', },
-      .c[S][D][S] = { '#', '#', '#', },
-      .c[S][D][D] = { '#', '#', '#', },
-      .c[D][_][_] = { '=', '#', '#', },
-      .c[D][_][S] = { '#', '#', '#', },
-      .c[D][_][D] = { '=', '#', '#', },
-      .c[D][S][_] = { '#', '#', '#', },
-      .c[D][S][S] = { '#', '#', '#', },
-      .c[D][S][D] = { '#', '#', '#', },
-      .c[D][D][_] = { '#', '#', '#', },
-      .c[D][D][S] = { '#', '#', '#', },
-      .c[D][D][D] = { '#', '#', '#', },
+      /* r  b  l   t:  _    d    S    D */
+      .c[_][_][_] = { ' ', '|', '|', '#', },
+      .c[_][_][d] = { '-', '+', '+', '#', },
+      .c[_][_][S] = { '-', '+', '+', '#', },
+      .c[_][_][D] = { '=', '#', '#', '#', },
+      .c[_][d][_] = { '|', '|', '|', '#', },
+      .c[_][d][d] = { '+', '+', '+', '#', },
+      .c[_][d][S] = { '+', '+', '+', '#', },
+      .c[_][d][D] = { '#', '#', '#', '#', },
+      .c[_][S][_] = { '|', '|', '|', '#', },
+      .c[_][S][d] = { '+', '+', '+', '#', },
+      .c[_][S][S] = { '+', '+', '+', '#', },
+      .c[_][S][D] = { '#', '#', '#', '#', },
+      .c[_][D][_] = { '#', '#', '#', '#', },
+      .c[_][D][d] = { '#', '#', '#', '#', },
+      .c[_][D][S] = { '#', '#', '#', '#', },
+      .c[_][D][D] = { '#', '#', '#', '#', },
+      .c[d][_][_] = { '-', '+', '+', '#', },
+      .c[d][_][d] = { '-', '+', '+', '#', },
+      .c[d][_][S] = { '-', '+', '+', '#', },
+      .c[d][_][D] = { '#', '#', '#', '#', },
+      .c[d][d][_] = { '+', '+', '+', '#', },
+      .c[d][d][d] = { '+', '+', '+', '#', },
+      .c[d][d][S] = { '+', '+', '+', '#', },
+      .c[d][d][D] = { '#', '#', '#', '#', },
+      .c[d][S][_] = { '+', '+', '+', '#', },
+      .c[d][S][d] = { '+', '+', '+', '#', },
+      .c[d][S][S] = { '+', '+', '+', '#', },
+      .c[d][S][D] = { '#', '#', '#', '#', },
+      .c[d][D][_] = { '#', '#', '#', '#', },
+      .c[d][D][d] = { '#', '#', '#', '#', },
+      .c[d][D][S] = { '#', '#', '#', '#', },
+      .c[d][D][D] = { '#', '#', '#', '#', },
+      .c[S][_][_] = { '-', '+', '+', '#', },
+      .c[S][_][d] = { '-', '+', '+', '#', },
+      .c[S][_][S] = { '-', '+', '+', '#', },
+      .c[S][_][D] = { '#', '#', '#', '#', },
+      .c[S][d][_] = { '+', '+', '+', '#', },
+      .c[S][d][d] = { '+', '+', '+', '#', },
+      .c[S][d][S] = { '+', '+', '+', '#', },
+      .c[S][d][D] = { '#', '#', '#', '#', },
+      .c[S][S][_] = { '+', '+', '+', '#', },
+      .c[S][S][d] = { '+', '+', '+', '#', },
+      .c[S][S][S] = { '+', '+', '+', '#', },
+      .c[S][S][D] = { '#', '#', '#', '#', },
+      .c[S][D][_] = { '#', '#', '#', '#', },
+      .c[S][D][d] = { '#', '#', '#', '#', },
+      .c[S][D][S] = { '#', '#', '#', '#', },
+      .c[S][D][D] = { '#', '#', '#', '#', },
+      .c[D][_][_] = { '=', '#', '#', '#', },
+      .c[D][_][d] = { '#', '#', '#', '#', },
+      .c[D][_][S] = { '#', '#', '#', '#', },
+      .c[D][_][D] = { '=', '#', '#', '#', },
+      .c[D][d][_] = { '#', '#', '#', '#', },
+      .c[D][d][d] = { '#', '#', '#', '#', },
+      .c[D][d][S] = { '#', '#', '#', '#', },
+      .c[D][d][D] = { '#', '#', '#', '#', },
+      .c[D][S][_] = { '#', '#', '#', '#', },
+      .c[D][S][d] = { '#', '#', '#', '#', },
+      .c[D][S][S] = { '#', '#', '#', '#', },
+      .c[D][S][D] = { '#', '#', '#', '#', },
+      .c[D][D][_] = { '#', '#', '#', '#', },
+      .c[D][D][d] = { '#', '#', '#', '#', },
+      .c[D][D][S] = { '#', '#', '#', '#', },
+      .c[D][D][D] = { '#', '#', '#', '#', },
     };
   return &ascii_box;
 }
@@ -130,40 +169,78 @@ get_unicode_box (void)
 {
   enum {
     _ = ASCII_LINE_NONE,
+    d = ASCII_LINE_DASHED,
     S = ASCII_LINE_SINGLE,
     D = ASCII_LINE_DOUBLE,
   };
 
   static const struct box_chars unicode_box =
     {
-      /* r  b  l   t:   _       S       D */
-      .c[_][_][_] = { 0x0020, 0x2575, 0x2551, }, /*  ╵║ */
-      .c[_][_][S] = { 0x2574, 0x256f, 0x255c, }, /* ╴╯╜ */
-      .c[_][_][D] = { 0x2550, 0x255b, 0x255d, }, /* ═╛╝ */
-      .c[_][S][_] = { 0x2577, 0x2502, 0x2551, }, /* ╷│║ */
-      .c[_][S][S] = { 0x256e, 0x2524, 0x2562, }, /* ╮┤╢ */
-      .c[_][S][D] = { 0x2555, 0x2561, 0x2563, }, /* ╕╡╣ */
-      .c[_][D][_] = { 0x2551, 0x2551, 0x2551, }, /* ║║║ */
-      .c[_][D][S] = { 0x2556, 0x2562, 0x2562, }, /* ╖╢╢ */
-      .c[_][D][D] = { 0x2557, 0x2563, 0x2563, }, /* ╗╣╣ */
-      .c[S][_][_] = { 0x2576, 0x2570, 0x2559, }, /* ╶╰╙ */
-      .c[S][_][S] = { 0x2500, 0x2534, 0x2568, }, /* ─┴╨ */
-      .c[S][_][D] = { 0x2550, 0x2567, 0x2569, }, /* ═╧╩ */
-      .c[S][S][_] = { 0x256d, 0x251c, 0x255f, }, /* ╭├╟ */
-      .c[S][S][S] = { 0x252c, 0x253c, 0x256a, }, /* ┬┼╪ */
-      .c[S][S][D] = { 0x2564, 0x256a, 0x256c, }, /* ╤╪╬ */
-      .c[S][D][_] = { 0x2553, 0x255f, 0x255f, }, /* ╓╟╟ */
-      .c[S][D][S] = { 0x2565, 0x256b, 0x256b, }, /* ╥╫╫ */
-      .c[S][D][D] = { 0x2566, 0x256c, 0x256c, }, /* ╦╬╬ */
-      .c[D][_][_] = { 0x2550, 0x2558, 0x255a, }, /* ═╘╚ */
-      .c[D][_][S] = { 0x2550, 0x2567, 0x2569, }, /* ═╧╩ */
-      .c[D][_][D] = { 0x2550, 0x2567, 0x2569, }, /* ═╧╩ */
-      .c[D][S][_] = { 0x2552, 0x255e, 0x2560, }, /* ╒╞╠ */
-      .c[D][S][S] = { 0x2564, 0x256a, 0x256c, }, /* ╤╪╬ */
-      .c[D][S][D] = { 0x2564, 0x256a, 0x256c, }, /* ╤╪╬ */
-      .c[D][D][_] = { 0x2554, 0x2560, 0x2560, }, /* ╔╠╠ */
-      .c[D][D][S] = { 0x2560, 0x256c, 0x256c, }, /* ╠╬╬ */
-      .c[D][D][D] = { 0x2566, 0x256c, 0x256c, }, /* ╦╬╬ */
+      /* r  b  l   t:   _       d       S       D */
+      .c[_][_][_] = { 0x0020, 0x2575, 0x2575, 0x2551, }, /*  ╵╵║ */
+      .c[_][_][d] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */
+      .c[_][_][S] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */
+      .c[_][_][D] = { 0x2550, 0x255b, 0x255b, 0x255d, }, /* ═╛╛╝ */
+      .c[_][S][_] = { 0x2577, 0x2502, 0x2502, 0x2551, }, /* ╷││║ */
+      .c[_][S][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+      .c[_][S][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+      .c[_][S][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */
+      .c[_][d][_] = { 0x2577, 0x250a, 0x2502, 0x2551, }, /* ╷┊│║ */
+      .c[_][d][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+      .c[_][d][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+      .c[_][d][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */
+      .c[_][D][_] = { 0x2551, 0x2551, 0x2551, 0x2551, }, /* ║║║║ */
+      .c[_][D][d] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */
+      .c[_][D][S] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */
+      .c[_][D][D] = { 0x2557, 0x2563, 0x2563, 0x2563, }, /* ╗╣╣╣ */
+      .c[d][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */
+      .c[d][_][d] = { 0x254c, 0x2534, 0x2534, 0x2568, }, /* ╌┴┴╨ */
+      .c[d][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+      .c[d][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+      .c[d][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+      .c[d][d][d] = { 0x252c, 0x002b, 0x253c, 0x256a, }, /* ┬+┼╪ */
+      .c[d][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[d][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[d][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+      .c[d][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[d][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[d][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[d][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */
+      .c[d][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+      .c[d][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+      .c[d][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
+      .c[S][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */
+      .c[S][_][d] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+      .c[S][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+      .c[S][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+      .c[S][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+      .c[S][d][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[S][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[S][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[S][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+      .c[S][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[S][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+      .c[S][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[S][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */
+      .c[S][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+      .c[S][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+      .c[S][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
+      .c[D][_][_] = { 0x2550, 0x2558, 0x2558, 0x255a, }, /* ═╘╘╚ */
+      .c[D][_][d] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+      .c[D][_][S] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+      .c[D][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+      .c[D][d][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */
+      .c[D][d][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][d][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][S][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */
+      .c[D][S][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][S][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+      .c[D][D][_] = { 0x2554, 0x2560, 0x2560, 0x2560, }, /* ╔╠╠╠ */
+      .c[D][D][d] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */
+      .c[D][D][S] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */
+      .c[D][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
     };
   return &unicode_box;
 }
@@ -176,8 +253,10 @@ ascii_line_from_render_line (int render_line)
     case RENDER_LINE_NONE:
       return ASCII_LINE_NONE;
 
-    case RENDER_LINE_SINGLE:
     case RENDER_LINE_DASHED:
+      return ASCII_LINE_DASHED;
+
+    case RENDER_LINE_SINGLE:
     case RENDER_LINE_THICK:
     case RENDER_LINE_THIN:
       return ASCII_LINE_SINGLE;