[uim] r6643 committed - * scm/tutcode.scm...

[codesite-noreply]

Revision: 6643
Author: deton.kih
Date: Fri Jul 30 15:56:01 2010
Log: * scm/tutcode.scm
  - (tutcode-rule-commit-sequences!):
    Fix not to show auto help sequences which are overridden
    by tutcode-rule-set-sequences! (revert change in r4608).
http://code.google.com/p/uim/source/detail?r=6643

Modified:
 /trunk/scm/tutcode.scm

=======================================
--- /trunk/scm/tutcode.scm      Sat Jul 24 17:48:54 2010
+++ /trunk/scm/tutcode.scm      Fri Jul 30 15:56:01 2010
@@ -2136,6 +2136,27 @@
 ;;; ¥³¡¼¥Éɽ¤Î¾å½ñ¤­Êѹ¹/ÄɲäΤ¿¤á¤Îtutcode-rule-userconfig¤ò
 ;;; ¥³¡¼¥Éɽ¤ËÈ¿±Ç¤¹¤ë¡£
 (define (tutcode-rule-commit-sequences! rules)
-  ;;  
¥³¡¼¥Éɽ¤Î¸¡º÷¤Ï¥ê¥Ë¥¢¤Ë¹Ô¤ï¤ì¤ë¤Î¤Ç¡¢¥ê¥¹¥È¤ÎÀèƬ¤ËÆþ¤ì¤ë¤À¤±¤Ç¾å½ñ¤­¤âOK
-  (if (not (null? rules))
-    (set! tutcode-rule (append rules tutcode-rule))))
+  (let* ((newseqs ()) ;¿·µ¬Äɲ乤륭¡¼¥·¡¼¥±¥ó¥¹
+         ;; ¥³¡¼¥ÉɽÆâ¤Î»ØÄꥷ¡¼¥±¥ó¥¹¤ÇÆþÎϤµ¤ì¤ëʸ»ú¤òÊѹ¹¤¹¤ë¡£
+         ;; seq ¥­¡¼¥·¡¼¥±¥ó¥¹
+         ;; kanji  
ÆþÎϤµ¤ì¤ëʸ»ú¡£car¤¬¤Ò¤é¤¬¤Ê¥â¡¼¥ÉÍÑ¡¢cadr¤¬¥«¥¿¥«¥Ê¥â¡¼¥ÉÍÑ
+         (setseq1!
+          (lambda (elem)
+            (let* ((seq (caar elem))
+                   (kanji (cadr elem))
+                   (curseq (rk-lib-find-seq seq tutcode-rule))
+                   (pair (and curseq (cadr curseq))))
+              (if (and pair (pair? pair))
+                (begin
+                  (set-car! pair (car kanji))
+                  (if (not (null? (cdr kanji)))
+                    (if (< (length pair) 2)
+                      (set-cdr! pair (list (cadr kanji)))
+                      (set-car! (cdr pair) (cadr kanji)))))
+                (begin
+                  ;; ¥³¡¼¥ÉɽÆâ¤Ë»ØÄꤵ¤ì¤¿¥­¡¼¥·¡¼¥±¥ó¥¹¤ÎÄêµÁ¤¬Ìµ¤¤
+                  (set! newseqs (append newseqs (list elem)))))))))
+    (for-each setseq1! rules)
+    ;; ¿·µ¬Äɲå·¡¼¥±¥ó¥¹
+    (if (not (null? newseqs))
+      (set! tutcode-rule (append newseqs tutcode-rule)))))