sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch value expression in amount alignment code

Browse source
This commit is contained in:
Craig Earls 2014-09-10 21:38:21 -07:00
parent ec457f0ad7
commit 03bace82bd
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lisp/ledger-post.el
View file

@ -109,37 +109,35 @@ region align the posting on the current line."
(not (use-region-p))) (not (use-region-p)))
(set-mark (point))) (set-mark (point)))
(let* ((inhibit-modification-hooks t) (let ((inhibit-modification-hooks t)
(mark-first (< (mark) (point))) (mark-first (< (mark) (point)))
(begin-region (if beg
beg
(if mark-first (mark) (point))))
(end-region (if end
end
(if mark-first (point) (mark))))
acct-start-column acct-end-column acct-adjust amt-width amt-adjust acct-start-column acct-end-column acct-adjust amt-width amt-adjust
(lines-left 1)) (lines-left 1))
(unless beg (setq beg (if mark-first (mark) (point))))
(unless end (setq end (if mark-first (mark) (point))))
;; Condition point and mark to the beginning and end of lines ;; Condition point and mark to the beginning and end of lines
(goto-char end-region) (goto-char end)
(setq end-region (line-end-position)) (setq end (line-end-position))
(goto-char begin-region) (goto-char beg)
(goto-char (goto-char
(setq begin-region (setq beg
(line-beginning-position))) (line-beginning-position)))
(untabify begin-region end-region) (untabify beg end)
(goto-char end-region) ;; if untabify actually changed anything, then our begin and end are not correct.
(setq end-region (line-end-position)) (goto-char end)
(goto-char begin-region) (setq end (line-end-position))
(goto-char beg)
(goto-char (goto-char
(setq begin-region (setq beg
(line-beginning-position))) (line-beginning-position)))
;; This is the guts of the alignment loop ;; This is the guts of the alignment loop
(while (and (or (setq acct-start-column (ledger-next-account (line-end-position))) (while (and (or (setq acct-start-column (ledger-next-account (line-end-position)))
lines-left) lines-left)
(< (point) end-region)) (< (point) end))
(when acct-start-column (when acct-start-column
(setq acct-end-column (save-excursion (setq acct-end-column (save-excursion
(goto-char (match-end 2)) (goto-char (match-end 2))

4
lisp/ledger-regex.el
View file

@ -26,9 +26,9 @@
(defconst ledger-amount-regex (defconst ledger-amount-regex
(concat "\\( \\|\t\\| \t\\)[ \t]*-?" (concat "\\( \\|\t\\| \t\\)[ \t]*-?"
"\\([A-Z$€£_]+ *\\)?" "\\([A-Z$€£_(]+ *\\)?"
"\\(-?[0-9,\\.]+?\\)" "\\(-?[0-9,\\.]+?\\)"
"\\(.[0-9]+\\)?" "\\(.[0-9)]+\\)?"
"\\( *[[:word:]€£_\"]+\\)?" "\\( *[[:word:]€£_\"]+\\)?"
"\\([ \t]*[@={]@?[^\n;]+?\\)?" "\\([ \t]*[@={]@?[^\n;]+?\\)?"
"\\([ \t]+;.+?\\|[ \t]*\\)?$")) "\\([ \t]+;.+?\\|[ \t]*\\)?$"))