Revision: 7212
Author: deton.kih
Date: Tue Jul 12 04:01:49 2011
Log: * Merge r7211 from trunk.
http://code.google.com/p/uim/source/detail?r=7212
Modified:
/branches/1.7/scm/tutcode.scm
=======================================
--- /branches/1.7/scm/tutcode.scm Mon Jul 11 04:09:30 2011
+++ /branches/1.7/scm/tutcode.scm Tue Jul 12 04:01:49 2011
@@ -2043,7 +2043,7 @@
(if (not decomposed)
label-cands-alist
(let*
- ((bushu-strs (tutcode-auto-help-bushu-combination-strs
decomposed))
+ ((bushu-strs (tutcode-auto-help-bushu-composition-strs
decomposed))
(helpstrlist (append (list "(" kanji "¢¥") bushu-strs '(")")))
(helpstr (apply string-append helpstrlist))
(alist
@@ -2067,7 +2067,7 @@
(string-append (caar cand-list) helpstr)
(cdar cand-list))
(cdr cand-list))))))
- (tutcode-auto-help-bushu-combination-add-guide pc decomposed)
+ (tutcode-auto-help-bushu-composition-add-guide pc decomposed)
(car alist)))))))
;;; tutcode-rule¤ÎÍ×ÁǤηÁ¼°((("," "o"))("·â"))¤«¤É¤¦¤«¤òÊÖ¤¹
@@ -2084,21 +2084,21 @@
;;; ¼«Æ°¥Ø¥ë¥×:tutcode-auto-help-bushu-decompose¤Ç¸¡º÷¤·¤¿¡¢
;;; Éô¼ó¹çÀ®ÊýË¡¤Ç»È¤¦Éô¼ó¤ò¡¢¥¬¥¤¥ÉÂоÝʸ»ú¤ËÄɲ乤롣
;;; @param decomposed tutcode-auto-help-bushu-decompose·ë²Ì
-(define (tutcode-auto-help-bushu-combination-add-guide pc decomposed)
+(define (tutcode-auto-help-bushu-composition-add-guide pc decomposed)
(if (not (null? decomposed))
(begin
(if (tutcode-rule-element? (car decomposed))
(tutcode-stroke-help-guide-add-kanji pc (car decomposed))
- (tutcode-auto-help-bushu-combination-add-guide pc (car
decomposed)))
- (tutcode-auto-help-bushu-combination-add-guide pc (cdr
decomposed)))))
+ (tutcode-auto-help-bushu-composition-add-guide pc (car
decomposed)))
+ (tutcode-auto-help-bushu-composition-add-guide pc (cdr
decomposed)))))
;;; ¼«Æ°¥Ø¥ë¥×:tutcode-auto-help-bushu-decompose¤Ç¸¡º÷¤·¤¿¡¢
;;; ¥¹¥È¥í¡¼¥¯¤ò´Þ¤àÉô¼ó¹çÀ®ÊýË¡¤«¤é¡¢
;;; Éô¼óʸ»úÎó¤Î¤ß¤òÈ´¤½Ð¤·¤¿Éô¼ó¹çÀ®ÊýË¡¤òºî¤ë
;;; @param decomposed tutcode-auto-help-bushu-decompose·ë²Ì
;;; @return ºîÀ®¸å¤ÎÉô¼ó¹çÀ®Êýˡʸ»úÎó¥ê¥¹¥È
-(define (tutcode-auto-help-bushu-combination-strs decomposed)
- (tutcode-auto-help-bushu-combination-traverse decomposed ()
+(define (tutcode-auto-help-bushu-composition-strs decomposed)
+ (tutcode-auto-help-bushu-composition-traverse decomposed ()
(lambda (ele) (list (caadr ele))) "¢¥" ""))
;;;
¼«Æ°¥Ø¥ë¥×:tutcode-auto-help-bushu-decompose¤Î¸¡º÷·ë²Ì¤Î¥Ä¥ê¡¼¹½Â¤¤«¤é¡¢
@@ -2110,7 +2110,7 @@
;;; @param branch-str »Þ¤ï¤«¤ì¤ò¼¨¤¹¤¿¤á¤Ë·ë²Ì¥ê¥¹¥È¤ËÄɲ乤ëʸ»úÎó
;;; @param delim-str ³ÆÉô¼ó¤Î¶èÀÚ¤ê¤ò¼¨¤¹¤¿¤á¤Ë·ë²Ì¥ê¥¹¥È¤ËÄɲ乤ëʸ»úÎó
;;; @return ºîÀ®¸å¤Î¥ê¥¹¥È
-(define (tutcode-auto-help-bushu-combination-traverse decomposed lst picker
+(define (tutcode-auto-help-bushu-composition-traverse decomposed lst picker
branch-str delim-str)
(if (null? decomposed)
lst
@@ -2118,9 +2118,9 @@
((add
(if (tutcode-rule-element? (car decomposed))
(cons delim-str (picker (car decomposed)))
- (tutcode-auto-help-bushu-combination-traverse (car decomposed)
+ (tutcode-auto-help-bushu-composition-traverse (car decomposed)
(list branch-str) picker branch-str delim-str))))
- (tutcode-auto-help-bushu-combination-traverse (cdr decomposed)
+ (tutcode-auto-help-bushu-composition-traverse (cdr decomposed)
(append lst add) picker branch-str delim-str))))
;;; ¼«Æ°¥Ø¥ë¥×:ÂоݤÎ1ʸ»ú¤òÆþÎϤ¹¤ë¥¹¥È¥í¡¼¥¯¤ò¥Ø¥ë¥×ÍÑalist¤ËÄɲ乤롣
@@ -2146,13 +2146,13 @@
(if (not decomposed)
label-cands-alist
(let*
- ((bushu-strs (tutcode-auto-help-bushu-combination-strs
decomposed))
+ ((bushu-strs (tutcode-auto-help-bushu-composition-strs
decomposed))
(helpstrlist (append (list kanji "¢¥") bushu-strs))
(helpstr (apply string-append helpstrlist))
(bushu-stroke
- (tutcode-auto-help-bushu-combination-traverse decomposed ()
+ (tutcode-auto-help-bushu-composition-traverse decomposed ()
caar "" " ")))
- (tutcode-auto-help-bushu-combination-add-guide pc decomposed)
+ (tutcode-auto-help-bushu-composition-add-guide pc decomposed)
(tutcode-auto-help-update-stroke-alist-normal-with-stroke
label-cands-alist
(cons helpstr bushu-stroke)
