[uim-commit] r2197 - in trunk: scm uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-21 01:03:41 -0800 (Mon, 21 Nov 2005)
New Revision: 2197

Modified:
   trunk/scm/skk-key-custom.scm
   trunk/scm/skk.scm
   trunk/uim/skk.c
Log:
* uim/skk.c (compare_and_merge_skk_line) : Merge state of lines.

* scm/skk-key-custom.scm (skk-conv-alt-case-key) : Rename to
  skk-conv-opposite-case-key.
(skk-opposite-case-key) : Renamed from skk-conv-alt-case-key.
* scm/skk.c (skk-conv-alt-case) : Rename to
  skk-conv-opposite-case.
(skk-conv-opposite-case) : Renamed from skk-conv-alt-case.
(skk-proc-state-kanji) : Follow the rename.


Modified: trunk/scm/skk-key-custom.scm
===================================================================
--- trunk/scm/skk-key-custom.scm	2005-11-20 17:27:48 UTC (rev 2196)
+++ trunk/scm/skk-key-custom.scm	2005-11-21 09:03:41 UTC (rev 2197)
@@ -148,10 +148,10 @@
 	       (_ "[SKK] commit as fullwidth alphanumeric")
 	       (_ "long description will be here"))
 
-(define-custom 'skk-conv-alt-case-key '("<IgnoreCase><Control>u")
+(define-custom 'skk-conv-opposite-case-key '("<IgnoreCase><Control>u")
                '(skk-keys2)
 	       '(key)
-	       (_ "[SKK] commit as alternative case in latin conversion")
+	       (_ "[SKK] commit as opposite case in latin conversion")
 	       (_ "long description will be here"))
 
 (define-custom 'skk-latin-conv-key '("/")

Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-11-20 17:27:48 UTC (rev 2196)
+++ trunk/scm/skk.scm	2005-11-21 09:03:41 UTC (rev 2197)
@@ -425,9 +425,9 @@
 		       (get-wide-latin-str sl))
 	""))))
 
-(define skk-conv-alt-case
+(define skk-conv-opposite-case
   (lambda (sl)
-    (let ((get-alt-case-str
+    (let ((get-opposite-case-str
 	   (lambda (l)
 	     (let ((c (string->charcode (caar l))))
 	       (cond
@@ -438,8 +438,8 @@
 		(else
 		 (caar l)))))))
       (if (not (null? sl))
-	  (string-append (skk-conv-alt-case (cdr sl))
-			 (get-alt-case-str sl))
+	  (string-append (skk-conv-opposite-case (cdr sl))
+			 (get-opposite-case-str sl))
 	  ""))))
 
 (define skk-opposite-kana
@@ -1349,11 +1349,11 @@
 		     (skk-commit sc (skk-conv-wide-latin
 				     (skk-context-head sc)))
 		     (skk-flush sc))))
-	      ((skk-conv-alt-case-key? key key-state) 
+	      ((skk-conv-opposite-case-key? key key-state) 
 	       ;; alternative case conversion
 	       (if (not (null? (skk-context-head sc)))
 		   (begin
-		     (skk-commit sc (skk-conv-alt-case
+		     (skk-commit sc (skk-conv-opposite-case
 				     (skk-context-head sc)))
 		     (skk-flush sc))))
 	      (else

Modified: trunk/uim/skk.c
===================================================================
--- trunk/uim/skk.c	2005-11-20 17:27:48 UTC (rev 2196)
+++ trunk/uim/skk.c	2005-11-21 09:03:41 UTC (rev 2197)
@@ -2930,6 +2930,8 @@
     if (!dup)
       push_back_candidate_array_to_sl(dst_sl, src_ca);
   }
+
+  dst_sl->state |= src_sl->state;
 }
 
 /* for merge sort */