[uim-commit] r3102 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2006-02-07 17:25:33 -0800 (Tue, 07 Feb 2006)
New Revision: 3102

Modified:
   trunk/scm/anthy.scm
   trunk/scm/canna.scm
   trunk/scm/mana.scm
Log:
* scm/anthy.scm (anthy-proc-input-state-with-preedit) : Handle
  "n1" sequence as in skk.scm.
* scm/canna.scm (canna-proc-input-state-with-preedit) : Ditto.
* scm/mana.scm (mana-proc-input-state-with-preedit) : Ditto.


Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm	2006-02-07 08:28:14 UTC (rev 3101)
+++ trunk/scm/anthy.scm	2006-02-08 01:25:33 UTC (rev 3102)
@@ -632,6 +632,18 @@
 	  #f)
 
        (else	
+	;; handle "n1" sequence as "¤ó1"
+	(if (and (not (alphabet-char? key))
+		 (not (string-find
+		       (rk-expect rkc)
+		       (charcode->string
+		        (if (= rule anthy-input-rule-kana)
+			    key
+			    (to-lower-char key))))))
+	    (let ((residual-kana (rk-push-key-last! rkc)))
+	      (if residual-kana
+		  (ustr-insert-elem! preconv-str residual-kana))))
+
 	(let* ((key-str (charcode->string 
 			 (if (= rule anthy-input-rule-kana)
 			     key

Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm	2006-02-07 08:28:14 UTC (rev 3101)
+++ trunk/scm/canna.scm	2006-02-08 01:25:33 UTC (rev 3102)
@@ -555,6 +555,18 @@
 	      (not (shift-key-mask key-state)))
       (canna-commit-raw cc))
      (else
+      ;; handle "n1" sequence as "¤ó1"
+      (if (and (not (alphabet-char? key))
+	       (not (string-find
+		     (rk-expect rkc)
+		     (charcode->string
+		      (if (= rule canna-input-rule-kana)
+		          key
+			  (to-lower-char key))))))
+	  (let ((residual-kana (rk-push-key-last! rkc)))
+	    (if residual-kana
+	        (canna-append-string cc residual-kana))))
+
       (let* ((key-str (charcode->string key))
 	     (pend (rk-pending rkc))
 	     (res (rk-push-key! rkc key-str)))

Modified: trunk/scm/mana.scm
===================================================================
--- trunk/scm/mana.scm	2006-02-07 08:28:14 UTC (rev 3101)
+++ trunk/scm/mana.scm	2006-02-08 01:25:33 UTC (rev 3102)
@@ -788,6 +788,18 @@
          #f)
 
         (else
+	  ;; handle "n1" sequence as "¤ó1"
+	  (if (and (not (alphabet-char? key))
+		   (not (string-find
+			 (rk-expect rkc)
+			 (charcode->string
+			  (if (= rule mana-input-rule-kana)
+			      key
+			      (to-lower-char key))))))
+	      (let ((residual-kana (rk-push-key-last! rkc)))
+		(if residual-kana
+		    (ustr-insert-elem! preconv-str residual-kana))))
+
           (let* ((key-str (charcode->string 
                             (if (= rule mana-input-rule-kana)
                                 key