Author: deton.kih
Date: Thu Jun 14 05:25:33 2007
New Revision: 4590
Modified:
trunk/scm/tutcode.scm
Log:
* scm/tutcode.scm
- (tutcode-proc-state-yomi): Fix to be able to begin conversion
by customized tutcode-begin-conv-key with <Control>.
Modified: trunk/scm/tutcode.scm
==============================================================================
--- trunk/scm/tutcode.scm (original)
+++ trunk/scm/tutcode.scm Thu Jun 14 05:25:33 2007
@@ -435,16 +435,28 @@
(tutcode-flush pc))
((tutcode-cancel-key? key key-state)
(tutcode-flush pc))
- ((or
- (symbol? key)
- (and
- (modifier-key-mask key-state)
- (not (shift-key-mask key-state))))
+ ((symbol? key)
(tutcode-flush pc)
(tutcode-proc-state-on pc key key-state))
+ ((and
+ (modifier-key-mask key-state)
+ (not (shift-key-mask key-state)))
+ ;; <Control>n���Ǥ��Ѵ�����?
+ (if (tutcode-begin-conv-key? key key-state)
+ (if (not (null? (tutcode-context-head pc)))
+ (tutcode-begin-conversion pc)
+ (tutcode-flush pc))
+ (begin
+ (tutcode-flush pc)
+ (tutcode-proc-state-on pc key key-state))))
((not (member (charcode->string key) (rk-expect rkc)))
(if (> (length (rk-context-seq rkc)) 0)
(rk-flush rkc)
+ ;; space�����Ǥ��Ѵ�����?
+ ;; (space�ϥ����������˴ޤޤ������礬�����Τǡ�
+ ;; rk-expect��space��̵�����Ȥ�����)
+ ;; (trycode��space�ǻϤޤ륭�����������ȤäƤ������硢
+ ;; space���Ѵ����ϤϤǤ��ʤ��Τǡ�<Control>n�����Ȥ�ɬ�פ���)
(if (tutcode-begin-conv-key? key key-state)
(if (not (null? (tutcode-context-head pc)))
(tutcode-begin-conversion pc)
