r19173 - gnucash/trunk/src/report - Merge CSS and plain stylesheets, leaving the plain and remove the CSS stylesheet. Plain now has font specifications.

Phil Longstaff plongstaff at code.gnucash.org
Sat May 15 11:04:54 EDT 2010


Author: plongstaff
Date: 2010-05-15 11:04:54 -0400 (Sat, 15 May 2010)
New Revision: 19173
Trac: http://svn.gnucash.org/trac/changeset/19173

Removed:
   gnucash/trunk/src/report/stylesheets/stylesheet-css.scm
Modified:
   gnucash/trunk/src/report/report-system/report.scm
   gnucash/trunk/src/report/stylesheets/Makefile.am
   gnucash/trunk/src/report/stylesheets/stylesheet-plain.scm
   gnucash/trunk/src/report/stylesheets/stylesheets.scm
Log:
Merge CSS and plain stylesheets, leaving the plain and remove the CSS stylesheet.  Plain now has font specifications.


Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm	2010-05-15 14:50:33 UTC (rev 19172)
+++ gnucash/trunk/src/report/report-system/report.scm	2010-05-15 15:04:54 UTC (rev 19173)
@@ -254,7 +254,7 @@
          (gnc:make-multichoice-option 
           gnc:pagename-general gnc:optname-stylesheet "0b"
           (N_ "Select a stylesheet for the report.")
-          (string->symbol (N_ "Default CSS"))
+          (string->symbol (N_ "Default"))
           (map 
            (lambda (ss)
              (vector 

Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am	2010-05-15 14:50:33 UTC (rev 19172)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am	2010-05-15 15:04:54 UTC (rev 19173)
@@ -36,7 +36,6 @@
 gncscmmod_DATA = \
   stylesheets.scm \
   stylesheet-plain.scm \
-  stylesheet-css.scm \
   stylesheet-fancy.scm \
   stylesheet-footer.scm \
   stylesheet-easy.scm

Deleted: gnucash/trunk/src/report/stylesheets/stylesheet-css.scm
===================================================================
--- gnucash/trunk/src/report/stylesheets/stylesheet-css.scm	2010-05-15 14:50:33 UTC (rev 19172)
+++ gnucash/trunk/src/report/stylesheets/stylesheet-css.scm	2010-05-15 15:04:54 UTC (rev 19173)
@@ -1,215 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; stylesheet-css : the css-based stylesheet
-;; Copyright 2009 Phil Longstaff <plongstaff at rogers.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.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, contact:
-;;
-;; Free Software Foundation           Voice:  +1-617-542-5942
-;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
-;; Boston, MA  02110-1301,  USA       gnu at gnu.org
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-(define-module (gnucash report stylesheet-css))
-
-(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
-(use-modules (gnucash gnc-module))
-(use-modules (gnucash core-utils))
-(use-modules (gnucash report report-system))
-(use-modules (srfi srfi-13))
-(use-modules (srfi srfi-14))
-
-(gnc:module-load "gnucash/report/report-system" 0)
-
-;; css style sheet
-;; this should generally be the default style sheet for most reports.
-;; it's supposed to be lightweight and unobtrusive.
-(define (css-options)
-  (let* ((options (gnc:new-options))
-     (opt-register
-      (lambda (opt)
-        (gnc:register-option options opt))))
-     (opt-register
-          (gnc:make-color-option
-           (N_ "General")
-           (N_ "Background Color") "a" (N_ "Background color for reports.")
-           (list #xff #xff #xff 0)
-           255 #f))
-         (opt-register
-          (gnc:make-pixmap-option
-           (N_ "General")
-           (N_ "Background Pixmap") "b" (N_ "Background tile for reports.")
-           ""))
-         (opt-register
-          (gnc:make-simple-boolean-option
-           (N_ "General")
-           (N_ "Enable Links") "c" (N_ "Enable hyperlinks in reports.")
-           #t))
-         (opt-register
-          (gnc:make-number-range-option
-           (N_ "Tables")
-           (N_ "Table cell spacing") "c" (N_ "Space between table cells")
-           4 0 20 0 1))
-         (opt-register
-          (gnc:make-number-range-option
-           (N_ "Tables")
-           (N_ "Table cell padding") "d" (N_ "Space between table cells")
-           0 0 20 0 1))
-         (opt-register
-          (gnc:make-number-range-option
-           (N_ "Tables")
-           (N_ "Table border width") "e" (N_ "Bevel depth on tables")
-           0 0 20 0 1))
-         (register-font-options options)
-
-         options))
-
-(define (css-renderer options doc)
-  (let*
-    ((ssdoc (gnc:make-html-document))
-     (opt-val
-      (lambda (section name)
-        (gnc:option-value
-         (gnc:lookup-option options section name))))
-     (bgcolor
-      (gnc:color-option->html
-       (gnc:lookup-option options
-                  "General"
-                  "Background Color")))
-     (bgpixmap (opt-val "General" "Background Pixmap"))
-     (links? (opt-val "General" "Enable Links"))
-     (spacing (opt-val "Tables" "Table cell spacing"))
-     (padding (opt-val "Tables" "Table cell padding"))
-     (border (opt-val "Tables" "Table border width"))
-    )
-
-    (gnc:html-document-set-style!
-       ssdoc "body"
-       'attribute (list "bgcolor" bgcolor))
-
-    (if (and bgpixmap
-         (not (string=? bgpixmap "")))
-    (gnc:html-document-set-style!
-     ssdoc "body"
-     'attribute (list "background" bgpixmap)))
-
-    (gnc:html-document-set-style!
-       ssdoc "table"
-       'attribute (list "border" border)
-       'attribute (list "cellspacing" spacing)
-       'attribute (list "cellpadding" padding))
-
-    (gnc:html-document-set-style!
-       ssdoc "date-cell"
-       'tag "td"
-       'attribute (list "class" "date-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "anchor-cell"
-       'tag "td"
-       'attribute (list "class" "anchor-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "number-cell"
-       'tag "td"
-       'attribute (list "class" "number-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "number-cell-neg"
-       'tag "td"
-       'attribute (list "class" "number-cell neg"))
-
-    (gnc:html-document-set-style!
-       ssdoc "number-header"
-       'tag "th"
-       'attribute (list "class" "number-header"))
-
-    (gnc:html-document-set-style!
-       ssdoc "text-cell"
-       'tag "td"
-       'attribute (list "class" "text-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "total-number-cell"
-       'tag "td"
-       'attribute (list "class" "total-number-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "total-number-cell-neg"
-       'tag "td"
-       'attribute (list "class" "total-number-cell neg"))
-
-    (gnc:html-document-set-style!
-       ssdoc "total-label-cell"
-       'tag "td"
-       'attribute (list "class" "total-label-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "centered-label-cell"
-       'tag "td"
-       'attribute (list "class" "centered-label-cell"))
-
-    (gnc:html-document-set-style!
-       ssdoc "normal-row"
-       'tag "tr")
-
-    (gnc:html-document-set-style!
-     ssdoc "alternate-row"
-     'attribute (list "bgcolor" bgcolor)
-     'tag "tr")
-    (gnc:html-document-set-style!
-     ssdoc "primary-subheading"
-     'attribute (list "bgcolor" bgcolor)
-     'tag "tr")
-    (gnc:html-document-set-style!
-     ssdoc "secondary-subheading"
-     'attribute (list "bgcolor" bgcolor)
-     'tag "tr")
-    (gnc:html-document-set-style!
-     ssdoc "grand-total"
-     'attribute (list "bgcolor" bgcolor)
-     'tag "tr")
-
-    ;; don't surround marked-up links with <a> </a>
-    (if (not links?)
-    (gnc:html-document-set-style!
-     ssdoc "a"
-     'tag ""))
-
-    (add-css-information-to-doc options ssdoc)
-
-    (let* ((title (gnc:html-document-title doc))
-           (doc-headline (gnc:html-document-headline doc))
-           (headline (if (eq? doc-headline #f)
-                         title doc-headline)))
-      (if headline
-      (gnc:html-document-add-object!
-       ssdoc
-       (gnc:make-html-text
-        (gnc:html-markup-p
-         (gnc:html-markup-h3 headline))))))
-
-    (gnc:html-document-append-objects! ssdoc
-                       (gnc:html-document-objects doc))
-
-    ssdoc))
-
-(gnc:define-html-style-sheet
- 'version 1
- 'name (N_ "CSS")
- 'renderer css-renderer
- 'options-generator css-options)
-
-;; instantiate a default style sheet
-(gnc:make-html-style-sheet "CSS" (N_ "Default CSS"))

Modified: gnucash/trunk/src/report/stylesheets/stylesheet-plain.scm
===================================================================
--- gnucash/trunk/src/report/stylesheets/stylesheet-plain.scm	2010-05-15 14:50:33 UTC (rev 19172)
+++ gnucash/trunk/src/report/stylesheets/stylesheet-plain.scm	2010-05-15 15:04:54 UTC (rev 19173)
@@ -1,17 +1,18 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; stylesheet-plain.scm : the default stylesheet, very simple.
+;; stylesheet-plain.css : the default style sheet, very simple
+;; Copyright 2009 Phil Longstaff <plongstaff at rogers.com>
 ;; 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,179 +26,191 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash core-utils))
+(use-modules (gnucash report report-system))
+(use-modules (srfi srfi-13))
+(use-modules (srfi srfi-14))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
-;; plain style sheet 
+;; plain style sheet
 ;; this should generally be the default style sheet for most reports.
 ;; it's supposed to be lightweight and unobtrusive.
 (define (plain-options)
   (let* ((options (gnc:new-options))
-	 (opt-register 
-	  (lambda (opt) 
-	    (gnc:register-option options opt))))
-    (opt-register
-     (gnc:make-color-option
-      (N_ "General")
-      (N_ "Background Color") "a" (N_ "Background color for reports.")
-      (list #xff #xff #xff 0)
-      255 #f))
-    (opt-register
-     (gnc:make-pixmap-option
-      (N_ "General")
-      (N_ "Background Pixmap") "b" (N_ "Background tile for reports.")
-      ""))
-    (opt-register
-     (gnc:make-simple-boolean-option
-      (N_ "General")
-      (N_ "Enable Links") "c" (N_ "Enable hyperlinks in reports.")
-      #t))
-    (opt-register 
-     (gnc:make-number-range-option 
-      (N_ "Tables")
-      (N_ "Table cell spacing") "c" (N_ "Space between table cells")
-      4 0 20 0 1))
-    (opt-register 
-     (gnc:make-number-range-option 
-      (N_ "Tables")
-      (N_ "Table cell padding") "d" (N_ "Space between table cells")
-      0 0 20 0 1))
-    (opt-register 
-     (gnc:make-number-range-option 
-      (N_ "Tables")
-      (N_ "Table border width") "e" (N_ "Bevel depth on tables")
-      0 0 20 0 1))
-    options))
+     (opt-register
+      (lambda (opt)
+        (gnc:register-option options opt))))
+     (opt-register
+          (gnc:make-color-option
+           (N_ "General")
+           (N_ "Background Color") "a" (N_ "Background color for reports.")
+           (list #xff #xff #xff 0)
+           255 #f))
+         (opt-register
+          (gnc:make-pixmap-option
+           (N_ "General")
+           (N_ "Background Pixmap") "b" (N_ "Background tile for reports.")
+           ""))
+         (opt-register
+          (gnc:make-simple-boolean-option
+           (N_ "General")
+           (N_ "Enable Links") "c" (N_ "Enable hyperlinks in reports.")
+           #t))
+         (opt-register
+          (gnc:make-number-range-option
+           (N_ "Tables")
+           (N_ "Table cell spacing") "c" (N_ "Space between table cells")
+           4 0 20 0 1))
+         (opt-register
+          (gnc:make-number-range-option
+           (N_ "Tables")
+           (N_ "Table cell padding") "d" (N_ "Space between table cells")
+           0 0 20 0 1))
+         (opt-register
+          (gnc:make-number-range-option
+           (N_ "Tables")
+           (N_ "Table border width") "e" (N_ "Bevel depth on tables")
+           0 0 20 0 1))
+         (register-font-options options)
 
+         options))
+
 (define (plain-renderer options doc)
-  (let* ((ssdoc (gnc:make-html-document))
-	 (opt-val 
-	  (lambda (section name)
-	    (gnc:option-value
-	     (gnc:lookup-option options section name))))
-	 (bgcolor 
-	  (gnc:color-option->html
-	   (gnc:lookup-option options 
-			      "General"
-			      "Background Color")))
-	 (bgpixmap (opt-val "General" "Background Pixmap"))
-	 (links? (opt-val "General" "Enable Links"))
-	 (spacing (opt-val "Tables" "Table cell spacing"))
-	 (padding (opt-val "Tables" "Table cell padding"))
-	 (border (opt-val "Tables" "Table border width")))
+  (let*
+    ((ssdoc (gnc:make-html-document))
+     (opt-val
+      (lambda (section name)
+        (gnc:option-value
+         (gnc:lookup-option options section name))))
+     (bgcolor
+      (gnc:color-option->html
+       (gnc:lookup-option options
+                  "General"
+                  "Background Color")))
+     (bgpixmap (opt-val "General" "Background Pixmap"))
+     (links? (opt-val "General" "Enable Links"))
+     (spacing (opt-val "Tables" "Table cell spacing"))
+     (padding (opt-val "Tables" "Table cell padding"))
+     (border (opt-val "Tables" "Table border width"))
+    )
 
-    (gnc:html-document-set-style! 
+    (gnc:html-document-set-style!
+       ssdoc "body"
+       'attribute (list "bgcolor" bgcolor))
+
+    (if (and bgpixmap
+         (not (string=? bgpixmap "")))
+    (gnc:html-document-set-style!
      ssdoc "body"
-     'attribute (list "bgcolor" bgcolor))
-    
-    (if (and bgpixmap
-	     (not (string=? bgpixmap "")))
-	(gnc:html-document-set-style!
-	 ssdoc "body" 
-	 'attribute (list "background" bgpixmap)))
+     'attribute (list "background" bgpixmap)))
 
     (gnc:html-document-set-style!
-     ssdoc "table" 
-     'attribute (list "border" border)
-     'attribute (list "cellspacing" spacing)
-     'attribute (list "cellpadding" padding))
+       ssdoc "table"
+       'attribute (list "border" border)
+       'attribute (list "cellspacing" spacing)
+       'attribute (list "cellpadding" padding))
 
     (gnc:html-document-set-style!
-     ssdoc "anchor-cell"
-     'tag "td"
-     'attribute (list "align" "left")
-     'attribute (list "nowrap"))
+       ssdoc "date-cell"
+       'tag "td"
+       'attribute (list "class" "date-cell"))
 
     (gnc:html-document-set-style!
-     ssdoc "number-cell"
-     'tag "td"
-     'attribute (list "align" "right")
-     'attribute (list "nowrap"))
+       ssdoc "anchor-cell"
+       'tag "td"
+       'attribute (list "class" "anchor-cell"))
 
     (gnc:html-document-set-style!
-     ssdoc "number-cell-neg"
-     'tag "td"
-     'attribute (list "align" "right")
-     'attribute (list "nowrap"))
+       ssdoc "number-cell"
+       'tag "td"
+       'attribute (list "class" "number-cell"))
 
     (gnc:html-document-set-style!
-     ssdoc "number-header"
-     'tag "th"
-     'attribute (list "align" "right"))
+       ssdoc "number-cell-neg"
+       'tag "td"
+       'attribute (list "class" "number-cell neg"))
 
     (gnc:html-document-set-style!
-     ssdoc "text-cell"
-     'tag "td"
-     'attribute (list "align" "left"))
+       ssdoc "number-header"
+       'tag "th"
+       'attribute (list "class" "number-header"))
 
     (gnc:html-document-set-style!
-     ssdoc "total-number-cell"
-     'tag '("td" "b")
-     'attribute (list "align" "right"))
+       ssdoc "text-cell"
+       'tag "td"
+       'attribute (list "class" "text-cell"))
 
     (gnc:html-document-set-style!
-     ssdoc "total-number-cell-neg"
-     'tag '("td" "b")
-     'attribute (list "align" "right"))
+       ssdoc "total-number-cell"
+       'tag "td"
+       'attribute (list "class" "total-number-cell"))
 
     (gnc:html-document-set-style!
-     ssdoc "total-label-cell"
-     'tag '("td" "b")
-     'attribute (list "align" "left"))
-    
+       ssdoc "total-number-cell-neg"
+       'tag "td"
+       'attribute (list "class" "total-number-cell neg"))
+
     (gnc:html-document-set-style!
-     ssdoc "centered-label-cell"
-     'tag '("td" "b")
-     'attribute (list "align" "center"))
-    
+       ssdoc "total-label-cell"
+       'tag "td"
+       'attribute (list "class" "total-label-cell"))
+
     (gnc:html-document-set-style!
-     ssdoc "normal-row"
-     'tag "tr")
-    
+       ssdoc "centered-label-cell"
+       'tag "td"
+       'attribute (list "class" "centered-label-cell"))
+
     (gnc:html-document-set-style!
+       ssdoc "normal-row"
+       'tag "tr")
+
+    (gnc:html-document-set-style!
      ssdoc "alternate-row"
      'attribute (list "bgcolor" bgcolor)
-     'tag "tr")       
+     'tag "tr")
     (gnc:html-document-set-style!
      ssdoc "primary-subheading"
-     'attribute (list "bgcolor" bgcolor) 
-     'tag "tr")       
+     'attribute (list "bgcolor" bgcolor)
+     'tag "tr")
     (gnc:html-document-set-style!
      ssdoc "secondary-subheading"
-     'attribute (list "bgcolor" bgcolor) 
+     'attribute (list "bgcolor" bgcolor)
      'tag "tr")
     (gnc:html-document-set-style!
      ssdoc "grand-total"
-     'attribute (list "bgcolor" bgcolor) 
+     'attribute (list "bgcolor" bgcolor)
      'tag "tr")
-    
+
     ;; don't surround marked-up links with <a> </a>
     (if (not links?)
-	(gnc:html-document-set-style!
-	 ssdoc "a"
-	 'tag ""))
-    
+    (gnc:html-document-set-style!
+     ssdoc "a"
+     'tag ""))
+
+    (add-css-information-to-doc options ssdoc)
+
     (let* ((title (gnc:html-document-title doc))
            (doc-headline (gnc:html-document-headline doc))
            (headline (if (eq? doc-headline #f)
                          title doc-headline)))
       (if headline
-	  (gnc:html-document-add-object!
-	   ssdoc
-	   (gnc:make-html-text
-	    (gnc:html-markup-p
-	     (gnc:html-markup-h3 headline))))))
-    
+      (gnc:html-document-add-object!
+       ssdoc
+       (gnc:make-html-text
+        (gnc:html-markup-p
+         (gnc:html-markup-h3 headline))))))
+
     (gnc:html-document-append-objects! ssdoc
-				       (gnc:html-document-objects doc))
+                       (gnc:html-document-objects doc))
 
     ssdoc))
 
-(gnc:define-html-style-sheet 
+(gnc:define-html-style-sheet
  'version 1
  'name (N_ "Plain")
  'renderer plain-renderer
  'options-generator plain-options)
 
-;; instantiate a default style sheet 
+;; instantiate a default style sheet
 (gnc:make-html-style-sheet "Plain" (N_ "Default"))

Modified: gnucash/trunk/src/report/stylesheets/stylesheets.scm
===================================================================
--- gnucash/trunk/src/report/stylesheets/stylesheets.scm	2010-05-15 14:50:33 UTC (rev 19172)
+++ gnucash/trunk/src/report/stylesheets/stylesheets.scm	2010-05-15 15:04:54 UTC (rev 19173)
@@ -9,7 +9,6 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash report stylesheet-plain))
-(use-modules (gnucash report stylesheet-css))
 (use-modules (gnucash report stylesheet-fancy))
 (use-modules (gnucash report stylesheet-footer))
 (use-modules (gnucash report stylesheet-easy))



More information about the gnucash-changes mailing list