Simplifies parsing of the beginning of an act. This allows fontifying effective dates.
This commit is contained in:
parent
a953fe6cbc
commit
07324cb6b2
2 changed files with 23 additions and 19 deletions
|
|
@ -79,20 +79,21 @@
|
|||
Fontify the first line of an xact"
|
||||
(goto-char pos)
|
||||
(beginning-of-line)
|
||||
(let ((state nil))
|
||||
(re-search-forward ledger-xact-start-regex)
|
||||
(ledger-fontify-set-face (list (match-beginning 1) (match-end 1)) 'ledger-font-posting-date-face)
|
||||
(save-match-data (setq state (ledger-state-from-string (match-string 5))))
|
||||
(ledger-fontify-set-face (list (match-beginning 7) (match-end 7))
|
||||
(cond ((eq state 'pending)
|
||||
'ledger-font-payee-pending-face)
|
||||
((eq state 'cleared)
|
||||
'ledger-font-payee-cleared-face)
|
||||
(t
|
||||
'ledger-font-payee-uncleared-face)))
|
||||
(ledger-fontify-set-face (list (match-beginning 8)
|
||||
(match-end 8)) 'ledger-font-comment-face)))
|
||||
|
||||
(let ((state nil)
|
||||
(cur-point (point)))
|
||||
(re-search-forward " ")
|
||||
(ledger-fontify-set-face (list cur-point (point)) 'ledger-font-posting-date-face)
|
||||
(re-search-forward ledger-xact-after-date-regex)
|
||||
(save-match-data (setq state (ledger-state-from-string (match-string 1)))
|
||||
(ledger-fontify-set-face (list (match-beginning 3) (match-end 3))
|
||||
(cond ((eq state 'pending)
|
||||
'ledger-font-payee-pending-face)
|
||||
((eq state 'cleared)
|
||||
'ledger-font-payee-cleared-face)
|
||||
(t
|
||||
'ledger-font-payee-uncleared-face))))
|
||||
(ledger-fontify-set-face (list (match-beginning 4)
|
||||
(match-end 4)) 'ledger-font-comment-face)))
|
||||
|
||||
(defun ledger-fontify-posting (pos)
|
||||
(let* ((state nil)
|
||||
|
|
|
|||
|
|
@ -334,11 +334,14 @@
|
|||
|
||||
(defconst ledger-xact-start-regex
|
||||
(concat "^" ledger-iso-date-regexp ;; subexp 1
|
||||
;; "\\(=" ledger-iso-date-regexp "\\)?"
|
||||
" ?\\([ *!]\\)" ;; mark, subexp 5
|
||||
" ?\\((.*)\\)?" ;; code, subexp 6
|
||||
" ?\\([^;\n]+\\)" ;; desc, subexp 7
|
||||
"\\(\n\\|;.*\\)" ;; comment, subexp 8
|
||||
"\\(=" ledger-iso-date-regexp "\\)?"
|
||||
))
|
||||
|
||||
(defconst ledger-xact-after-date-regex
|
||||
(concat " ?\\([ *!]\\)" ;; mark, subexp 1
|
||||
" ?\\((.*)\\)?" ;; code, subexp 2
|
||||
" ?\\([^;\n]+\\)" ;; desc, subexp 3
|
||||
"\\(\n\\|;.*\\)" ;; comment, subexp 4
|
||||
))
|
||||
|
||||
(defconst ledger-posting-regex
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue