Revision: 6553
Author: deton.kih
Date: Tue Jul 20 04:23:15 2010
Log: * scm/tutcode.scm
- (tutcode-context-new):
Add setup for table style candidate window.
- (tutcode-table-heading-label-char-list): New.
- (tutcode-uim-heading-label-char-list):
Rename from tutcode-heading-label-char-list.
- (tutcode-heading-label-char-list): Change to () as default.
- (tutcode-table-heading-label-char-list-for-kigou-mode): New.
- (tutcode-uim-heading-label-char-list-for-kigou-mode):
Rename from tutcode-heading-label-char-list-for-kigou-mode.
- (tutcode-heading-label-char-list-for-kigou-mode): Change to () as
default.
http://code.google.com/p/uim/source/detail?r=6553
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Tue Jul 20 03:59:14 2010
+++ /trunk/scm/tutcode.scm Tue Jul 20 04:23:15 2010
@@ -131,8 +131,15 @@
;;; tutcode-context-new»þ¤ËÈ¿±Ç¤¹¤ë¡£
(define tutcode-rule-userconfig ())
-;;; ¸ò¤¼½ñ¤ÊÑ´¹»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È
-(define tutcode-heading-label-char-list
+;;; ¸ò¤¼½ñ¤ÊÑ´¹»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È(ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦ÍÑ)¡£
+;;; (ÂǤÁ¤ä¤¹¤¤¾ì½ê¤«¤éÀè¤Ë¸õÊä¤òËä¤á¤ë)
+(define tutcode-table-heading-label-char-list
+ '("a" "s" "d" "f" "g" "h" "j" "k" "l" ";"
+ "q" "w" "e" "r" "t" "y" "u" "i" "o" "p"
+ "z" "x" "c" "v" "b" "n" "m" "," "." "/"
+ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"))
+;;; ¸ò¤¼½ñ¤ÊÑ´¹»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È(uim¥¹¥¿¥¤¥ëÍÑ)
+(define tutcode-uim-heading-label-char-list
'("1" "2" "3" "4" "5" "6" "7" "8" "9" "0"
"a" "b" "c" "d" "e" "f" "g" "h" "i" "j"
"k" "l" "m" "n" "o" "p" "q" "r" "s" "t"
@@ -140,10 +147,22 @@
"A" "B" "C" "D" "E" "F" "G" "H" "I" "J"
"K" "L" "M" "N" "O" "P" "Q" "R" "S" "T"
"U" "V" "W" "X" "Y" "Z"))
-
-;;; µ¹æÆþÎϥ⡼¥É»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È
-;;; (Á´³Ñ±Ñ¿ô¥â¡¼¥É¤È¤·¤Æ»È¤¦¤Ë¤Ï¡¢tutcode-kigoudic¤È¹ç¤ï¤»¤ëɬÍפ¢¤ê)
-(define tutcode-heading-label-char-list-for-kigou-mode
+;;; ¸ò¤¼½ñ¤ÊÑ´¹»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È
+(define tutcode-heading-label-char-list ())
+
+;;;
µ¹æÆþÎϥ⡼¥É»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È(ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦ÍÑ)¡£
+;;; (¥¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È¤Ë½¾¤Ã¤Æ¡¢º¸¾å¤«¤é±¦²¼¤Ø½ç¤Ë¸õÊä¤òËä¤á¤ë)
+(define tutcode-table-heading-label-char-list-for-kigou-mode
+ '("1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "^" "\\"
+ "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "@" "["
+ "a" "s" "d" "f" "g" "h" "j" "k" "l" ";" ":" "]"
+ "z" "x" "c" "v" "b" "n" "m" "," "." "/" " "
+ "!" "\"" "#" "$" "%" "&" "'" "(" ")" "=" "~" "|"
+ "Q" "W" "E" "R" "T" "Y" "U" "I" "O" "P" "`" "{"
+ "A" "S" "D" "F" "G" "H" "J" "K" "L" "+" "*" "}"
+ "Z" "X" "C" "V" "B" "N" "M" "<" ">" "?" "_"))
+;;; µ¹æÆþÎϥ⡼¥É»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È(uim¥¹¥¿¥¤¥ëÍÑ)
+(define tutcode-uim-heading-label-char-list-for-kigou-mode
'(" "
"1" "2" "3" "4" "5" "6" "7" "8" "9" "0"
"a" "b" "c" "d" "e" "f" "g" "h" "i" "j"
@@ -155,6 +174,9 @@
"K" "L" "M" "N" "O" "P" "Q" "R" "S" "T"
"U" "V" "W" "X" "Y" "Z"
"=" "~" "|" "`" "{" "+" "*" "}" "<" ">" "?" "_"))
+;;; µ¹æÆþÎϥ⡼¥É»þ¤Î¸õÊäÁªÂòÍÑ¥é¥Ù¥ëʸ»ú¤Î¥ê¥¹¥È
+;;; (Á´³Ñ±Ñ¿ô¥â¡¼¥É¤È¤·¤Æ»È¤¦¤Ë¤Ï¡¢tutcode-kigoudic¤È¹ç¤ï¤»¤ëɬÍפ¢¤ê)
+(define tutcode-heading-label-char-list-for-kigou-mode ())
;;; ¼«Æ°¥Ø¥ë¥×¤Ç¤Îʸ»ú¤ÎÂǤÁÊýɽ¼¨¤ÎºÝ¤Ë¸õÊäʸ»úÎó¤È¤·¤Æ»È¤¦Ê¸»ú¤Î¥ê¥¹¥È
(define tutcode-auto-help-cand-str-list
@@ -334,7 +356,13 @@
(require "tutcode-dialog.scm")
(skk-lib-dic-open tutcode-dic-filename #f "localhost" 0 'unspecified)
(tutcode-read-personal-dictionary)))
- (let ((tc (tutcode-context-new-internal id im)))
+ (let ((tc (tutcode-context-new-internal id im))
+ (candwintbl?
+ (and
+ (symbol-bound? 'uim-candwin-prog)
+ (string? uim-candwin-prog)
+ (>= (string-length uim-candwin-prog) 15)
+ (string=? (substring uim-candwin-prog 0
15) "uim-candwin-tbl"))))
(tutcode-context-set-widgets! tc tutcode-widgets)
(if (null? tutcode-rule)
(begin
@@ -346,6 +374,30 @@
;; ¤Ä¤Þ¤ê¡¢rule¤Îqwerty-to-dvorakÊÑ´¹¸å¤ËÈ¿±Ç¤¹¤ë¡£
(tutcode-custom-set-mazegaki/bushu-start-sequence!)
(tutcode-rule-commit-sequences! tutcode-rule-userconfig)))
+ ;; ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦ÍÑÀßÄê
+ (if (null? tutcode-heading-label-char-list)
+ (if candwintbl?
+ (set! tutcode-heading-label-char-list
+ tutcode-table-heading-label-char-list)
+ (set! tutcode-heading-label-char-list
+ tutcode-uim-heading-label-char-list)))
+ (if (null? tutcode-heading-label-char-list-for-kigou-mode)
+ (if candwintbl?
+ (begin
+ (set! tutcode-heading-label-char-list-for-kigou-mode
+ tutcode-table-heading-label-char-list-for-kigou-mode)
+ ;; µ¹æÆþÎϥ⡼¥É¤òÁ´³Ñ±Ñ¿ô¥â¡¼¥É¤È¤·¤Æ»È¤¦¤¿¤á¡¢
+ ;; tutcode-heading-label-char-list-for-kigou-mode¤òÁ´³Ñ¤Ë¤·¤Æ
+ ;; tutcode-kigoudic¤ÎÀèƬ¤ËÆþ¤ì¤ë
+ (require "japanese.scm") ; for ja-wide
+ (set! tutcode-kigoudic
+ (append
+ (map (lambda (lst) (list (ja-wide lst)))
+ tutcode-heading-label-char-list-for-kigou-mode)
+ (list-tail tutcode-kigoudic
+ (length tutcode-heading-label-char-list-for-kigou-mode)))))
+ (set! tutcode-heading-label-char-list-for-kigou-mode
+ tutcode-uim-heading-label-char-list-for-kigou-mode)))
(tutcode-context-set-rk-context! tc (rk-context-new tutcode-rule #t
#f))
(if tutcode-use-recursive-learning?
(tutcode-context-set-editor! tc (tutcode-editor-new tc)))
