diff options
Diffstat (limited to 'lisp/ldg-post.el')
| -rw-r--r-- | lisp/ldg-post.el | 126 |
1 files changed, 89 insertions, 37 deletions
diff --git a/lisp/ldg-post.el b/lisp/ldg-post.el index 30edd035..492f9467 100644 --- a/lisp/ldg-post.el +++ b/lisp/ldg-post.el @@ -9,51 +9,70 @@ :type 'boolean :group 'ledger-post) -(declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) -(defvar iswitchb-temp-buflist) +(defcustom ledger-post-amount-alignment-column 52 + "If non-nil, ." + :type 'integer + :group 'ledger-post) -(defvar ledger-post-current-list nil) +(defcustom ledger-post-use-iswitchb nil + "If non-nil, ." + :type 'boolean + :group 'ledger-post) + +(defcustom ledger-post-use-ido nil + "If non-nil, ." + :type 'boolean + :group 'ledger-post) -(defun ledger-post-find-all () +(defun ledger-post-all-accounts () (let ((origin (point)) (ledger-post-list nil) - account-path elements) + account elements) (save-excursion (goto-char (point-min)) - (while (re-search-forward - "^[ \t]+\\([*!]\\s-+\\)?[[(]?\\(.+?\\)\\(\t\\|\n\\| [ \t]\\)" nil t) + (while (re-search-forward ledger-post-line-regexp nil t) (unless (and (>= origin (match-beginning 0)) (< origin (match-end 0))) - (setq account-path (match-string-no-properties 2)) - (unless (string-match "\\`\\s-*;" account-path) - (add-to-list 'ledger-post-list account-path)))) - (setq ledger-post-current-list - (nreverse ledger-post-list))))) + (add-to-list 'ledger-post-list (ledger-regex-post-line-account)))) + (nreverse ledger-post-list)))) + +(declare-function iswitchb-read-buffer "iswitchb" + (prompt &optional default require-match start matches-set)) +(defvar iswitchb-temp-buflist) (defun ledger-post-completing-read (prompt choices) "Use iswitchb as a completing-read replacement to choose from choices. PROMPT is a string to prompt with. CHOICES is a list of strings to choose from." - (let* ((iswitchb-use-virtual-buffers nil) - (iswitchb-make-buflist-hook - (lambda () - (setq iswitchb-temp-buflist choices)))) - (iswitchb-read-buffer prompt))) + (cond + (ledger-post-use-iswitchb + (let* ((iswitchb-use-virtual-buffers nil) + (iswitchb-make-buflist-hook + (lambda () + (setq iswitchb-temp-buflist choices)))) + (iswitchb-read-buffer prompt))) + (ledger-post-use-ido + (ido-completing-read prompt choices)) + (t + (completing-read prompt choices)))) + +(defvar ledger-post-current-list nil) (defun ledger-post-pick-account () (interactive) (let* ((account - (ledger-post-completing-read "Account: " - (or ledger-post-current-list - (ledger-post-find-all)))) + (ledger-post-completing-read + "Account: " (or ledger-post-current-list + (setq ledger-post-current-list + (ledger-post-all-accounts))))) (account-len (length account)) (pos (point))) (goto-char (line-beginning-position)) - (when (re-search-forward ledger-regex-post-line (line-end-position) t) - (let ((existing-len (length (match-string 3)))) - (goto-char (match-beginning 3)) - (delete-region (match-beginning 3) (match-end 3)) + (when (re-search-forward ledger-post-line-regexp (line-end-position) t) + (let ((existing-len (length (ledger-regex-post-line-account)))) + (goto-char (match-beginning ledger-regex-post-line-group-account)) + (delete-region (match-beginning ledger-regex-post-line-group-account) + (match-end ledger-regex-post-line-group-account)) (insert account) (cond ((> existing-len account-len) @@ -64,6 +83,40 @@ to choose from." (delete-char 1))))))) (goto-char pos))) +(defun ledger-next-amount (&optional end) + (when (re-search-forward "\\( \\|\t\\| \t\\)[ \t]*-?\\([A-Z$]+ *\\)?\\(-?[0-9,]+?\\)\\(.[0-9]+\\)?\\( *[A-Z$]+\\)?\\([ \t]*@@?[^\n;]+?\\)?\\([ \t]+;.+?\\)?$" (marker-position end) t) + (goto-char (match-beginning 0)) + (skip-syntax-forward " ") + (- (or (match-end 4) + (match-end 3)) (point)))) + +(defun ledger-align-amounts (&optional column) + "Align amounts in the current region. +This is done so that the last digit falls in COLUMN, which defaults to 52." + (interactive "p") + (if (or (null column) (= column 1)) + (setq column ledger-post-amount-alignment-column)) + (save-excursion + (let* ((mark-first (< (mark) (point))) + (begin (if mark-first (mark) (point))) + (end (if mark-first (point-marker) (mark-marker))) + offset) + (goto-char begin) + (while (setq offset (ledger-next-amount end)) + (let ((col (current-column)) + (target-col (- column offset)) + adjust) + (setq adjust (- target-col col)) + (if (< col target-col) + (insert (make-string (- target-col col) ? )) + (move-to-column target-col) + (if (looking-back " ") + (delete-char (- col target-col)) + (skip-chars-forward "^ \t") + (delete-horizontal-space) + (insert " "))) + (forward-line)))))) + (defun ledger-post-align-amount () (interactive) (save-excursion @@ -76,14 +129,14 @@ to choose from." (goto-char beg) (when (< end (line-end-position)) (goto-char (line-beginning-position)) - (if (looking-at ledger-regex-post-line) + (if (looking-at ledger-post-line-regexp) (ledger-post-align-amount))))) (defun ledger-post-edit-amount () (interactive) (goto-char (line-beginning-position)) - (when (re-search-forward ledger-regex-post-line (line-end-position) t) - (goto-char (match-end 3)) + (when (re-search-forward ledger-post-line-regexp (line-end-position) t) + (goto-char (match-end ledger-regex-post-line-group-account)) (when (re-search-forward "[-.,0-9]+" (line-end-position) t) (let ((val (match-string 0))) (goto-char (match-beginning 0)) @@ -96,17 +149,17 @@ to choose from." (defun ledger-post-prev-xact () (interactive) (backward-paragraph) - (when (re-search-backward ledger-regex-xact-line nil t) + (when (re-search-backward ledger-xact-line-regexp nil t) (goto-char (match-beginning 0)) - (re-search-forward ledger-regex-post-line) - (goto-char (match-end 3)))) + (re-search-forward ledger-post-line-regexp) + (goto-char (match-end ledger-regex-post-line-group-account)))) (defun ledger-post-next-xact () (interactive) - (when (re-search-forward ledger-regex-xact-line nil t) + (when (re-search-forward ledger-xact-line-regexp nil t) (goto-char (match-beginning 0)) - (re-search-forward ledger-regex-post-line) - (goto-char (match-end 3)))) + (re-search-forward ledger-post-line-regexp) + (goto-char (match-end ledger-regex-post-line-group-account)))) (defun ledger-post-setup () (let ((map (current-local-map))) @@ -115,8 +168,7 @@ to choose from." (define-key map [(control ?c) (control ?c)] 'ledger-post-pick-account) (define-key map [(control ?c) (control ?e)] 'ledger-post-edit-amount)) (if ledger-post-auto-adjust-amounts - (add-hook 'after-change-functions 'ledger-post-maybe-align t t))) - -(add-hook 'ledger-mode-hook 'ledger-post-setup) + (add-hook 'after-change-functions 'ledger-post-maybe-align t t)) + (add-hook 'after-save-hook #'(lambda () (setq ledger-post-current-list nil)))) (provide 'ldg-post) |