From efae6bd3758d9c83f417523e7d3d40207f5d35c5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 8 Nov 2015 07:32:58 -0700
Subject: [PATCH] Latext rendered: support single-line box characters (light
 and heavy)

---
 scribble-lib/scribble/latex-render.rkt        | 58 ++++++++++++++++++-
 .../tests/scribble/docs/box-chars.scrbl       | 41 +++++++++++++
 .../tests/scribble/docs/box-chars.txt         | 14 +++++
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 scribble-test/tests/scribble/docs/box-chars.scrbl
 create mode 100644 scribble-test/tests/scribble/docs/box-chars.txt

diff --git a/scribble-lib/scribble/latex-render.rkt b/scribble-lib/scribble/latex-render.rkt
index 844ec771..16fa2672 100644
--- a/scribble-lib/scribble/latex-render.rkt
+++ b/scribble-lib/scribble/latex-render.rkt
@@ -985,6 +985,8 @@
                           ;; though, so we keep this table around to avoid regressions.
                           (case c
                             [(#\╔ #\═ #\╗ #\║ #\╚ #\╝ #\╦ #\╠ #\╣ #\╬ #\╩) (box-character c)]
+                            [(#\┌ #\─ #\┐ #\│ #\└ #\┘ #\┬ #\├ #\┤ #\┼ #\┴) (box-character c)]
+                            [(#\┏ #\━ #\┓ #\┃ #\┗ #\┛ #\┳ #\┣ #\┫ #\╋ #\┻) (box-character c 2)]
                             [(#\u2011) "\\mbox{-}"] ; non-breaking hyphen
                             [(#\uB0) "$^{\\circ}$"] ; degree
                             [(#\uB2) "$^2$"]
@@ -1211,10 +1213,13 @@
                 (loop (add1 i))))))]))
     
     
-    (define/private (box-character c)
+    (define/private (box-character c [line-thickness 1])
       (define (combine . args) 
         (apply string-append
                "\\setlength{\\unitlength}{0.05em}"
+               (if (= line-thickness 1)
+                   ""
+                   (format "\\linethickness{~apt}" (* 0.4 line-thickness)))
                (filter (λ (x) (not (regexp-match #rx"^[ \n]*$" x)))
                        (flatten args))))
       (define (adjust % v) 
@@ -1225,8 +1230,10 @@
       (define (x v) (adjust 1 v))
       (define (y v) (adjust 6/4 v))
       (define upper-horizontal @list{\put(@x[0],@y[6]){\line(1,0){@x[10]}}})
+      (define mid-horizontal @list{\put(@x[0],@y[5]){\line(1,0){@x[10]}}})
       (define lower-horizontal @list{\put(@x[0],@y[4]){\line(1,0){@x[10]}}})
       (define righter-vertical @list{\put(@x[6],@y[10]){\line(0,-1){@y[10]}}})
+      (define mid-vertical @list{\put(@x[5],@y[10]){\line(0,-1){@y[10]}}})
       (define lefter-vertical @list{\put(@x[4],@y[10]){\line(0,-1){@y[10]}}})
       (define bottom-right @list{\put(@x[6],@y[4]){\line(1,0){@x[4]}}
                                  \put(@x[6],@y[0]){\line(0,1){@y[4]}}})
@@ -1300,6 +1307,55 @@
                    @bottom-left
                    @upper-right
                    @bottom-right
+                   @footer}]
+        [(#\┌ #\┏)
+         @combine{@header
+                   \put(@x[5],@y[5]){\line(1,0){@x[5]}}
+                   \put(@x[5],@y[0]){\line(0,1){@y[5]}}
+                   @footer}]
+        [(#\─ #\━) @combine{@header
+                        @mid-horizontal
+                        @footer}]
+        [(#\┐ #\┓) @combine{@header
+                        \put(@x[0],@y[5]){\line(1,0){@x[5]}}
+                        \put(@x[5],@y[0]){\line(0,1){@y[5]}}
+                        @footer}]
+        [(#\│ #\┃) @combine{@header
+                        @mid-vertical
+                        @footer}]
+        [(#\└ #\┗) @combine{@header
+                        \put(@x[5],@y[5]){\line(1,0){@x[5]}}
+                        \put(@x[5],@y[10]){\line(0,-1){@y[5]}}
+                        @footer}]
+        [(#\┘ #\┛)
+         @combine{@header
+                  \put(@x[0],@y[5]){\line(1,0){@x[5]}}
+                  \put(@x[5],@y[10]){\line(0,-1){@y[5]}}
+                  @footer}]
+        [(#\┤ #\┫)
+         @combine{@header
+                  \put(@x[0],@y[5]){\line(1,0){@x[5]}}
+                  @mid-vertical
+                  @footer}]
+        [(#\├ #\┣)
+         @combine{@header
+                  \put(@x[5],@y[5]){\line(1,0){@x[5]}}
+                  @mid-vertical
+                  @footer}]
+        [(#\┴ #\┻)
+         @combine{@header
+                  \put(@x[5],@y[10]){\line(0,-1){@y[5]}}
+                  @mid-horizontal
+                  @footer}]
+        [(#\┬ #\┳)
+         @combine{@header
+                  \put(@x[5],@y[5]){\line(0,-1){@y[5]}}
+                  @mid-horizontal
+                  @footer}]
+        [(#\┼ #\╋)
+          @combine{@header
+                   @mid-horizontal
+                   @mid-vertical
                    @footer}]))
 
     ;; ----------------------------------------
diff --git a/scribble-test/tests/scribble/docs/box-chars.scrbl b/scribble-test/tests/scribble/docs/box-chars.scrbl
new file mode 100644
index 00000000..daf2ec1d
--- /dev/null
+++ b/scribble-test/tests/scribble/docs/box-chars.scrbl
@@ -0,0 +1,41 @@
+#lang scribble/base
+
+@;{ This test is mainly intended for checking Latex
+    rendering of box characters, but it should render
+    ok with text, too. }
+
+@(define charss
+         '((#\┌ #\─ #\┐ #\│ #\└ #\┘ #\┬ #\├ #\┤ #\┼ #\┴)
+           (#\╔ #\═ #\╗ #\║ #\╚ #\╝ #\╦ #\╠ #\╣ #\╬ #\╩)
+           (#\┏ #\━ #\┓ #\┃ #\┗ #\┛ #\┳ #\┣ #\┫ #\╋ #\┻)))
+
+@(define (adj-verbatim which . strs)
+  (define ht (for/hash ([c1 (in-list (car charss))]
+                        [c2 (in-list (list-ref charss which))])
+               (values c1 c2)))
+  (apply verbatim
+         (for/list ([s (in-list strs)])
+           (list->string
+            (for/list ([c (in-string s)])
+              (hash-ref ht c c))))))
+
+@verbatim{
+┌┬─┐
+├┤ │
+└┼─┼┐
+ └─┴┘
+ }
+
+@adj-verbatim[1]{
+┌┬─┐
+├┤ │
+└┼─┼┐
+ └─┴┘
+ }
+
+@adj-verbatim[2]{
+┌┬─┐
+├┤ │
+└┼─┼┐
+ └─┴┘
+ }
diff --git a/scribble-test/tests/scribble/docs/box-chars.txt b/scribble-test/tests/scribble/docs/box-chars.txt
new file mode 100644
index 00000000..2b69feb8
--- /dev/null
+++ b/scribble-test/tests/scribble/docs/box-chars.txt
@@ -0,0 +1,14 @@
+┌┬─┐ 
+├┤ │ 
+└┼─┼┐
+ └─┴┘
+
+╔╦═╗ 
+╠╣ ║ 
+╚╬═╬╗
+ ╚═╩╝
+
+┏┳━┓ 
+┣┫ ┃ 
+┗╋━╋┓
+ ┗━┻┛