[elpa] 02/02: * chess-input.el (chess-input-notation-type): New variable. (chess-input-test-move, chess-input-display-moves): Use it. (chess-input-shortcut): Generate initial ply list for numeric notation.

[Mario Lang]

mlang pushed a commit to branch externals/chess
in repository elpa.

commit 642abf9348814ce7ec217fcba99df919ac16c9e7
Author: Mario Lang <address@hidden>
Date:   Mon Jun 16 15:50:46 2014 +0200

    * chess-input.el (chess-input-notation-type): New variable.
    (chess-input-test-move, chess-input-display-moves): Use it.
    (chess-input-shortcut): Generate initial ply list for numeric
    notation.
---
 ChangeLog      |    5 +++++
 chess-input.el |   26 ++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7c40c3..654731e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-16  Mario Lang  <address@hidden>
 
+       * chess-input.el (chess-input-notation-type): New variable.
+       (chess-input-test-move, chess-input-display-moves): Use it.
+       (chess-input-shortcut): Generate initial ply list for numeric
+       notation.
+
        * chess-ply.el (chess-legal-plies): Make :file keyword usable if :color
        is specified.
 
diff --git a/chess-input.el b/chess-input.el
index 7d5c946..f3cc893 100644
--- a/chess-input.el
+++ b/chess-input.el
@@ -48,9 +48,14 @@
 (make-variable-buffer-local 'chess-input-position-function)
 (make-variable-buffer-local 'chess-input-move-function)
 
+(defcustom chess-input-notation-type :san
+  "Define the notation type to use for move input."
+  :type '(choice (const :tag "Standard (short) algebraic notation" :san)
+                (const :tag "Numeric notation" :numeric)))
+
 (defun chess-input-test-move (ply)
   "Return the given PLY if it matches the user's current input."
-  (let* ((move (chess-ply-to-algebraic ply))
+  (let* ((move (chess-ply-to-algebraic ply chess-input-notation-type))
         (i 0) (x 0) (l (length move))
         (xl (length chess-input-move-string)))
     (unless (or (and (equal (downcase chess-input-move-string) "ok")
@@ -71,7 +76,7 @@
 
 (defun chess-input-display-moves (&optional move-list)
   (unless move-list
-    (setq chess-input-test-move
+    (setq move-list
          (delq nil (mapcar #'chess-input-test-move (cdr chess-input-moves)))))
   (when chess-display-highlight-legal
     (chess-display-redraw nil))
@@ -80,7 +85,9 @@
       (apply #'chess-display-highlight
             nil (cl-delete-duplicates (mapcar #'chess-ply-target move-list))))
     (message "[%s] %s" chess-input-move-string
-            (mapconcat #'chess-ply-to-algebraic move-list " "))))
+            (mapconcat (lambda (ply)
+                         (chess-ply-to-algebraic ply 
chess-input-notation-type))
+                       move-list " "))))
 
 (defun chess-input-shortcut-delete ()
   (interactive)
@@ -134,7 +141,18 @@
                  (function
                   (lambda (left right)
                     (string-lessp (chess-ply-to-algebraic left)
-                                  (chess-ply-to-algebraic right))))))))))
+                                  (chess-ply-to-algebraic right)))))))
+       (if (and (>= char ?1) (<= char ?8))
+           (setq chess-input-moves-pos position
+                 chess-input-moves
+                 (cons
+                  char
+                  (sort
+                   (chess-legal-plies position :color color :file (- char ?1))
+                   (function
+                    (lambda (left right)
+                      (string-lessp (chess-ply-to-algebraic left)
+                                    (chess-ply-to-algebraic right)))))))))))
   (let ((moves (delq nil (mapcar 'chess-input-test-move
                                 (cdr chess-input-moves)))))
     (cond