diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm index 138ddef2bd..771c5a81c5 100644 --- a/gnucash/report/standard-reports/balance-sheet.scm +++ b/gnucash/report/standard-reports/balance-sheet.scm @@ -478,13 +478,13 @@ (define (get-total-balance-fn account) (gnc:account-get-comm-balance-at-date account reportdate #f)) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (let ((space (make-list tree-depth "     \ -          "))) - (gnc:html-table-append-row! left-table space) - (unless report-form? - (gnc:html-table-append-row! right-table space))) + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (let ((space (make-list tree-depth wide))) + (gnc:html-table-append-row! left-table space) + (unless report-form? + (gnc:html-table-append-row! right-table space)))) (gnc:report-percent-done 80) (when label-assets? diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm index 18afbe3284..276e7903fc 100644 --- a/gnucash/report/standard-reports/budget-balance-sheet.scm +++ b/gnucash/report/standard-reports/budget-balance-sheet.scm @@ -675,17 +675,13 @@ ) ) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (let ((space - (make-list tree-depth "     \ -     \ -     ") - )) - (gnc:html-table-append-row! left-table space) - (if (not report-form?) - (gnc:html-table-append-row! right-table space)) - ) + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (let ((space (make-list tree-depth wide))) + (gnc:html-table-append-row! left-table space) + (unless report-form? + (gnc:html-table-append-row! right-table space)))) (gnc:report-percent-done 80) (if label-assets? (add-subtotal-line left-table (_ "Assets") #f #f)) diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm index 98cc16a07d..e73b42fad8 100644 --- a/gnucash/report/standard-reports/budget-income-statement.scm +++ b/gnucash/report/standard-reports/budget-income-statement.scm @@ -618,16 +618,11 @@ ) ) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (let ((space - (make-list tree-depth "     \ -     \ -     ") - )) - (gnc:html-table-append-row! inc-table space) - (gnc:html-table-append-row! exp-table space)) - + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (gnc:html-table-append-row! inc-table (make-list tree-depth wide)) + (gnc:html-table-append-row! exp-table (make-list tree-depth wide))) (gnc:report-percent-done 80) (if label-revenue? diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm index 0b627ddd98..aedc140f13 100644 --- a/gnucash/report/standard-reports/equity-statement.scm +++ b/gnucash/report/standard-reports/equity-statement.scm @@ -562,14 +562,10 @@ (gnc:report-percent-done 30) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (gnc:html-table-append-row! - build-table - (make-list 2 "     \ -     \ -     ") - ) + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (gnc:html-table-append-row! build-table (make-list 2 wide))) (gnc:report-percent-done 80) diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm index 254a5b41ae..c3d1ea5d12 100644 --- a/gnucash/report/standard-reports/income-statement.scm +++ b/gnucash/report/standard-reports/income-statement.scm @@ -571,18 +571,13 @@ ) ) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (let ((space - (make-list tree-depth "     \ -     \ -     ") - )) - (gnc:html-table-append-row! inc-table space) - (gnc:html-table-append-row! exp-table space) - (gnc:html-table-append-row! tra-table space)) + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (gnc:html-table-append-row! inc-table (make-list tree-depth wide)) + (gnc:html-table-append-row! exp-table (make-list tree-depth wide)) + (gnc:html-table-append-row! tra-table (make-list tree-depth wide))) - (gnc:report-percent-done 80) (if label-revenue? (add-subtotal-line inc-table (_ "Revenues") #f #f)) diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm index e9cfeeac1b..c5db018649 100644 --- a/gnucash/report/standard-reports/trial-balance.scm +++ b/gnucash/report/standard-reports/trial-balance.scm @@ -559,15 +559,14 @@ (let* ((env (gnc:html-acct-table-get-row-env acct-table 0))) (set! account-cols (get-val env 'account-cols))) - ;; Workaround to force gtkhtml into displaying wide - ;; enough columns. - (let ((space - (make-list - (+ account-cols - (if (eq? report-variant 'work-sheet) 10 2)) - "               "))) - (gnc:html-table-append-row! build-table space) - (set! header-rows (+ header-rows 1))) + (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)) + (ncols (+ account-cols (if (eq? report-variant 'work-sheet) 10 2)))) + (gnc:html-table-cell-set-style! + wide "text-cell" 'attribute '("style" "min-width:60px")) + (let ((space (make-list ncols wide))) + (gnc:html-table-append-row! build-table space) + (set! header-rows (1+ header-rows)))) + ;; add the double-column headers if required (if (eq? report-variant 'work-sheet) (let* ((headings