gnucash unstable: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Feb 23 05:52:00 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/e186d77a (commit)
via https://github.com/Gnucash/gnucash/commit/f7378e93 (commit)
via https://github.com/Gnucash/gnucash/commit/03e862ec (commit)
via https://github.com/Gnucash/gnucash/commit/578e9860 (commit)
via https://github.com/Gnucash/gnucash/commit/458e7e9f (commit)
from https://github.com/Gnucash/gnucash/commit/128fce3e (commit)
commit e186d77a164fad05d544ce9236f5dc87cb462303
Merge: 128fce3 f7378e9
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Feb 23 11:48:42 2018 +0100
Merge branch 'unstable-prepare-SRFI64' of https://github.com/christopherlam/gnucash into unstable
commit f7378e9332a370bf432ea190e9b43a60776c7b9a
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Feb 19 23:29:12 2018 +0800
TR & options: upgrade HTML to XHTML
Upgrade <br> tags to <br /> to allow well-formed XML parsing.
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 763e03c..9227cb7 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1095,7 +1095,7 @@ tags within description, notes or memo. ")
str
(if (column-uses? 'common-currency)
(string-append
- "<br>"
+ "<br />"
(gnc-commodity-get-mnemonic
(opt-val gnc:pagename-general optname-currency)))
""))))
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index cfa0300..9d8f109 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -2056,8 +2056,8 @@
(set! row-contents (cons return-string row-contents)))))
(gnc:options-for-each disp-option-if-changed options)
(string-append (string-join (reverse row-contents)
- (if plaintext? "\n" "<br>"))
- (if plaintext? "\n\n" "<br><br>"))))
+ (if plaintext? "\n" "<br />"))
+ (if plaintext? "\n\n" "<br /><br />"))))
(define (gnc:send-options db_handle options)
(gnc:options-for-each
commit 03e862ec47e6f27e38e261c1b71356a3d7a28be8
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Feb 19 23:31:46 2018 +0800
TR: (minor change) eq? -> eqv?
According to the guide, eqv? better than eq? for chars
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 45836de..763e03c 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -987,7 +987,7 @@ tags within description, notes or memo. ")
(lambda (split transaction-row?)
(gnc:make-html-table-cell/markup
"date-cell"
- (if (eq? (xaccSplitGetReconcile split) #\y)
+ (if (eqv? (xaccSplitGetReconcile split) #\y)
(qof-print-date (xaccSplitGetDateReconciled split))
"")))))
commit 578e9860d04eded3e95106f841c454cc0cf052bb
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Feb 21 10:06:06 2018 +0800
Add optional testing group for srfi-64
This adds an optional group to CMakeLists for
systems with SRFI-64 included.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e1206..686baad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,6 +323,17 @@ IF (NOT GUILE_EXECUTABLE)
MESSAGE (SEND_ERROR "The guile executable was not found, but is required. Please set GUILE_EXECUTABLE.")
ENDIF (NOT GUILE_EXECUTABLE)
+# Test that guile has SRFI-64. This is required for some unit tests.
+execute_process (COMMAND ${GUILE_EXECUTABLE} -c "(use-modules (srfi srfi-64))"
+ RESULT_VARIABLE GNC_SRFI64_RESULT
+ ERROR_QUIET
+)
+
+if (GNC_SRFI64_RESULT EQUAL 0)
+ message (STATUS "Using guile SRFI-64")
+ set (HAVE_SRFI64 TRUE)
+endif ()
+
# ############################################################
IF (WITH_AQBANKING)
GNC_PKG_CHECK_MODULES (GWENHYWFAR REQUIRED gwenhywfar)
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index ddc0cb8..25ce314 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -6,6 +6,9 @@ SET(scm_test_standard_reports_SOURCES
test-standard-net-linechart.scm
)
+set(scm_test_with_srfi64_SOURCES
+)
+
SET(scm_test_report_SUPPORT
test-generic-category-report.scm
test-generic-net-barchart.scm
@@ -23,6 +26,11 @@ set(GUILE_DEPENDS
scm-standard-reports
scm-report-stylesheets
)
+
+if (HAVE_SRFI64)
+ gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
+endif (HAVE_SRFI64)
+
GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")
GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
@@ -41,4 +49,5 @@ GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
add_dependencies(check scm-test-standard-reports)
SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt
+ ${scm_test_with_srfi64_SOURCES}
${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT})
commit 458e7e9ff1aa851b1bc0e0f4ca23fa47a2da81bd
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Feb 23 15:32:28 2018 +0800
html-document.scm: Restore <html> tag
A previous commit 5b40df510 has eaten the <html> opening
tag which makes the whole document an invalid XML tree.
After this fix, the document is still not valid XHTML.
Until the exact DOCTYPE is finalised I suggest we
restore the root <html> tag.
diff --git a/gnucash/report/report-system/html-document.scm b/gnucash/report/report-system/html-document.scm
index b95ddb1..e9c77e8 100644
--- a/gnucash/report/report-system/html-document.scm
+++ b/gnucash/report/report-system/html-document.scm
@@ -157,6 +157,7 @@
;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm:<html>
;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
+ (push "<html>\n")
(push "<head>\n")
(push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n")
(if css?
Summary of changes:
CMakeLists.txt | 11 +++++++++++
gnucash/report/report-system/html-document.scm | 1 +
gnucash/report/standard-reports/test/CMakeLists.txt | 9 +++++++++
gnucash/report/standard-reports/transaction.scm | 4 ++--
libgnucash/app-utils/options.scm | 4 ++--
5 files changed, 25 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list