From 0806be2420b5ad68ec6aa5d357c3f16733db80f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Thu, 15 Jun 2023 16:30:53 +0200 Subject: [PATCH] Compatibility layer for table-old style. --- src/Makefile | 5 +++-- src/hackerbase.scm | 3 ++- src/table.scm | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 428d18d..57690f8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -39,7 +39,7 @@ HACKERBASE-DEPS=hackerbase.scm cal-month.import.scm \ mailman.import.scm texts.import.scm tests.import.scm \ notifications.import.scm logging.import.scm \ progress.import.scm cal-period.import.scm \ - util-stdout.import.scm + util-stdout.import.scm table-old.import.scm HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o \ cal-period.o ansi.o util-dict-list.o command-line.o mbase.o \ @@ -405,7 +405,8 @@ racket-kwargs.import.scm: $(RACKET-KWARGS-SOURCES) TABLE-SOURCES=table.scm sgr-list.import.scm sgr-block.import.scm \ racket-kwargs.import.scm table-processor.import.scm \ - table-border.import.scm table-style.import.scm + table-border.import.scm table-style.import.scm \ + table-old.import.scm table.o: table.import.scm table.import.scm: $(TABLE-SOURCES) diff --git a/src/hackerbase.scm b/src/hackerbase.scm index d3df497..9e8f2a3 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -45,7 +45,8 @@ cal-day util-git util-dict-list - util-stdout) + util-stdout + table-old) ;; Command-line options and configurable parameters (define -needs-bank- (make-parameter #f)) diff --git a/src/table.scm b/src/table.scm index 6de8e39..2a2a8b3 100644 --- a/src/table.scm +++ b/src/table.scm @@ -41,7 +41,9 @@ racket-kwargs table-processor table-border - table-style) + table-style + (only table-old *table-border-style*) + ) (define (print-table . args) (print (apply table->string args))) @@ -73,7 +75,7 @@ #:border (border-spec '((none ...) ...)) #:widths (widths-spec '(0 ...)) #:width (width #f) - #:unicode? (unicode? #t)) + #:unicode? (unicode? (eq? (*table-border-style*) 'unicode))) (let-values (((ptbl col-widths) (table-prepare tbl width widths-spec))) (let* ((num-columns (length (car tbl)))