diff --git a/src/notifications.scm b/src/notifications.scm index e6c9cf1..be629ba 100644 --- a/src/notifications.scm +++ b/src/notifications.scm @@ -51,7 +51,7 @@ members-fees mbase members-print - table-old + table bank-account logging) @@ -151,7 +151,7 @@ (append (list "" "Active debtors:") - (table->list + (table->string-list (cons (list "Id" "Member" "Type" "Balance" "Last payment") (map (lambda (mr) (list (brmember-id mr) @@ -170,8 +170,10 @@ )) debtors)) #:border-style 'ascii - #:col-border #t - #:row0-border #t)))) + #:border '(((#:bottom #:right light) ... (#:bottom light)) + ((#:right light) ... none) + ...) + )))) (boring (sort (find-members-by-predicate mb @@ -185,7 +187,7 @@ (append (list "" "Other active members:") - (table->list + (table->string-list (cons (list "Id" "Member" "Type" "Balance" "Last payment") (map (lambda (mr) (list (brmember-id mr) @@ -204,8 +206,10 @@ )) boring)) #:border-style 'ascii - #:col-border #t - #:row0-border #t))))) + #:border '(((#:bottom #:right light) ... (#:bottom light)) + ((#:right light) ... none) + ...) + ))))) (append income-lst unpaired-lst debtors-lst diff --git a/src/table-processor.scm b/src/table-processor.scm index 3758ad8..e570ca7 100644 --- a/src/table-processor.scm +++ b/src/table-processor.scm @@ -197,7 +197,9 @@ ;;(_ (print width-surplus)) (widths-adds (compute-weighted-width-adds width-surplus col-weights)) ;;(_ (print widths-adds)) - (col-widths (distribute-surplus widths-adds min-widths)) + (col-widths (if width-arg + (distribute-surplus widths-adds min-widths) + col-weights)) ;;(_ (print col-widths)) (tbl1 (render-cells-widths ptbl col-widths)) ;;(_ (print tbl1)) diff --git a/src/table.scm b/src/table.scm index 537fa0e..5e3fcf2 100644 --- a/src/table.scm +++ b/src/table.scm @@ -75,7 +75,8 @@ #:border (border-spec '((none ...) ...)) #:widths (widths-spec '(0 ...)) #:width (width #f) - #:unicode? (unicode? (eq? (*table-border-style*) 'unicode)) + #:border-style (border-style (*table-border-style*)) + #:unicode? (unicode? (eq? border-style 'unicode)) #:ansi-reset? (ansi-reset? #f)) (let-values (((ptbl col-widths) (table-prepare tbl width widths-spec)))