diff --git a/src/Makefile b/src/Makefile index 57690f8..9ff92f8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -187,7 +187,7 @@ brmember-parser.o: brmember-parser.import.scm brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES) MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm \ - brmember.import.scm cal-month.import.scm table-old.import.scm \ + brmember.import.scm cal-month.import.scm table.import.scm \ listing.import.scm ansi.import.scm cal-period.import.scm \ primes.import.scm mbase.import.scm configuration.import.scm \ bank-account.import.scm members-fees.import.scm \ @@ -330,7 +330,7 @@ NOTIFICATIONS-SOURCES=notifications.scm brmember.import.scm \ members-payments.import.scm util-format.import.scm \ brmember-format.import.scm configuration.import.scm \ util-time.import.scm members-fees.import.scm mbase.import.scm \ - members-print.import.scm table-old.import.scm \ + members-print.import.scm table.import.scm \ bank-account.import.scm logging.import.scm notifications.o: notifications.import.scm diff --git a/src/members-print.scm b/src/members-print.scm index ce74a54..5c858cc 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -50,7 +50,7 @@ util-dict-list brmember cal-month - table-old + table listing ansi cal-period @@ -502,7 +502,7 @@ (define (unpaired-table mb . args) (apply - table->list + table->string-list (cons (list "Id" "Date" "Amount" "" "VS" "Type" "Message" "Account" "Bank") (map @@ -518,8 +518,9 @@ (bank-transaction-bank tr) )) (mbase-unpaired mb))) - #:row0-border #t - #:col-border #t + #:border '(((#:bottom #:right light) ... (#:bottom light)) + ((#:right light) ... none) + ...) args)) ;; Prints all transactions which the members base considers unpaired. diff --git a/src/table-processor.scm b/src/table-processor.scm index e570ca7..ff79d9f 100644 --- a/src/table-processor.scm +++ b/src/table-processor.scm @@ -84,7 +84,7 @@ (if (null? tbl) widths (loop (combine-column-widths widths - (map sgr-cell-min-width (car tbl))) + (map cell-query (car tbl))) (cdr tbl)))))) ;; Minimal widths