org: ox-texinfo and account

* org-conf.el: Require ox-texinfo, and delete the parts about
  accounts.  Those configurations are outdated now, and the new
  configurations are now in the new file "account.el".

* account.el: Configurations for capturing and reviewing account
  information.

1 files changed, 33 insertions, 29 deletions

diff --git a/org-conf.el b/org-conf.el
index 455d2dc..0d2d0c6 100644
--- a/org-conf.el
+++ b/org-conf.el
@@ -10,6 +10,8 @@
 
 (require 'ox)
 
+(require 'ox-texinfo)
+
 ;;; org capture bookmark
 
 (setq org-capture-bookmark nil)
@@ -261,35 +263,37 @@ in Lisp code use `org-set-tags' instead."
 
 ;;; Accounts
 
-;;;###autoload
-(defvar durand-org-capture-account-which-list
-  '("breakfast" "brunch" "brunverage" "lunch" "dinner" "beverage" "snack" "fruit")
-  "The list of purposes of accounts in the capture-template for accounting.")
-
-;;;###autoload
-(defun durand-org-capture-account-template ()
-  "Org capture template for account."
-  (let* ((shop-and-items (durand-org-complete-capture-account))
-         (which (completing-read
-                 "For what? "
-                 durand-org-capture-account-which-list))
-         (cost (number-to-string
-                (read-number "Cost: " 0)))
-         (from (completing-read "From: " '("Cash" "etique")))
-         (active-time (format-time-string
-                       (cdr org-time-stamp-formats)))
-         (inactive-time
-          (let ((temp active-time))
-            (while (string-match "<\\|>" temp)
-              (setf temp
-                    (replace-match
-                     (cond
-                      ((string= (match-string-no-properties 0 temp) "<") "[")
-                      ((string= (match-string-no-properties 0 temp) ">") "]"))
-                     nil nil temp)))
-            temp)))
-    (format "%s\n  :PROPERTIES:\n  :cost: %s\n  :FROM: %s\n  :RECORD_TIME: %s\n  :END: \n  %s%%?"
-            which cost from inactive-time shop-and-items)))
+(load-file "account.el")
+
+;; ;;;###autoload
+;; (defvar durand-org-capture-account-which-list
+;;   '("breakfast" "brunch" "brunverage" "lunch" "dinner" "beverage" "snack" "fruit")
+;;   "The list of purposes of accounts in the capture-template for accounting.")
+
+;; ;;;###autoload
+;; (defun durand-org-capture-account-template ()
+;;   "Org capture template for account."
+;;   (let* ((shop-and-items (durand-org-complete-capture-account))
+;;          (which (completing-read
+;;                  "For what? "
+;;                  durand-org-capture-account-which-list))
+;;          (cost (number-to-string
+;;                 (read-number "Cost: " 0)))
+;;          (from (completing-read "From: " '("Cash" "etique")))
+;;          (active-time (format-time-string
+;;                        (cdr org-time-stamp-formats)))
+;;          (inactive-time
+;;           (let ((temp active-time))
+;;             (while (string-match "<\\|>" temp)
+;;               (setf temp
+;;                     (replace-match
+;;                      (cond
+;;                       ((string= (match-string-no-properties 0 temp) "<") "[")
+;;                       ((string= (match-string-no-properties 0 temp) ">") "]"))
+;;                      nil nil temp)))
+;;             temp)))
+;;     (format "%s\n  :PROPERTIES:\n  :cost: %s\n  :FROM: %s\n  :RECORD_TIME: %s\n  :END: \n  %s%%?"
+;;             which cost from inactive-time shop-and-items)))
 
 (require 'org-protocol)