gnucash master: Whitespace cosmetics
Geert Janssens
gjanssens at code.gnucash.org
Thu Mar 23 18:16:34 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/539ef528 (commit)
from https://github.com/Gnucash/gnucash/commit/4f5658fc (commit)
commit 539ef5283748436ed90cf60bfe34118c18ff8ff3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Dec 18 16:47:20 2014 +0100
Whitespace cosmetics
Replace tabs with spaces
Align some related lines
Remove trailing whitespace
diff --git a/src/report/report-system/html-document.scm b/src/report/report-system/html-document.scm
index 8af0ba7..7916eda 100644
--- a/src/report/report-system/html-document.scm
+++ b/src/report/report-system/html-document.scm
@@ -1,18 +1,18 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; html-document.scm : generate HTML programmatically, with support
-;; for simple style elements.
+;; for simple style elements.
;; Copyright 2000 Bill Gribble <grib at gnumatic.com>
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
;; You should have received a copy of the GNU General Public License
;; along with this program; if not, contact:
;;
@@ -25,29 +25,29 @@
(use-modules (gnucash printf))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; <html-document> class
+;; <html-document> class
;; this is the top-level object representing an entire HTML document.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define <html-document>
- (make-record-type "<html-document>"
+(define <html-document>
+ (make-record-type "<html-document>"
'(style-sheet style-stack style style-text title headline objects)))
-(define gnc:html-document?
+(define gnc:html-document?
(record-predicate <html-document>))
(define gnc:make-html-document-internal
(record-constructor <html-document>))
(define (gnc:make-html-document)
- (gnc:make-html-document-internal
- #f ;; the stylesheet
+ (gnc:make-html-document-internal
+ #f ;; the stylesheet
'() ;; style stack
(gnc:make-html-style-table) ;; document style info
#f ;; style text
"" ;; document title
#f ;; headline
- '() ;; subobjects
+ '() ;; subobjects
))
(define gnc:html-document-set-title!
@@ -102,9 +102,9 @@
(let ((newstyle #f))
(if (and (= (length rest) 2)
(procedure? (car rest)))
- (set! newstyle
+ (set! newstyle
(apply gnc:make-html-data-style-info rest))
- (set! newstyle
+ (set! newstyle
(apply gnc:make-html-markup-style-info rest)))
(gnc:html-style-table-set! (gnc:html-document-style doc) tag newstyle)))
@@ -117,7 +117,7 @@
(set! retval (cons elt retval))
(if (not (list? elt))
(set! retval
- (cons (with-output-to-string
+ (cons (with-output-to-string
(lambda () (display elt)))
retval))
(do-list elt))))
@@ -127,66 +127,66 @@
;; first optional argument is "headers?"
;; returns the html document as a string, I think.
-(define (gnc:html-document-render doc . rest)
+(define (gnc:html-document-render doc . rest)
(let ((stylesheet (gnc:html-document-style-sheet doc))
(headers? (if (null? rest) #f (if (car rest) #t #f)))
- (style-text (gnc:html-document-style-text doc))
- )
- (if stylesheet
- ;; if there's a style sheet, let it do the rendering
+ (style-text (gnc:html-document-style-text doc))
+ )
+ (if stylesheet
+ ;; if there's a style sheet, let it do the rendering
(gnc:html-style-sheet-render stylesheet doc headers?)
-
- ;; otherwise, do the trivial render.
+
+ ;; otherwise, do the trivial render.
(let* ((retval '())
(push (lambda (l) (set! retval (cons l retval))))
- (objs (gnc:html-document-objects doc))
- (work-to-do (length objs))
- (css? (gnc-html-engine-supports-css))
- (work-done 0)
+ (objs (gnc:html-document-objects doc))
+ (work-to-do (length objs))
+ (css? (gnc-html-engine-supports-css))
+ (work-done 0)
(title (gnc:html-document-title doc)))
- ;; compile the doc style
+ ;; compile the doc style
(gnc:html-style-table-compile (gnc:html-document-style doc)
(gnc:html-document-style-stack doc))
- ;; push it
+ ;; push it
(gnc:html-document-push-style doc (gnc:html-document-style doc))
(if (not (string-null? title))
(gnc:report-render-starting (gnc:html-document-title doc)))
(if (not (null? headers?))
- (begin
+ (begin
;;This is the only place where <html> appears
- ;;with the exception of 2 reports:
+ ;;with the exception of 2 reports:
;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm:<html>
;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
(push "<head>\n")
(push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n")
- (if css?
- (if style-text
- (push (list "</style>" style-text "<style type=\"text/css\">\n"))))
+ (if css?
+ (if style-text
+ (push (list "</style>" style-text "<style type=\"text/css\">\n"))))
(let ((title (gnc:html-document-title doc)))
- (if title
+ (if title
(push (list "</title>" title "<title>\n"))))
(push "</head>\n")
-
+
;; this lovely little number just makes sure that <body>
- ;; attributes like bgcolor get included
+ ;; attributes like bgcolor get included
(push ((gnc:html-markup/open-tag-only "body") doc))))
-
+
;; now render the children
- (for-each
- (lambda (child)
- (begin
- (push (gnc:html-object-render child doc))
- (set! work-done (+ 1 work-done))
- (gnc:report-percent-done (* 100 (/ work-done work-to-do)))))
+ (for-each
+ (lambda (child)
+ (begin
+ (push (gnc:html-object-render child doc))
+ (set! work-done (+ 1 work-done))
+ (gnc:report-percent-done (* 100 (/ work-done work-to-do)))))
objs)
(if (not (null? headers?))
- (begin
+ (begin
(push "</body>\n")
(push "</html>\n")))
-
- (gnc:report-finished)
+
+ (gnc:report-finished)
(gnc:html-document-pop-style doc)
(gnc:html-style-table-uncompile (gnc:html-document-style doc))
@@ -194,18 +194,18 @@
(define (gnc:html-document-push-style doc style)
- (gnc:html-document-set-style-stack!
- doc (cons style (gnc:html-document-style-stack doc))))
+ (gnc:html-document-set-style-stack!
+ doc (cons style (gnc:html-document-style-stack doc))))
(define (gnc:html-document-pop-style doc)
(if (not (null? (gnc:html-document-style-stack doc)))
- (gnc:html-document-set-style-stack!
- doc (cdr (gnc:html-document-style-stack doc)))))
+ (gnc:html-document-set-style-stack!
+ doc (cdr (gnc:html-document-style-stack doc)))))
(define (gnc:html-document-add-object! doc obj)
- (gnc:html-document-set-objects!
+ (gnc:html-document-set-objects!
doc
- (append (gnc:html-document-objects doc)
+ (append (gnc:html-document-objects doc)
(list (gnc:make-html-object obj)))))
(define (gnc:html-document-append-objects! doc objects)
@@ -215,38 +215,38 @@
(define (gnc:html-document-fetch-markup-style doc markup)
(let ((style-info #f)
- (style-stack (gnc:html-document-style-stack doc)))
- (if (not (null? style-stack))
- (set! style-info
- (gnc:html-style-table-fetch
+ (style-stack (gnc:html-document-style-stack doc)))
+ (if (not (null? style-stack))
+ (set! style-info
+ (gnc:html-style-table-fetch
(car style-stack)
(cdr style-stack)
markup)))
- (if (not style-info)
- (gnc:make-html-markup-style-info)
- style-info)))
+ (if (not style-info)
+ (gnc:make-html-markup-style-info)
+ style-info)))
(define (gnc:html-document-fetch-data-style doc markup)
(let ((style-info #f)
- (style-stack (gnc:html-document-style-stack doc)))
- (if (not (null? (gnc:html-document-style-stack doc)))
- (set! style-info
- (gnc:html-style-table-fetch
+ (style-stack (gnc:html-document-style-stack doc)))
+ (if (not (null? (gnc:html-document-style-stack doc)))
+ (set! style-info
+ (gnc:html-style-table-fetch
(car style-stack)
(cdr style-stack)
markup)))
- (if (not style-info)
- (gnc:make-html-data-style-info
- (lambda (datum parms)
- (sprintf #f "%a %a" markup datum))
- #f)
- style-info)))
+ (if (not style-info)
+ (gnc:make-html-data-style-info
+ (lambda (datum parms)
+ (sprintf #f "%a %a" markup datum))
+ #f)
+ style-info)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; markup-rendering functions : markup-start and markup-end return
;; pre-body and post-body HTML for the given markup tag.
;; the optional rest arguments are lists of attribute-value pairs:
-;; (gnc:html-document-markup-start doc "markup"
+;; (gnc:html-document-markup-start doc "markup"
;; '("attr1" "value1") '("attr2" "value2"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -273,11 +273,11 @@
(add-internal-tag (lambda (tag) (push "<") (push tag) (push ">")))
(add-attribute
(lambda (key value prior)
- (push " ") (push key)
- (if value (begin (push "=\"")
- (push value)
- (push "\"")))
- #t))
+ (push " ") (push key)
+ (if value (begin (push "=\"")
+ (push value)
+ (push "\"")))
+ #t))
(addextraatt
(lambda (attr)
(cond ((string? attr) (push " ") (push attr))
@@ -343,14 +343,14 @@
retval))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; html-document-render-data
+;; html-document-render-data
;; looks up the relevant data style and renders the data accordingly
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (gnc:html-document-render-data doc data)
(let ((style-info #f)
(data-type #f))
- (cond
+ (cond
((number? data)
(set! data-type "<number>"))
((string? data)
@@ -359,11 +359,11 @@
(set! data-type "<boolean>"))
((record? data)
(set! data-type (record-type-name (record-type-descriptor data))))
- (#t
+ (#t
(set! data-type "<generic>")))
-
+
(set! style-info (gnc:html-document-fetch-data-style doc data-type))
-
+
((gnc:html-data-style-info-renderer style-info)
data (gnc:html-data-style-info-data style-info))))
@@ -378,7 +378,7 @@
(define <html-object>
(make-record-type "<html-object>"
'(renderer data)))
-(define gnc:html-object?
+(define gnc:html-object?
(record-predicate <html-object>))
(define gnc:make-html-object-internal
@@ -389,40 +389,40 @@
(if (not (record? obj))
;; for literals (strings/numbers)
(set! o
- (gnc:make-html-object-internal
+ (gnc:make-html-object-internal
(lambda (obj doc)
(gnc:html-document-render-data doc obj))
;; if the object is #f, make it a placeholder
- (if obj obj " ")))
- (cond
+ (if obj obj " ")))
+ (cond
((gnc:html-text? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-text-render obj)))
((gnc:html-table? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-table-render obj)))
((gnc:html-table-cell? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-table-cell-render obj)))
((gnc:html-barchart? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-barchart-render obj)))
((gnc:html-piechart? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-piechart-render obj)))
((gnc:html-scatter? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-scatter-render obj)))
((gnc:html-linechart? obj)
- (set! o (gnc:make-html-object-internal
+ (set! o (gnc:make-html-object-internal
gnc:html-linechart-render obj)))
((gnc:html-object? obj)
(set! o obj))
-
- ;; other record types that aren't HTML objects
- (#t
+
+ ;; other record types that aren't HTML objects
+ (#t
(set! o
- (gnc:make-html-object-internal
+ (gnc:make-html-object-internal
(lambda (obj doc)
(gnc:html-document-render-data doc obj))
obj)))))
@@ -441,7 +441,7 @@
(record-modifier <html-object> 'data))
(define (gnc:html-object-render obj doc)
- (if (gnc:html-object? obj)
+ (if (gnc:html-object? obj)
((gnc:html-object-renderer obj) (gnc:html-object-data obj) doc)
(let ((htmlo (gnc:make-html-object obj)))
(gnc:html-object-render htmlo doc))))
Summary of changes:
src/report/report-system/html-document.scm | 206 ++++++++++++++---------------
1 file changed, 103 insertions(+), 103 deletions(-)
More information about the gnucash-changes
mailing list