[uim-commit] r2017 - in branches/r5rs: . scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-05 13:23:39 -0800 (Sat, 05 Nov 2005)
New Revision: 2017

Modified:
   branches/r5rs/
   branches/r5rs/scm/skk.scm
Log:
 r492 at deepblue (orig r1990):  ekato | 2005-11-05 13:33:32 +0900
 * scm/skk.scm : Fix a bug in completion using latin-conv and
   Setsubi-ji.  Thanks to (key/clefs) for reporting this.
 (skk-proc-state-kanji) : Using proper list for Settou-ji.
 (skk-string-list-to-context-head) : Check latin-conv state and
   Setsubi-ji.
 (skk-proc-state-converting) : Use proper list for Setsubi-ji.
 



Property changes on: branches/r5rs
___________________________________________________________________
Name: svk:merge
   - 2f05256a-0800-0410-85e3-84fe06922419:/local/uim/trunk:1514
74100eb5-a104-0410-9326-fdab01523867:/branches/r5rs:6
fb73e508-85ea-0310-95c3-a85c473e0941:/trunk:1988
   + 2f05256a-0800-0410-85e3-84fe06922419:/local/uim/trunk:1514
74100eb5-a104-0410-9326-fdab01523867:/branches/r5rs:6
fb73e508-85ea-0310-95c3-a85c473e0941:/trunk:1990

Modified: branches/r5rs/scm/skk.scm
===================================================================
--- branches/r5rs/scm/skk.scm	2005-11-05 21:23:17 UTC (rev 2016)
+++ branches/r5rs/scm/skk.scm	2005-11-05 21:23:39 UTC (rev 2017)
@@ -1225,7 +1225,7 @@
        (if (skk-special-midashi-key? key key-state)
 	   (begin
 	     (skk-append-residual-kana sc)
-	     (skk-append-string sc '(">"))
+	     (skk-append-string sc '(">" ">" ">"))
 	     (skk-begin-conversion sc)
 	     #f)
 	   #t)
@@ -1586,7 +1586,14 @@
 	(begin
 	  (skk-append-list-to-context-head
 	   sc
-	   (find-kana-list-from-rule ja-rk-rule-basic (car sl)))
+	   (if (or
+	        (skk-context-latin-conv sc)
+		;; handle Setsubi-ji
+		(and
+		 (null? (cdr sl))
+		 (string=? ">" (car sl))))
+	       (list (car sl) (car sl) (car sl))
+	       (find-kana-list-from-rule ja-rk-rule-basic (car sl))))
 	  (skk-string-list-to-context-head sc (cdr sl)))
 	#f)))
 
@@ -1703,7 +1710,7 @@
 	 (if (skk-special-midashi-key? key key-state)
 	     (begin
 	       (skk-context-set-state! sc 'skk-state-kanji)
-	       (skk-append-string sc '(">"))
+	       (skk-append-string sc '(">" ">" ">"))
 	       (set! res #f))
 	     (set! res (skk-proc-state-direct c key key-state)))))
       res)))