Revision: 6813
Author: deton.kih
Date: Fri Nov 12 15:35:56 2010
Log: * scm/tutcode.scm
- (tutcode-hint-mark): New variable.
- (tutcode-check-stroke-help-window-begin):
Change to show hint kanji instead of white box for intermediate
sequence.
- (tutcode-rule-commit-sequences!):
Change to append new sequences to last of tutcode-rule (instead of
first)
to avoid showing mazegaki-start-sequence as hint kanji.
http://code.google.com/p/uim/source/detail?r=6813
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Wed Nov 10 03:30:19 2010
+++ /trunk/scm/tutcode.scm Fri Nov 12 15:35:56 2010
@@ -333,6 +333,9 @@
(define tutcode-guide-mark "+")
;;; ½Ï¸ì¥¬¥¤¥ÉÍѽªÎ»¥Þ¡¼¥¯
(define tutcode-guide-end-mark "+")
+;;; ²¾ÁÛ¸°ÈפΥ¹¥È¥í¡¼¥¯ÅÓÃæ¤Ç¡¢
+;;; ³¤¤ËÍè¤ë´Á»ú¤Î¥Ò¥ó¥È¤È¤·¤Æɽ¼¨¤¹¤ë´Á»ú¤ËÉÕ¤±¤ë¥Þ¡¼¥¯
+(define tutcode-hint-mark "*")
;;; implementations
@@ -1148,7 +1151,7 @@
(seq (rk-context-seq rkc))
(seqlen (length seq))
(ret (rk-lib-find-partial-seqs (reverse seq) tutcode-rule))
- (label-cand-alist ())) ; Îã:(("k" "¤¢") ("i" "¤¤") ("v" "¢¢"))
+ (label-cand-alist ())) ; Îã:(("k" "¤¢") ("i" "¤¤") ("g" "*£"))
(for-each
(lambda (elem) ; Îã: ((("r" "v" "y")) ("±î"))
(let* ((label (nth seqlen (caar elem)))
@@ -1156,24 +1159,28 @@
(if (not label-cand)
(let*
((candlist (cadr elem))
+ ;; ¥·¡¼¥±¥ó¥¹ÅÓÃæ?
+ (has-next? (> (length (caar elem)) (+ seqlen 1)))
(cand
(or
- ;; ¥·¡¼¥±¥ó¥¹ÅÓÃæ¤Î¾ì¹ç¤Ï¢¢
- (and (> (length (caar elem)) (+ seqlen 1)) "¢¢")
- (or
- (and (not (null? (cdr candlist)))
- (tutcode-context-katakana-mode? pc)
- (cadr candlist))
- (car candlist))))
+ (and (not (null? (cdr candlist)))
+ (tutcode-context-katakana-mode? pc)
+ (cadr candlist))
+ (car candlist)))
(candstr
- (case cand
+ (case cand
((tutcode-mazegaki-start) "¡þ")
((tutcode-latin-conv-start) "/")
((tutcode-bushu-start) "¢¡")
((tutcode-auto-help-redisplay) "¢ã")
- (else cand))))
+ (else cand)))
+ (cand-hint
+ (or
+ ;; ¥·¡¼¥±¥ó¥¹ÅÓÃæ¤Î¾ì¹ç¤Ïhint-mark(*)ÉÕ¤
+ (and has-next? (string-append tutcode-hint-mark
candstr))
+ candstr)))
(set! label-cand-alist
- (cons (list label candstr) label-cand-alist))))))
+ (cons (list label cand-hint) label-cand-alist))))))
ret)
;; ½Ï¸ì¥¬¥¤¥É¤ä¼«Æ°¥Ø¥ë¥×¤«¤é¤Î³¤¤Ç¡¢ÆþÎϸõÊäʸ»ú¤Ë¥Þ¡¼¥¯¤òÉÕ¤±¤ë
(if (and (pair? seq)
@@ -2982,4 +2989,4 @@
(for-each setseq1! rules)
;; ¿·µ¬Äɲå·¡¼¥±¥ó¥¹
(if (not (null? newseqs))
- (set! tutcode-rule (append newseqs tutcode-rule)))))
+ (set! tutcode-rule (append tutcode-rule newseqs)))))
