gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/743df212 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dcf90b98 (commit)
	from  https://github.com/Gnucash/gnucash/commit/64a8a11a (commit)



commit 743df212a15886c305c839e141e680809aaf509a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Dec 9 21:51:52 2020 +0800

    [API][eguile-html-utilities] use font-name-to-style-info-eguile
    
    because font-name-to-style-info is already used by html-fonts.scm

diff --git a/gnucash/report/eguile-html-utilities.scm b/gnucash/report/eguile-html-utilities.scm
index a07cec7b3..d89a7fb10 100644
--- a/gnucash/report/eguile-html-utilities.scm
+++ b/gnucash/report/eguile-html-utilities.scm
@@ -34,6 +34,7 @@
 (use-modules (srfi srfi-13)) ; for extra string functions
 
 (export string-substitute-alist)
+(export font-name-to-style-info-eguile)
 
 (define-public (string-substitute-alist str sub-alist)
   (with-output-to-string
@@ -100,7 +101,7 @@
   (and (defined? 'make-regexp)
        (make-regexp "([[:space:]]+(bold|semi-bold|book|regular|medium|light))?([[:space:]]+(normal|roman|italic|oblique))?([[:space:]]+(condensed))?[[:space:]]+([[:digit:]]+)" regexp/icase)))
 
-(define-public (font-name-to-style-info font-name)
+(define (font-name-to-style-info-eguile font-name)
   ;;; Convert a font name as return by a font option to CSS format.
   ;;; e.g. "URW Bookman L Bold Italic 12" becomes
   ;;; "font-family: URW Bookman L; font-size: 12pt; font-style: italic; font-weight: bold"
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index 487890ffd..a6d344870 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -169,9 +169,9 @@
                                       (opt-value displaypage optname-template-file)))
          (opt-css-file              (find-stylesheet
                                       (opt-value displaypage optname-css-file)))
-         (opt-heading-font          (font-name-to-style-info
+         (opt-heading-font          (font-name-to-style-info-eguile
                                       (opt-value displaypage optname-heading-font)))
-         (opt-text-font             (font-name-to-style-info
+         (opt-text-font             (font-name-to-style-info-eguile
                                       (opt-value displaypage optname-text-font)))
          (opt-logofile-header       (opt-value displaypage  optname-logofile-header))
          (opt-logo-width-header     (opt-value displaypage  optname-logo-width-header))
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index 6cfe0df42..6087c841e 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -238,9 +238,9 @@
                                       (opt-value displaypage optname-template-file)))
          (opt-css-file              (find-stylesheet
                                       (opt-value displaypage optname-css-file)))
-         (opt-heading-font          (font-name-to-style-info 
+         (opt-heading-font          (font-name-to-style-info-eguile
                                       (opt-value displaypage optname-heading-font)))
-         (opt-text-font             (font-name-to-style-info
+         (opt-text-font             (font-name-to-style-info-eguile
                                       (opt-value displaypage optname-text-font)))
          (opt-logofile              (opt-value displaypage  optname-logofile)) 
          (opt-logo-width            (opt-value displaypage  optname-logo-width)) 

commit dcf90b98c00b9351a5def3c6d8f92c6ec035dbe9
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Dec 9 21:51:24 2020 +0800

    [options.scm] use srfi-1
    
    because list-index (used in options.scm) wants srfi-1 version rather
    than the one in guile-core. the guile-core one crashes when editing options.

diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 6982089c6..5547a87fc 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -27,6 +27,7 @@
 (use-modules (sw_app_utils))
 (use-modules (gnucash app-utils date-utilities))
 (use-modules (gnucash utilities))
+(use-modules (srfi srfi-1))
 (use-modules (ice-9 regex))
 
 (export gnc:color->html)



Summary of changes:
 gnucash/report/eguile-html-utilities.scm       | 3 ++-
 gnucash/report/reports/standard/receipt.scm    | 4 ++--
 gnucash/report/reports/standard/taxinvoice.scm | 4 ++--
 libgnucash/app-utils/options.scm               | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)