Revision: 6479
Author: deton.kih
Date: Sun Jun 27 00:03:54 2010
Log: * scm/tutcode.scm
- (tutcode-check-stroke-help-window-begin):
Fix for multiple candidates of same sequence.
Change candidate order for normal candwin
http://code.google.com/p/uim/source/detail?r=6479
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Sat Jun 26 23:11:47 2010
+++ /trunk/scm/tutcode.scm Sun Jun 27 00:03:54 2010
@@ -552,18 +552,23 @@
(candlist (cadr elem))
(cand
(or
- (and (not (null? (cdr candlist)))
- (tutcode-context-katakana-mode? pc)
- (cadr candlist))
- (car candlist)))
+ ; ¥·¡¼¥±¥ó¥¹ÅÓÃæ¤Î¾ì¹ç¤Ï¢¢
+ (and (> (length (caar elem)) (+ seqlen 1)) "¢¢")
+ (or
+ (and (not (null? (cdr candlist)))
+ (tutcode-context-katakana-mode? pc)
+ (cadr candlist))
+ (car candlist))))
(candstr
(case cand
((tutcode-mazegaki-start) "¡þ")
((tutcode-bushu-start) "¢¡")
(else cand)))
(label-cand (assoc label label-cand-alist)))
- (if label-cand
- (set-cdr! label-cand
(list "¢¢")) ;Ʊ°ìÂǸ°¤Î¾¤Î¸õÊäÍ¢ªÂǸ°ÅÓÃæ
+ ; ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¸õÊä¤Î¤ß»ÈÍÑ¡£
+ ; (tutcode-rule-commit-sequences!¤Ë¤è¤ê¡¢
+ ; Ʊ°ì¥·¡¼¥±¥ó¥¹¤Î¸õÊ䤬ʣ¿ô¤¢¤ë¾ì¹ç¤¬¤¢¤ë¤Î¤Ç)
+ (if (not label-cand)
(set! label-cand-alist
(cons (list label candstr) label-cand-alist)))))
ret)
@@ -573,7 +578,7 @@
(map
(lambda (elem)
(list (cadr elem) (car elem) ""))
- label-cand-alist)))
+ (reverse label-cand-alist))))
(tutcode-context-set-stroke-help! pc stroke-help)
(tutcode-context-set-candidate-window! pc
'tutcode-candidate-window-stroke-help)
