[uim-commit] r624 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-10 22:39:07 -0800 (Thu, 10 Feb 2005)
New Revision: 624

Modified:
   trunk/scm/anthy.scm
   trunk/scm/japanese.scm
Log:
* Fix crash bug with F10 key with anthy reported by Konosuke
  Watanabe.
* scm/anthy.scm (anthy-make-whole-raw-string) : Fix to append
  pending and right-str as correct sequence.
* scm/japanese.scm (ja-raw-string-to-valid-roma) : Check next-str
  appropriately.  Don't use ja-default-small-tsu-roma.
(ja-raw-string-to-valid-roma) : Check next-str appropriately.


Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm	2005-02-11 00:31:14 UTC (rev 623)
+++ trunk/scm/anthy.scm	2005-02-11 06:39:07 UTC (rev 624)
@@ -324,12 +324,15 @@
        (ja-raw-string-list-to-valid-roma
         (append left-str
                 (if (null? residual-kana)
-                    right-str
+		    (begin
+		      (if (null? right-str)
+			  (list pending)
+			  (append right-str (list pending))))
                     (begin
                       (rk-flush rkc)
                       (if (null? right-str)
                           (list pending)
-                          (append (list pending) right-str))))))
+			  (append right-str (list pending)))))))
        wide?))))
 
 (define anthy-init-handler

Modified: trunk/scm/japanese.scm
===================================================================
--- trunk/scm/japanese.scm	2005-02-11 00:31:14 UTC (rev 623)
+++ trunk/scm/japanese.scm	2005-02-11 06:39:07 UTC (rev 624)
@@ -678,8 +678,9 @@
                          (string=? "n" next-head))
                     "nn"
                     head-str)))
-            (if (null? next-str)
-                ja-default-small-tsu-roma
+            (if (or (null? next-str) (string=? next-str ""))
+                ;ja-default-small-tsu-roma
+                head-str
                 (if (ja-vowel? next-str)
                     ja-default-small-tsu-roma
                     (car (reverse (string-to-list next-str))))))
@@ -717,9 +718,9 @@
 ;; 
 (define ja-raw-string-list-to-valid-roma
   (lambda (raw-str-list)
-    (let* ((head-str (car raw-str-list))
+    (let ((head-str (car raw-str-list))
            (next-str (cadr raw-str-list)))
-      (if (null? next-str)
+      (if (or (null? next-str) (string=? next-str ""))
           (list (ja-raw-string-to-valid-roma head-str next-str))
           (cons (ja-raw-string-to-valid-roma head-str next-str)
                 (ja-raw-string-list-to-valid-roma (cdr raw-str-list)))))))