Author: jhyeon
Date: Thu Sep 27 09:32:50 2007
New Revision: 5018
Modified:
trunk/scm/anthy-utf8.scm
trunk/scm/anthy.scm
Log:
* scm/anthy.scm
- (anthy-proc-transposing-state): state can be #f;
check the value of state before comparing it with an integer using =
* scm/anthy-utf8.scm
- (anthy-utf8-proc-transposing-state): ditto
Modified: trunk/scm/anthy-utf8.scm
==============================================================================
--- trunk/scm/anthy-utf8.scm (original)
+++ trunk/scm/anthy-utf8.scm Thu Sep 27 09:32:50 2007
@@ -776,16 +776,18 @@
(set! state (car rotate-list))))
(cond
- ((or
- (= state anthy-type-hiragana)
- (= state anthy-type-katakana)
- (= state anthy-type-halfkana))
+ ((and state
+ (or
+ (= state anthy-type-hiragana)
+ (= state anthy-type-katakana)
+ (= state anthy-type-halfkana)))
(anthy-utf8-context-set-transposing-type! ac state))
- ((or
- (= state anthy-type-halfwidth-alnum)
- (= state anthy-candidate-type-upper-halfwidth-alnum)
- (= state anthy-type-fullwidth-alnum)
- (= state anthy-candidate-type-upper-fullwidth-alnum))
+ ((and state
+ (or
+ (= state anthy-type-halfwidth-alnum)
+ (= state anthy-candidate-type-upper-halfwidth-alnum)
+ (= state anthy-type-fullwidth-alnum)
+ (= state anthy-candidate-type-upper-fullwidth-alnum)))
(if (not (= (anthy-utf8-context-input-rule ac) anthy-input-rule-kana))
(anthy-utf8-context-set-transposing-type! ac state)))
(else
Modified: trunk/scm/anthy.scm
==============================================================================
--- trunk/scm/anthy.scm (original)
+++ trunk/scm/anthy.scm Thu Sep 27 09:32:50 2007
@@ -771,16 +771,18 @@
(set! state (car rotate-list))))
(cond
- ((or
- (= state anthy-type-hiragana)
- (= state anthy-type-katakana)
- (= state anthy-type-halfkana))
+ ((and state
+ (or
+ (= state anthy-type-hiragana)
+ (= state anthy-type-katakana)
+ (= state anthy-type-halfkana)))
(anthy-context-set-transposing-type! ac state))
- ((or
- (= state anthy-type-halfwidth-alnum)
- (= state anthy-candidate-type-upper-halfwidth-alnum)
- (= state anthy-type-fullwidth-alnum)
- (= state anthy-candidate-type-upper-fullwidth-alnum))
+ ((and state
+ (or
+ (= state anthy-type-halfwidth-alnum)
+ (= state anthy-candidate-type-upper-halfwidth-alnum)
+ (= state anthy-type-fullwidth-alnum)
+ (= state anthy-candidate-type-upper-fullwidth-alnum)))
(if (not (= (anthy-context-input-rule ac) anthy-input-rule-kana))
(anthy-context-set-transposing-type! ac state)))
(else
