[uim] r7255 committed - * Move common code about kanji code input in skk.scm and tutcode.scm...

[codesite-noreply]

Revision: 7255
Author:   deton.kih
Date:     Fri Aug  5 16:27:23 2011
Log:      * Move common code about kanji code input in skk.scm and  
tutcode.scm
  to japanese.scm.
* scm/japanese.scm
  - (ja-kanji-code-input): New.
    Extracted from skk.scm and tutcode.scm.
* scm/skk.scm
  - (skk-proc-state-kcode):
    Change to use ja-kanji-code-input.
* scm/tutcode.scm
  - (tutcode-begin-kanji-code-input):
    Change to use ja-kanji-code-input.
http://code.google.com/p/uim/source/detail?r=7255

Modified:
 /trunk/scm/japanese.scm
 /trunk/scm/skk.scm
 /trunk/scm/tutcode.scm

=======================================
--- /trunk/scm/japanese.scm     Thu Aug  4 19:56:13 2011
+++ /trunk/scm/japanese.scm     Fri Aug  5 16:27:23 2011
@@ -1002,6 +1002,16 @@
       (iconv-release ic)
       eucj-str)))

+;;; Convert reverse string list to one EUC-JP kanji string
+(define (ja-kanji-code-input str-list)
+  (cond
+    ((string-ci=? (last str-list) "u")
+      (ja-kanji-code-input-ucs str-list))
+    ((member "-" str-list)
+      (ja-kanji-code-input-kuten str-list))
+    (else
+      (ja-kanji-code-input-jis str-list))))
+
 ;;
 (require "rk.scm")

=======================================
--- /trunk/scm/skk.scm  Thu Aug  4 19:56:13 2011
+++ /trunk/scm/skk.scm  Fri Aug  5 16:27:23 2011
@@ -2146,14 +2146,7 @@
                                  (skk-make-string
                                     (skk-context-head sc)
                                     (skk-context-kana-mode sc))))
-                     (kanji
-                       (cond
-                         ((string-ci=? (last str-list) "u")
-                           (ja-kanji-code-input-ucs str-list))
-                         ((member "-" str-list)
-                           (ja-kanji-code-input-kuten str-list))
-                         (else
-                           (ja-kanji-code-input-jis str-list)))))
+                     (kanji (ja-kanji-code-input str-list)))
                 (if (and kanji (> (string-length kanji) 0))
                   (begin
                     (skk-commit sc kanji)
=======================================
--- /trunk/scm/tutcode.scm      Thu Aug  4 19:56:13 2011
+++ /trunk/scm/tutcode.scm      Fri Aug  5 16:27:23 2011
@@ -1548,15 +1548,7 @@
 ;;; ÆþÎϤµ¤ì¤¿´Á»ú¥³¡¼¥É¤ËÂбþ¤¹¤ë´Á»ú¤ò³ÎÄꤹ¤ë
 ;;; @param str-list ´Á»ú¥³¡¼¥É¡£ÆþÎϤµ¤ì¤¿Ê¸»úÎó¤Î¥ê¥¹¥È(µÕ½ç)
 (define (tutcode-begin-kanji-code-input pc str-list)
-  (let
-    ((kanji
-      (cond
-        ((string-ci=? (last str-list) "u")
-          (ja-kanji-code-input-ucs str-list))
-        ((member "-" str-list)
-          (ja-kanji-code-input-kuten str-list))
-        (else
-          (ja-kanji-code-input-jis str-list)))))
+  (let ((kanji (ja-kanji-code-input str-list)))
     (if (and kanji (> (string-length kanji) 0))
       (begin
         (tutcode-commit pc kanji)