2002-01-05 Christian Stimming <stimming@tuhh.de>

* src/report/report-system/html-*.scm,
	src/report/stylesheets/stylesheet-*.scm: Added nowrap attribute
	for cells containing numbers.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6515 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2002-01-05 17:21:59 +00:00
parent 82b3df0838
commit f0b6a6fa57
7 changed files with 46 additions and 16 deletions

View File

@ -1,3 +1,9 @@
2002-01-05 Christian Stimming <stimming@tuhh.de>
* src/report/report-system/html-*.scm,
src/report/stylesheets/stylesheet-*.scm: Added nowrap attribute
for cells containing numbers.
2002-01-03 Dave Peticolas <dave@krondo.com> 2002-01-03 Dave Peticolas <dave@krondo.com>
* src/backend/postgres/PostgresBackend.c: allow gnucash tables * src/backend/postgres/PostgresBackend.c: allow gnucash tables

View File

@ -232,8 +232,10 @@
(push (lambda (l) (set! retval (cons l retval)))) (push (lambda (l) (set! retval (cons l retval))))
(add-internal-tag (lambda (tag) (push "<") (push tag) (push ">"))) (add-internal-tag (lambda (tag) (push "<") (push tag) (push ">")))
(add-attribute (add-attribute
(lambda (key value prior) (push " ") (push key) (push "=") (lambda (key value prior) (push " ") (push key)
(push value) #t)) (if value (begin (push "=")
(push value)))
#t))
(addextraatt (addextraatt
(lambda (attr) (lambda (attr)
(cond ((string? attr) (push " ") (push attr)) (cond ((string? attr) (push " ") (push attr))

View File

@ -96,7 +96,10 @@
(if (eq? field 'attribute) (if (eq? field 'attribute)
(if (list? value) (if (list? value)
(gnc:html-markup-style-info-set-attribute! (gnc:html-markup-style-info-set-attribute!
style (car value) (cadr value))) style (car value)
(if (null? (cdr value))
#f
(cadr value))))
(begin (begin
(if (memq field '(font-size font-face font-color)) (if (memq field '(font-size font-face font-color))
(gnc:html-markup-style-info-set-closing-font-tag! (gnc:html-markup-style-info-set-closing-font-tag!

View File

@ -163,10 +163,12 @@
(- tree-depth (+ current-depth (if group-header-line? 1 0)))) (- tree-depth (+ current-depth (if group-header-line? 1 0))))
;; the account balance ;; the account balance
(list (and my-balance (list (and my-balance
(gnc:make-html-table-cell/markup
"number-cell"
(gnc:make-html-text (gnc:make-html-text
((if boldface? gnc:html-markup-b identity) ((if boldface? gnc:html-markup-b identity)
((if reverse-balance? gnc:monetary-neg identity) ((if reverse-balance? gnc:monetary-neg identity)
my-balance))))) my-balance))))))
(gnc:html-make-empty-cells (- current-depth (gnc:html-make-empty-cells (- current-depth
(if group-header-line? 0 1)))))) (if group-header-line? 0 1))))))
@ -210,10 +212,21 @@
(if boldface? (if boldface?
(list (list
(and foreign-balance (and foreign-balance
(gnc:make-html-text (gnc:html-markup-b foreign-balance))) (gnc:make-html-table-cell/markup
(and domestic-balance "number-cell"
(gnc:make-html-text (gnc:html-markup-b domestic-balance)))) (gnc:make-html-text (gnc:html-markup-b foreign-balance))))
(list foreign-balance domestic-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 (gnc:html-make-empty-cells (* 2 (- current-depth
(if group-header-line? 0 1))))))) (if group-header-line? 0 1)))))))
@ -688,4 +701,3 @@
(gnc:html-markup-p (gnc:html-markup-p
(_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period"))) (_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period")))
p)) p))

View File

@ -81,7 +81,7 @@
(gnc:options-add-account-selection! (gnc:options-add-account-selection!
options gnc:pagename-accounts options gnc:pagename-accounts
optname-display-depth optname-show-subaccounts optname-display-depth optname-show-subaccounts
optname-accounts "a" 1 optname-accounts "a" 3
(lambda () (lambda ()
;; FIXME : gnc:get-current-accounts disappeared ;; FIXME : gnc:get-current-accounts disappeared
(let ((current-accounts '())) (let ((current-accounts '()))
@ -161,7 +161,12 @@
(doc (gnc:make-html-document)) (doc (gnc:make-html-document))
(txt (gnc:make-html-text))) (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 (not (null? accounts))
;; if no max. tree depth is given we have to find the ;; if no max. tree depth is given we have to find the

View File

@ -197,7 +197,8 @@
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "number-cell" ssdoc "number-cell"
'tag "td" 'tag "td"
'attribute (list "align" "right")) 'attribute (list "align" "left")
'attribute (list "nowrap"))
(if (and bgpixmap (if (and bgpixmap
(not (string=? bgpixmap ""))) (not (string=? bgpixmap "")))

View File

@ -105,7 +105,8 @@
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "number-cell" ssdoc "number-cell"
'tag "td" 'tag "td"
'attribute (list "align" "right")) 'attribute (list "align" "left")
'attribute (list "nowrap"))
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "number-header" ssdoc "number-header"