diff --git a/src/import-export/qif-import/qif-file.scm b/src/import-export/qif-import/qif-file.scm index f25941a94c..b316cbf5ae 100644 --- a/src/import-export/qif-import/qif-file.scm +++ b/src/import-export/qif-import/qif-file.scm @@ -288,7 +288,7 @@ ;; $ : split amount (if there are splits) ;; Also allowing pound symbol just in case (#141003) - ((#\$ #\£) + ((#\$ #\243) (if (and current-split (not-bad-numeric-string? value)) (qif-split:set-amount! current-split value))) diff --git a/src/import-export/qif-import/qif-objects.scm b/src/import-export/qif-import/qif-objects.scm index fbbd6628ee..3658db6cae 100644 --- a/src/import-export/qif-import/qif-objects.scm +++ b/src/import-export/qif-import/qif-objects.scm @@ -165,7 +165,7 @@ self)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; qif-xtn class ;; [D] date : parsed. ;; [P] payee : string @@ -177,8 +177,8 @@ ;; [Y] name of security ;; [O] commission (parsed) ;; [L] category : string -;; [S]/[E]/[$]/[£] splits : a list of -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; [S]/[E]/[$]/[pound ("\xa3" or #\243)] splits : a list of +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (make-simple-class diff --git a/src/import-export/qif-import/qif-parse.scm b/src/import-export/qif-import/qif-parse.scm index 82dbbb4aa0..3204a5d9cd 100644 --- a/src/import-export/qif-import/qif-parse.scm +++ b/src/import-export/qif-import/qif-parse.scm @@ -19,13 +19,13 @@ (define decimal-radix-regexp (make-regexp - "^ *[$£]?[+-]?[$£]?[0-9]+[+-]?$|^ *[$£]?[+-]?[$£]?[0-9]?[0-9]?[0-9]?([,'][0-9][0-9][0-9])*(\\.[0-9]*)?[+-]? *$|^ *[$£]?[+-]?[$£]?[0-9]+\\.[0-9]*[+-]? *$")) + "^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]?$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]?[0-9]?[0-9]?([,'][0-9][0-9][0-9])*(\\.[0-9]*)?[+-]? *$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+\\.[0-9]*[+-]? *$")) (define comma-radix-regexp (make-regexp - "^ *[$£]?[+-]?[$£]?[0-9]+[+-]?$|^ *[$£]?[+-]?[$£]?[0-9]?[0-9]?[0-9]?([\\.'][0-9][0-9][0-9])*(,[0-9]*)?[+-]? *$|^ *[$£]?[+-]?[$£]?[0-9]+,[0-9]*[+-]? *$")) + "^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]?$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]?[0-9]?[0-9]?([\\.'][0-9][0-9][0-9])*(,[0-9]*)?[+-]? *$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+,[0-9]*[+-]? *$")) -(define integer-regexp (make-regexp "^[$£]?[+-]?[$£]?[0-9]+[+-]? *$")) +(define integer-regexp (make-regexp "^[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]? *$")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; qif-split:parse-category @@ -548,7 +548,7 @@ (define (qif-parse:parse-number/format value-string format) (let ((minus-index (string-index value-string #\-)) - (filtered-string (gnc:string-delete-chars value-string "$£'+-"))) + (filtered-string (gnc:string-delete-chars value-string "$\xa3'+-"))) (case format ((decimal) (let* ((read-string (string-remove-char filtered-string #\,))