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

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-13 19:55:03 -0800 (Sun, 13 Nov 2005)
New Revision: 2132

Modified:
   trunk/scm/skk.scm
   trunk/uim/skk.c
Log:
* scm/skk.scm (skk-proc-state-direct) : Fix to use
  skk-context-kana-mode for getting dcomp-word.
(skk-proc-state-kanji) : Ditto.
* uim/skk.c (skk_get_dcomp_word) : Renamed from
  skk_get_dcomp_entry as intended.
(skk_get_dcomp_entry) : Rename to skk_get_dcomp_word.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-11-13 23:20:25 UTC (rev 2131)
+++ trunk/scm/skk.scm	2005-11-14 03:55:03 UTC (rev 2132)
@@ -1134,7 +1134,7 @@
 		      sc
 		      (skk-lib-get-dcomp-word
 		       (skk-make-string
-			(skk-context-head sc) skk-type-hiragana))))
+			(skk-context-head sc) (skk-context-kana-mode sc)))))
 		 #f)
 	       (let* ((residual-kana (rk-push-key-last! rkc)))
 		 ;; handle preceding "n"
@@ -1176,7 +1176,7 @@
 		(skk-context-set-dcomp-word!
 		 sc
 		 (skk-lib-get-dcomp-word
-		  (skk-make-string (skk-context-head sc) skk-type-hiragana))))))
+		  (skk-make-string (skk-context-head sc) (skk-context-kana-mode sc)))))))
       (if (or
 	   (eq? (skk-context-state sc) 'skk-state-direct)
 	   (eq? (skk-context-state sc) 'skk-state-latin)
@@ -1253,7 +1253,7 @@
 		      (skk-lib-get-dcomp-word
 		       (skk-make-string
 		       (skk-context-head sc)
-		       skk-type-hiragana))
+		       (skk-context-kana-mode sc)))
 			"")))
 	     #f)
 	   #t)
@@ -1298,7 +1298,7 @@
 			sc
 			(skk-lib-get-dcomp-word
 			 (skk-make-string
-			  (skk-context-head sc) skk-type-hiragana))))))
+			  (skk-context-head sc) (skk-context-kana-mode sc)))))))
 	     #f)
 	   #t)
        (if (skk-kanji-mode-key? key key-state)
@@ -1421,7 +1421,7 @@
 		     sc
 		     (skk-lib-get-dcomp-word
 		      (skk-make-string
-		       (skk-context-head sc) skk-type-hiragana))))
+		       (skk-context-head sc) (skk-context-kana-mode sc)))))
 		#t)
 	      #t)
 	   (if (and res

Modified: trunk/uim/skk.c
===================================================================
--- trunk/uim/skk.c	2005-11-13 23:20:25 UTC (rev 2131)
+++ trunk/uim/skk.c	2005-11-14 03:55:03 UTC (rev 2132)
@@ -1814,7 +1814,7 @@
 }
 
 static uim_lisp
-skk_get_dcomp_entry(uim_lisp head_)
+skk_get_dcomp_word(uim_lisp head_)
 {
   const char *hs;
   struct skk_line *sl;
@@ -2804,7 +2804,7 @@
     return;
   }
 
-  /* If any cache is available, just use new one. */
+  /* If no cache is available, just use new one. */
   if (!skk_dic->head.next) {
     skk_dic->head.next = di->head.next;
     skk_dic->cache_len = di->cache_len;
@@ -3099,7 +3099,7 @@
   uim_scm_init_subr_2("skk-lib-get-nth-completion", skk_get_nth_completion);
   uim_scm_init_subr_1("skk-lib-get-nr-completions", skk_get_nr_completions);
   uim_scm_init_subr_1("skk-lib-clear-completions", skk_clear_completions);
-  uim_scm_init_subr_1("skk-lib-get-dcomp-word", skk_get_dcomp_entry);
+  uim_scm_init_subr_1("skk-lib-get-dcomp-word", skk_get_dcomp_word);
   uim_scm_init_subr_1("skk-lib-eval-candidate", skk_eval_candidate);
   uim_scm_init_subr_3("skk-lib-substring", skk_substring);
 }