Merge branch 'next' into ledger-mode-sort-region

3 files changed, 74 insertions, 13 deletions

diff --git a/lisp/ldg-fonts.el b/lisp/ldg-fonts.el
new file mode 100644
index 00000000..9f98a9fd
--- /dev/null
+++ b/lisp/ldg-fonts.el
@@ -0,0 +1,73 @@
+;;; ldg-fonts.el --- Helper code for use with the "ledger" command-line tool
+
+;; Copyright (C) 2003-2013 John Wiegley (johnw AT gnu DOT org)
+
+;; This file is not part of GNU Emacs.
+
+;; This is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 2, or (at your option) any later
+;; version.
+;;
+;; This is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+;; MA 02111-1307, USA.
+
+
+(defgroup ledger-faces nil "Ledger mode highlighting" :group 'ledger)
+(defface ledger-font-uncleared-face 
+    `((t :foreground "green" :weight bold ))
+  "Default face for Ledger"
+  :group 'ledger-faces)
+
+(defface ledger-font-cleared-face 
+    `((t :foreground "grey70" :weight normal ))
+  "Default face for cleared (*) transactions"
+  :group 'ledger-faces)
+
+(defface ledger-font-pending-face 
+    `((t :foreground "yellow" :weight normal ))
+  "Default face for pending (!) transactions"
+  :group 'ledger-faces)
+
+(defface ledger-font-other-face 
+    `((t :foreground "yellow" ))
+  "Default face for other transactions"
+  :group 'ledger-faces)
+
+(defface ledger-font-posting-account-face     
+    `((t :foreground "lightblue" ))
+  "Face for Ledger accounts"
+  :group 'ledger-faces)
+
+(defface ledger-font-posting-amount-face     
+    `((t :foreground "yellow" ))
+  "Face for Ledger amounts"
+  :group 'ledger-faces)
+
+(defface ledger-font-comment-face
+  `((t :foreground "orange" ))
+  "Face for Ledger comments"
+  :group 'ledger-faces)
+
+
+(defvar ledger-font-lock-keywords
+  '(("^[0-9]+[-/.=][-/.=0-9]+\\s-\\!\\s-+\\(([^)]+)\\s-+\\)?\\([^*].+?\\)\\(\\(        ;\\|  ;\\|$\\)\\)" 2 'ledger-font-pending-face)
+    ("^[0-9]+[-/.=][-/.=0-9]+\\s-\\*\\s-+\\(([^)]+)\\s-+\\)?\\([^*].+?\\)\\(\\(        ;\\|  ;\\|$\\)\\)" 2 'ledger-font-cleared-face)
+    ("^[0-9]+[-/.=][-/.=0-9]+\\s-+\\(([^)]+)\\s-+\\)?\\([^*].+?\\)\\(\\(        ;\\|  ;\\|$\\)\\)" 2 'ledger-font-uncleared-face) 
+    ("^\\s-+\\([*]\\s-*\\)?\\(\\([[(]\\)?[^*:
+        ]+?:\\([^]);
+        ]\\|\\s-\\)+?\\([])]\\)?\\)\\(    \\|  \\|$\\)"
+     2 'ledger-font-posting-account-face) ; works
+    ("\\(       \\|  \\|^\\)\\(;.*\\)" 2 'ledger-font-comment-face)  ; works
+    ("^\\([~=].+\\)" 1 ledger-font-other-face)
+    ("^\\([A-Za-z]+ .+\\)" 1 ledger-font-other-face))
+  "Expressions to highlight in Ledger mode.")
+
+(provide 'ldg-fonts)
\ No newline at end of file
diff --git a/lisp/ldg-mode.el b/lisp/ldg-mode.el
index 9efe7618..6179747d 100644
--- a/lisp/ldg-mode.el
+++ b/lisp/ldg-mode.el
@@ -38,19 +38,6 @@ customizable to ease retro-entry.")
   :type 'string
   :group 'ledger)
 
-(defvar bold 'bold)
-(defvar ledger-font-lock-keywords
-  '(("\\(       \\|  \\|^\\)\\(;.*\\)" 2 font-lock-comment-face)
-    ("^[0-9]+[-/.=][-/.=0-9]+\\s-+\\(([^)]+)\\s-+\\)?\\([^*].+?\\)\\(\\(        ;\\|  ;\\|$\\)\\)" 2 bold)
-    ;;("^[0-9]+[-/.=][-/.=0-9]+\\s-+\\(([^)]+)\\s-+\\)?\\([*].+?\\)\\(\\(       ;\\|  ;\\|$\\)\\)"
-    ;; 2 font-lock-type-face)
-    ("^\\s-+\\([*]\\s-*\\)?\\(\\([[(]\\)?[^*:
-        ]+?:\\([^]);
-        ]\\|\\s-\\)+?\\([])]\\)?\\)\\(    \\|  \\|$\\)"
-     2 font-lock-keyword-face)
-    ("^\\([~=].+\\)" 1 font-lock-function-name-face)
-    ("^\\([A-Za-z]+ .+\\)" 1 font-lock-function-name-face))
-  "Expressions to highlight in Ledger mode.")
 
 (defvar ledger-mode-abbrev-table)
 
diff --git a/lisp/ldg-new.el b/lisp/ldg-new.el
index d9e0fc60..4793f662 100644
--- a/lisp/ldg-new.el
+++ b/lisp/ldg-new.el
@@ -43,6 +43,7 @@
 (require 'ldg-test)
 (require 'ldg-texi)
 (require 'ldg-xact)
+(require 'ldg-fonts)
 ;(autoload #'ledger-mode "ldg-mode" nil t)
 ;(autoload #'ledger-fully-complete-entry "ldg-complete" nil t)
 ;(autoload #'ledger-toggle-current "ldg-state" nil t)