ensures that account with spaces in the names are correctly rested by ledger-context

This commit is contained in:
Craig Earls 2014-06-29 19:40:20 -07:00
parent 2d9cdc6bc8
commit 838625f8a3

View file

@ -33,10 +33,11 @@
;; elements ;; elements
(defconst ledger-indent-string "\\(^[ \t]+\\)") (defconst ledger-indent-string "\\(^[ \t]+\\)")
(defconst ledger-status-string "\\([*! ]?\\)") (defconst ledger-status-string "\\([*! ]?\\)")
(defconst ledger-account-string "[\\[(]?\\(.*?\\)[])]? ") (defconst ledger-account-string "[\\[(]?\\(.*?\\)[])]?")
(defconst ledger-amount-string "[ \t]?\\(-?[0-9]+[\\.,][0-9]*\\)") (defconst ledger-separator-string "\\s-\\s-")
(defconst ledger-amount-string "\\(-?[0-9]+[\\.,][0-9]*\\)")
(defconst ledger-comment-string "[ \t]*;[ \t]*\\(.*?\\)") (defconst ledger-comment-string "[ \t]*;[ \t]*\\(.*?\\)")
(defconst ledger-nil-string "\\([ \t]+\\)") (defconst ledger-nil-string "\\([ \t]\\)")
(defconst ledger-commodity-string "\\(.+?\\)") (defconst ledger-commodity-string "\\(.+?\\)")
(defconst ledger-date-string "^\\([0-9]\\{4\\}[/-][01]?[0-9][/-][0123]?[0-9]\\)") (defconst ledger-date-string "^\\([0-9]\\{4\\}[/-][01]?[0-9][/-][0123]?[0-9]\\)")
(defconst ledger-code-string "\\((.*)\\)?") (defconst ledger-code-string "\\((.*)\\)?")
@ -57,12 +58,12 @@
(ledger-single-line-config date nil status nil code nil payee) (ledger-single-line-config date nil status nil code nil payee)
(ledger-single-line-config date nil status nil payee))) (ledger-single-line-config date nil status nil payee)))
(list 'acct-transaction (list (ledger-single-line-config indent comment) (list 'acct-transaction (list (ledger-single-line-config indent comment)
(ledger-single-line-config indent status account nil commodity amount nil comment) (ledger-single-line-config indent status account separator commodity amount nil comment)
(ledger-single-line-config indent status account nil commodity amount) (ledger-single-line-config indent status account separator commodity amount)
(ledger-single-line-config indent status account nil amount nil commodity comment) (ledger-single-line-config indent status account separator amount nil commodity comment)
(ledger-single-line-config indent status account nil amount nil commodity) (ledger-single-line-config indent status account separator amount nil commodity)
(ledger-single-line-config indent status account nil amount) (ledger-single-line-config indent status account separator amount)
(ledger-single-line-config indent status account nil comment) (ledger-single-line-config indent status account separator comment)
(ledger-single-line-config indent status account))))) (ledger-single-line-config indent status account)))))
(defun ledger-extract-context-info (line-type pos) (defun ledger-extract-context-info (line-type pos)