Author: ek.kato
Date: Thu Sep 27 17:36:37 2007
New Revision: 5019
Modified:
trunk/scm/canna.scm
trunk/scm/mana.scm
Log:
* scm/canna.scm (canna-proc-transposing-state)
- Same checks as in r5018.
* scm/mana.scm (mana-proc-transposing-state)
- Ditto.
Modified: trunk/scm/canna.scm
==============================================================================
--- trunk/scm/canna.scm (original)
+++ trunk/scm/canna.scm Thu Sep 27 17:36:37 2007
@@ -656,16 +656,18 @@
(set! state (car rotate-list))))
(cond
- ((or
- (= state canna-type-hiragana)
- (= state canna-type-katakana)
- (= state canna-type-halfkana))
+ ((and state
+ (or
+ (= state canna-type-hiragana)
+ (= state canna-type-katakana)
+ (= state canna-type-halfkana)))
(canna-context-set-transposing-type! cc state))
- ((or
- (= state canna-type-halfwidth-alnum)
- (= state canna-candidate-type-upper-halfwidth-alnum)
- (= state canna-type-fullwidth-alnum)
- (= state canna-candidate-type-upper-fullwidth-alnum))
+ ((and state
+ (or
+ (= state canna-type-halfwidth-alnum)
+ (= state canna-candidate-type-upper-halfwidth-alnum)
+ (= state canna-type-fullwidth-alnum)
+ (= state canna-candidate-type-upper-fullwidth-alnum)))
(if (not (= (canna-context-input-rule cc) canna-input-rule-kana))
(canna-context-set-transposing-type! cc state)))
(else
Modified: trunk/scm/mana.scm
==============================================================================
--- trunk/scm/mana.scm (original)
+++ trunk/scm/mana.scm Thu Sep 27 17:36:37 2007
@@ -930,16 +930,18 @@
(set! state (car rotate-list))))
(cond
- ((or
- (= state mana-type-hiragana)
- (= state mana-type-katakana)
- (= state mana-type-halfkana))
+ ((and state
+ (or
+ (= state mana-type-hiragana)
+ (= state mana-type-katakana)
+ (= state mana-type-halfkana)))
(mana-context-set-transposing-type! mc state))
- ((or
- (= state mana-type-halfwidth-alnum)
- (= state mana-candidate-type-upper-halfwidth-alnum)
- (= state mana-type-fullwidth-alnum)
- (= state mana-candidate-type-upper-fullwidth-alnum))
+ ((and state
+ (or
+ (= state mana-type-halfwidth-alnum)
+ (= state mana-candidate-type-upper-halfwidth-alnum)
+ (= state mana-type-fullwidth-alnum)
+ (= state mana-candidate-type-upper-fullwidth-alnum)))
(if (not (= (mana-context-input-rule mc)
mana-input-rule-kana))
(mana-context-set-transposing-type! mc state)))
