From 25e04e2a35722994c92eac970fab2839243e1997 Mon Sep 17 00:00:00 2001
From: Alex Shinn <alexshinn@gmail.com>
Date: Wed, 24 Jun 2020 13:08:33 +0900
Subject: [PATCH] switch /si default base to 1000, remove show-columns export

---
 lib/srfi/166.sld          |  2 +-
 lib/srfi/166/columnar.sld |  2 +-
 lib/srfi/166/test.sld     | 23 ++++++++++++-----------
 lib/srfi/166/write.scm    |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/srfi/166.sld b/lib/srfi/166.sld
index 1e6d205c..11fc1576 100644
--- a/lib/srfi/166.sld
+++ b/lib/srfi/166.sld
@@ -24,7 +24,7 @@
    pretty pretty-shared pretty-simply pretty-with-color
    ;; columnar
    columnar tabular wrapped wrapped/list wrapped/char
-   justified from-file line-numbers show-columns
+   justified from-file line-numbers
    ;; unicode
    as-unicode unicode-terminal-width unicode-terminal-width/wide
    upcased downcased
diff --git a/lib/srfi/166/columnar.sld b/lib/srfi/166/columnar.sld
index 4cdec7d2..609eb1df 100644
--- a/lib/srfi/166/columnar.sld
+++ b/lib/srfi/166/columnar.sld
@@ -10,5 +10,5 @@
           (chibi optional))
   (export
    columnar tabular wrapped wrapped/list wrapped/char
-   justified from-file line-numbers show-columns)
+   justified from-file line-numbers)
   (include "column.scm"))
diff --git a/lib/srfi/166/test.sld b/lib/srfi/166/test.sld
index 3f4352ff..fc09794e 100644
--- a/lib/srfi/166/test.sld
+++ b/lib/srfi/166/test.sld
@@ -261,7 +261,8 @@
 
       (test "608" (show #f (numeric/si 608)))
       (test "608 B" (show #f (numeric/si 608 1000 " ") "B"))
-      (test "3.9Ki" (show #f (numeric/si 3986)))
+      (test "4k" (show #f (numeric/si 3986)))
+      (test "3.9Ki" (show #f (numeric/si 3986 1024)))
       (test "4kB" (show #f (numeric/si 3986 1000) "B"))
       (test "1.2Mm" (show #f (numeric/si 1.23e6 1000) "m"))
       (test "123km" (show #f (numeric/si 1.23e5 1000) "m"))
@@ -574,33 +575,33 @@
 
       ;; columns
 
-      (test "abc\ndef\n"
+      '(test "abc\ndef\n"
           (show #f (show-columns (list displayed "abc\ndef\n"))))
-      (test "abc123\ndef456\n"
+      '(test "abc123\ndef456\n"
           (show #f (show-columns (list displayed "abc\ndef\n")
                                  (list displayed "123\n456\n"))))
-      (test "abc123\ndef456\n"
+      '(test "abc123\ndef456\n"
           (show #f (show-columns (list displayed "abc\ndef\n")
                                  (list displayed "123\n456"))))
-      (test "abc123\ndef456\n"
+      '(test "abc123\ndef456\n"
           (show #f (show-columns (list displayed "abc\ndef")
                                  (list displayed "123\n456\n"))))
-      (test "abc123\ndef456\nghi789\n"
+      '(test "abc123\ndef456\nghi789\n"
           (show #f (show-columns (list displayed "abc\ndef\nghi\n")
                                  (list displayed "123\n456\n789\n"))))
-      (test "abc123wuv\ndef456xyz\n"
+      '(test "abc123wuv\ndef456xyz\n"
           (show #f (show-columns (list displayed "abc\ndef\n")
                                  (list displayed "123\n456\n")
                                  (list displayed "wuv\nxyz\n"))))
-      (test "abc  123\ndef  456\n"
+      '(test "abc  123\ndef  456\n"
           (show #f (show-columns (list (lambda (x) (padded/right 5 x))
                                        "abc\ndef\n")
                                  (list displayed "123\n456\n"))))
-      (test "ABC  123\nDEF  456\n"
+      '(test "ABC  123\nDEF  456\n"
           (show #f (show-columns (list (lambda (x) (upcased (padded/right 5 x)))
                                        "abc\ndef\n")
                                  (list displayed "123\n456\n"))))
-      (test "ABC  123\nDEF  456\n"
+      '(test "ABC  123\nDEF  456\n"
           (show #f (show-columns (list (lambda (x) (padded/right 5 (upcased x)))
                                        "abc\ndef\n")
                                  (list displayed "123\n456\n"))))
@@ -649,7 +650,7 @@ equivalent to REVERSE.
                                    (lp (cdr ls)
                                        (kons (car ls) acc)))))))))
 
-      (test
+      '(test
            "(define (fold kons knil ls)          ; The fundamental list iterator.
   (let lp ((ls ls) (acc knil))       ; Applies KONS to each element of
     (if (null? ls)                   ; LS and the result of the previous
diff --git a/lib/srfi/166/write.scm b/lib/srfi/166/write.scm
index dd4956bf..a19853d9 100644
--- a/lib/srfi/166/write.scm
+++ b/lib/srfi/166/write.scm
@@ -363,7 +363,7 @@
     (define (round-to n k)
       (/ (round (* n k)) k))
     (lambda (n . o)
-      (let-optionals* o ((base 1024)
+      (let-optionals* o ((base 1000)
                          (separator ""))
         (let* ((log-n (log n))
                (names  (if (negative? log-n)