diff --git a/ChangeLog b/ChangeLog index 3deb992458..f8fbb74c2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-01-05 Christian Stimming + + * src/report/report-system/html-*.scm, + src/report/stylesheets/stylesheet-*.scm: Added nowrap attribute + for cells containing numbers. + 2002-01-03 Dave Peticolas * src/backend/postgres/PostgresBackend.c: allow gnucash tables diff --git a/src/report/report-system/html-document.scm b/src/report/report-system/html-document.scm index c0d785dedb..5ca9bb6245 100644 --- a/src/report/report-system/html-document.scm +++ b/src/report/report-system/html-document.scm @@ -232,8 +232,10 @@ (push (lambda (l) (set! retval (cons l retval)))) (add-internal-tag (lambda (tag) (push "<") (push tag) (push ">"))) (add-attribute - (lambda (key value prior) (push " ") (push key) (push "=") - (push value) #t)) + (lambda (key value prior) (push " ") (push key) + (if value (begin (push "=") + (push value))) + #t)) (addextraatt (lambda (attr) (cond ((string? attr) (push " ") (push attr)) diff --git a/src/report/report-system/html-style-info.scm b/src/report/report-system/html-style-info.scm index df4183cf4c..5530c23e01 100644 --- a/src/report/report-system/html-style-info.scm +++ b/src/report/report-system/html-style-info.scm @@ -96,7 +96,10 @@ (if (eq? field 'attribute) (if (list? value) (gnc:html-markup-style-info-set-attribute! - style (car value) (cadr value))) + style (car value) + (if (null? (cdr value)) + #f + (cadr value)))) (begin (if (memq field '(font-size font-face font-color)) (gnc:html-markup-style-info-set-closing-font-tag! diff --git a/src/report/report-system/html-utilities.scm b/src/report/report-system/html-utilities.scm index fd4fde29c7..f083e6283a 100644 --- a/src/report/report-system/html-utilities.scm +++ b/src/report/report-system/html-utilities.scm @@ -163,10 +163,12 @@ (- tree-depth (+ current-depth (if group-header-line? 1 0)))) ;; the account balance (list (and my-balance - (gnc:make-html-text - ((if boldface? gnc:html-markup-b identity) - ((if reverse-balance? gnc:monetary-neg identity) - my-balance))))) + (gnc:make-html-table-cell/markup + "number-cell" + (gnc:make-html-text + ((if boldface? gnc:html-markup-b identity) + ((if reverse-balance? gnc:monetary-neg identity) + my-balance)))))) (gnc:html-make-empty-cells (- current-depth (if group-header-line? 0 1)))))) @@ -210,10 +212,21 @@ (if boldface? (list (and foreign-balance - (gnc:make-html-text (gnc:html-markup-b foreign-balance))) - (and domestic-balance - (gnc:make-html-text (gnc:html-markup-b domestic-balance)))) - (list foreign-balance domestic-balance)) + (gnc:make-html-table-cell/markup + "number-cell" + (gnc:make-html-text (gnc:html-markup-b foreign-balance)))) + (and + domestic-balance + (gnc:make-html-table-cell/markup + "number-cell" + (gnc:make-html-text (gnc:html-markup-b domestic-balance))))) + (list + (gnc:make-html-table-cell/markup + "number-cell" + foreign-balance) + (gnc:make-html-table-cell/markup + "number-cell" + domestic-balance))) (gnc:html-make-empty-cells (* 2 (- current-depth (if group-header-line? 0 1))))))) @@ -688,4 +701,3 @@ (gnc:html-markup-p (_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period"))) p)) - diff --git a/src/report/standard-reports/account-summary.scm b/src/report/standard-reports/account-summary.scm index 6add442386..0c27d2cad4 100644 --- a/src/report/standard-reports/account-summary.scm +++ b/src/report/standard-reports/account-summary.scm @@ -81,7 +81,7 @@ (gnc:options-add-account-selection! options gnc:pagename-accounts optname-display-depth optname-show-subaccounts - optname-accounts "a" 1 + optname-accounts "a" 3 (lambda () ;; FIXME : gnc:get-current-accounts disappeared (let ((current-accounts '())) @@ -161,7 +161,12 @@ (doc (gnc:make-html-document)) (txt (gnc:make-html-text))) - (gnc:html-document-set-title! doc report-title) + (gnc:html-document-set-title! + doc + (string-append + report-title + " " + (gnc:timepair-to-datestring date-tp))) (if (not (null? accounts)) ;; if no max. tree depth is given we have to find the diff --git a/src/report/stylesheets/stylesheet-fancy.scm b/src/report/stylesheets/stylesheet-fancy.scm index a9df454e4f..25b56f13ae 100644 --- a/src/report/stylesheets/stylesheet-fancy.scm +++ b/src/report/stylesheets/stylesheet-fancy.scm @@ -197,7 +197,8 @@ (gnc:html-document-set-style! ssdoc "number-cell" 'tag "td" - 'attribute (list "align" "right")) + 'attribute (list "align" "left") + 'attribute (list "nowrap")) (if (and bgpixmap (not (string=? bgpixmap ""))) diff --git a/src/report/stylesheets/stylesheet-plain.scm b/src/report/stylesheets/stylesheet-plain.scm index 2b3fabab8b..4827afe405 100644 --- a/src/report/stylesheets/stylesheet-plain.scm +++ b/src/report/stylesheets/stylesheet-plain.scm @@ -105,7 +105,8 @@ (gnc:html-document-set-style! ssdoc "number-cell" 'tag "td" - 'attribute (list "align" "right")) + 'attribute (list "align" "left") + 'attribute (list "nowrap")) (gnc:html-document-set-style! ssdoc "number-header"