Author: ek.kato
Date: Mon Sep  3 03:03:46 2007
New Revision: 4935

Modified:
   trunk/scm/skk.scm

Log:
* scm/skk.scm
  - (skk-get-candidate-with-okuri) : New.
  - (skk-get-candidate-handler) : Fix showing okuri-ari word with
    an annotation.


Modified: trunk/scm/skk.scm
==============================================================================
--- trunk/scm/skk.scm   (original)
+++ trunk/scm/skk.scm   Mon Sep  3 03:03:46 2007
@@ -2075,6 +2075,18 @@
   (lambda (sc)
     (skk-flush sc)))
 
+(define skk-get-candidate-with-okuri
+  (lambda (cand okuri)
+    (let ((pos (string-contains cand ";" 0)))
+      (if pos
+         (string-append
+          (substring cand 0 pos)
+          (skk-make-string okuri skk-type-hiragana)
+          (substring cand pos (string-length cand)))
+         (string-append
+          cand
+          (skk-make-string okuri skk-type-hiragana))))))
+
 (define skk-get-candidate-handler
   (lambda (sc idx accel-enum-hint)
     (let* ((dcsc (skk-find-descendant-context sc))
@@ -2091,8 +2103,7 @@
        (if (and
            (not (null? okuri))
            skk-show-candidates-with-okuri?)
-          (string-append cand
-                         (skk-make-string okuri skk-type-hiragana))
+          (skk-get-candidate-with-okuri cand okuri)
           cand)
        (cond
        ((eq? skk-candidate-selection-style 'uim)

Reply via email to