Merge branch 'maint'

Resolved conflicts: gnucash/report/report-system/html-document.scm
9 years ago · 4b3db97ba1
parent f28896fbde a783c8e38f
commit 4b3db97ba1
7 changed files with 8444 additions and 3647 deletions
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@ -24,7 +24,7 @@ http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash

 Interessante functies: 

-    * Dubbele boekhouding
+    * Dubbel boekhouden
    * Aandelen-/belegginsrekeningen
    * QIF/OFX/HBCI import met dubbele transactie herkenning
    * Rapporten, grafieken
--- a/gnucash/report/report-system/html-document.scm
+++ b/gnucash/report/report-system/html-document.scm
@ -166,8 +166,8 @@
                (let ((title (gnc:html-document-title doc)))
                  (if title
                      (push (list "</title>" title "<title>\n"))))
-                (push "</head>\n")
-
+                (push "</head>")
+                
                ;; this lovely little number just makes sure that <body>
                ;; attributes like bgcolor get included
                (push ((gnc:html-markup/open-tag-only "body") doc))))
@ -284,7 +284,7 @@
                      (attr (gnc:warn "non-string attribute" attr)))))
             (build-first-tag
              (lambda (tag)
-                (push "\n<") (push tag)
+                (push "<") (push tag)
                (if attr (hash-fold add-attribute #f attr))
                (if extra-attrib (for-each addextraatt extra-attrib))
                (if (not end-tag?)
@ -393,8 +393,8 @@
               (lambda (obj doc)
                 (gnc:html-document-render-data doc obj))
               ;; if the object is #f, make it a placeholder
-               (if obj obj "&nbsp;&nbsp;&nbsp;")))
-        (cond
+               (if obj obj " ")))
+        (cond 
         ((gnc:html-text? obj)
          (set! o (gnc:make-html-object-internal
                   gnc:html-text-render obj)))
--- a/gnucash/report/report-system/html-fonts.scm
+++ b/gnucash/report/report-system/html-fonts.scm
@ -157,8 +157,9 @@
            (string-append
                "h3 { " title-font-info " }\n"
                "a { " account-link-font-info " }\n"
-                "body, p, table, tr, td { text-align: left; " text-cell-font-info " }\n"
+                "body, p, table, tr, td { text-align: left; vertical-align: top; " text-cell-font-info " }\n"
                "tr.alternate-row { background: " alternate-row-color " }\n"
+                "tr { page-break-inside: avoid !important;}\n"
                "th.column-heading-left { text-align: left; " number-header-font-info " }\n"
                "th.column-heading-center { text-align: center; " number-header-font-info " }\n"
                "th.column-heading-right { text-align: right; " number-header-font-info " }\n"
--- a/gnucash/report/report-system/html-table.scm
+++ b/gnucash/report/report-system/html-table.scm
@ -668,6 +668,7 @@
             #f (gnc:html-table-col-styles table))
            
            ;; render the headers 
+            (push (gnc:html-document-markup-start doc "thead" #t))
            (push (gnc:html-document-markup-start doc "tr" #t))
            (for-each 
             (lambda (hdr) 
@ -685,6 +686,7 @@
                                   colnum))))
             ch)
            (push (gnc:html-document-markup-end doc "tr"))
+            (push (gnc:html-document-markup-end doc "thead"))

            ;; pop the col header style 
            (gnc:html-document-pop-style doc))))
@ -700,6 +702,7 @@
       #f)
     #f (gnc:html-table-col-styles table))
    
+    (push (gnc:html-document-markup-start doc "tbody" #t))
    ;; now iterate over the rows 
    (let ((rownum 0) (colnum 0))
      (for-each 
@ -749,6 +752,7 @@
           (set! colnum 0)
           (set! rownum (+ 1 rownum))))
       (reverse (gnc:html-table-data table))))
+    (push (gnc:html-document-markup-end doc "tbody"))
    
    ;; write the table end tag and pop the table style
    (push (gnc:html-document-markup-end doc "table"))
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@ -648,14 +648,16 @@
 		  (if standard-order?
 		      (list
 		       (gnc:make-html-table-cell inc-table)
-		       (if (not (null? trading-accounts))
+		       (if (null? trading-accounts)
+			   (gnc:html-make-empty-cell)
 		           (gnc:make-html-table-cell tra-table))
 		       (gnc:make-html-table-cell exp-table)
 		       )
 		      (list
 		       (gnc:make-html-table-cell exp-table)
 		       (gnc:make-html-table-cell inc-table)
-		       (if (not (null? trading-accounts))
+		       (if (null? trading-accounts)
+			   (gnc:html-make-empty-cell)
 		           (gnc:make-html-table-cell tra-table))
 		       )
 		      )
--- a/libgnucash/doc/prices.txt
+++ b/libgnucash/doc/prices.txt
@ -15,12 +15,12 @@ both the register entry and the price must have links to each other

 This is needed because if the user enters an incorrect amt or value
 or date in the transaction register, and then corrects it later, 
-piossibly weeks or months later, the corresponding price in the 
+possibly weeks or months later, the corresponding price in the
 priceDB must be fixed as well.

 Similarly, if a user deletes a transaction (possibly because it 
-contains an error in date/amt/value), then it is adviasable that
-the correpsonding priceDB entry must be deleted as well (since
+contains an error in date/amt/value), then it is advisable that
+the corresponding priceDB entry must be deleted as well (since
 it is not safe to assume that the price is 'correct').

 \section Rounding errors
@ -30,7 +30,7 @@ round-off errors can make 'obvious' math inaccurate.  Note that if
 we define price as (value/amt), then we will find that 
 value != price * amt due to roundoff handling.  One must be careful
 and consistent in handling this in the register, as otherwise
-users will be driven crazy by inconsitent behaviour.
+users will be driven crazy by inconsistent behaviour.

 (Linas Vepstas April 2003)

--- a/po/lv.po
+++ b/po/lv.po