Revision: 6482
Author: deton.kih
Date: Sun Jun 27 03:19:55 2010
Log: * scm/tutcode.scm
- Update some comments
- (tutcode-check-stroke-help-window-begin):
Change to skip needless candidates
http://code.google.com/p/uim/source/detail?r=6482
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Sun Jun 27 00:03:54 2010
+++ /trunk/scm/tutcode.scm Sun Jun 27 03:19:55 2010
@@ -86,6 +86,8 @@
;;; skk.scm¤Î¤«¤Ê´Á»úÊÑ´¹½èÍý¤«¤éɬÍפÊÉôʬ¤ò¼è¤ê¹þ¤ß¡£
;;; * Éô¼ó¹çÀ®ÊÑ´¹µ¡Ç½¤òÄɲá£
;;; * µ¹æÆþÎϥ⡼¥É¤òÄɲá£
+;;; * ²¾ÁÛ¸°È×ɽ¼¨µ¡Ç½¤òÄɲá£
+;;; * ¼«Æ°¥Ø¥ë¥×ɽ¼¨µ¡Ç½¤òÄɲá£
(require-extension (srfi 1))
(require "generic.scm")
@@ -150,7 +152,7 @@
;;; ¼«Æ°¥Ø¥ë¥×¤Ç¤Îʸ»ú¤ÎÂǤÁÊýɽ¼¨¤ÎºÝ¤Ë¸õÊäʸ»úÎó¤È¤·¤Æ»È¤¦Ê¸»ú¤Î¥ê¥¹¥È
(define tutcode-auto-help-cand-str-list
- ; Âè1,2,3,4ÂǸ°¤ò¼¨¤¹Ê¸»ú
+ ;; Âè1,2,3,4ÂǸ°¤ò¼¨¤¹Ê¸»ú
'(("1" "2" "3" "4") ; 1ʸ»úÌÜÍÑ
("a" "b" "c" "d") ; 2ʸ»úÌÜÍÑ
("A" "B" "C" "D")
@@ -549,10 +551,16 @@
(for-each
(lambda (elem) ; Îã: ((("r" "v" "y")) ("±î"))
(let* ((label (nth seqlen (caar elem)))
- (candlist (cadr elem))
+ (label-cand (assoc label label-cand-alist)))
+ ;; ºÇ½é¤Î¸õÊä¤Î¤ßɽ¼¨¡£
+ ;;
(tutcode-rule-commit-sequences!¤Ë¤è¤ê¡¢Æ±°ì¥·¡¼¥±¥ó¥¹¤Î¸õÊ䤬
+ ;;
Ê£¿ô¤¢¤ë¾ì¹ç¤¬¤¢¤ë¤¬¡¢¥³¡¼¥Éɽ¤Î¸¡º÷¤Ç¤ÏºÇ½é¤Î¤ß»ÈÍѤµ¤ì¤ë¤Î¤Ç)
+ (if (not label-cand)
+ (let*
+ ((candlist (cadr elem))
(cand
(or
- ; ¥·¡¼¥±¥ó¥¹ÅÓÃæ¤Î¾ì¹ç¤Ï¢¢
+ ;; ¥·¡¼¥±¥ó¥¹ÅÓÃæ¤Î¾ì¹ç¤Ï¢¢
(and (> (length (caar elem)) (+ seqlen 1)) "¢¢")
(or
(and (not (null? (cdr candlist)))
@@ -563,14 +571,9 @@
(case cand
((tutcode-mazegaki-start) "¡þ")
((tutcode-bushu-start) "¢¡")
- (else cand)))
- (label-cand (assoc label label-cand-alist)))
- ; ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¸õÊä¤Î¤ß»ÈÍÑ¡£
- ; (tutcode-rule-commit-sequences!¤Ë¤è¤ê¡¢
- ; Ʊ°ì¥·¡¼¥±¥ó¥¹¤Î¸õÊ䤬ʣ¿ô¤¢¤ë¾ì¹ç¤¬¤¢¤ë¤Î¤Ç)
- (if (not label-cand)
- (set! label-cand-alist
- (cons (list label candstr) label-cand-alist)))))
+ (else cand))))
+ (set! label-cand-alist
+ (cons (list label candstr) label-cand-alist))))))
ret)
(if (not (null? label-cand-alist))
(let
