Revision: 6570
Author: ek.kato
Date: Fri Jul 23 00:59:01 2010
Log: * scm/skk.scm
- (skk-proc-state-direct)
- (skk-proc-state-kanji)
- Remove n1 hack because rk.scm has been fixed in r6564.
* scm/anthy-utf8.scm (anthy-utf8-proc-input-state-with-preedit)
- Ditto.
* scm/wnn.scm
* scm/social-ime.scm
* scm/canna.scm
* scm/ajax-ime.scm
* scm/anthy.scm
* scm/yahoo-jp.scm
* scm/mana.scm
* scm/sj3.scm
- Port the change from anthy-utf8.scm.
http://code.google.com/p/uim/source/detail?r=6570
Modified:
/trunk/scm/ajax-ime.scm
/trunk/scm/anthy-utf8.scm
/trunk/scm/anthy.scm
/trunk/scm/canna.scm
/trunk/scm/mana.scm
/trunk/scm/sj3.scm
/trunk/scm/skk.scm
/trunk/scm/social-ime.scm
/trunk/scm/wnn.scm
/trunk/scm/yahoo-jp.scm
=======================================
--- /trunk/scm/ajax-ime.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/ajax-ime.scm Fri Jul 23 00:59:01 2010
@@ -1282,27 +1282,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (ajax-ime-context-alnum ac))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule ajax-ime-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (ajax-ime-context-alnum ac)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/anthy-utf8.scm Thu Jul 22 22:19:37 2010
+++ /trunk/scm/anthy-utf8.scm Fri Jul 23 00:59:01 2010
@@ -1273,30 +1273,6 @@
#f)
(else
- ;; handle "n1" sequence as "ん1"
- (if (and (not (anthy-utf8-context-alnum ac))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (if (= rule anthy-input-rule-kana)
- (if (symbol? key)
- (symbol->string key)
- (charcode->string key))
- (if (symbol? key)
- (symbol->string key)
- (charcode->string (ichar-downcase key)))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-seq! raw-str (reverse
- (string-to-list
pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (anthy-utf8-context-alnum ac)
(let ((key-str (if (symbol? key)
(if (symbol-bound? key)
=======================================
--- /trunk/scm/anthy.scm Thu Jul 22 23:32:15 2010
+++ /trunk/scm/anthy.scm Fri Jul 23 00:59:01 2010
@@ -1265,30 +1265,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (anthy-context-alnum ac))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (if (= rule anthy-input-rule-kana)
- (if (symbol? key)
- (symbol->string key)
- (charcode->string key))
- (if (symbol? key)
- (symbol->string key)
- (charcode->string (ichar-downcase key)))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-seq! raw-str (reverse
- (string-to-list
pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (anthy-context-alnum ac)
(let ((key-str (if (symbol? key)
(if (symbol-bound? key)
=======================================
--- /trunk/scm/canna.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/canna.scm Fri Jul 23 00:59:01 2010
@@ -1149,27 +1149,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (canna-context-alnum cc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule canna-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (canna-context-alnum cc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/mana.scm Thu Jul 22 23:32:15 2010
+++ /trunk/scm/mana.scm Fri Jul 23 00:59:01 2010
@@ -1210,27 +1210,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (mana-context-alnum mc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule mana-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list
pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (mana-context-alnum mc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/sj3.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/sj3.scm Fri Jul 23 00:59:01 2010
@@ -1430,27 +1430,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (sj3-context-alnum sc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule sj3-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (sj3-context-alnum sc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/skk.scm Wed Jul 21 01:35:01 2010
+++ /trunk/scm/skk.scm Fri Jul 23 00:59:01 2010
@@ -1199,15 +1199,6 @@
(set! key (skk-ichar-downcase key))
#t))
#t)
- ;; Hack to handle "n1" sequence as "¤ó1".
- ;; This should be handled in rk.scm. -- ekato
- (if (and (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc key-str)))
- (let* ((residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (skk-commit sc (skk-get-string sc residual-kana kana)))
- #t)
- #t)
;; bad strategy. see bug #528
(if (symbol? key)
(begin
@@ -1553,24 +1544,6 @@
(skk-flush sc)))
#f)
#t)
- ;; Hack to handle "n1" sequence as "¤ó1".
- ;; This should be handled in rk.scm. -- ekato
- (if (and (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string (skk-ichar-downcase key)))))
- (let* ((residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (if (list? (car residual-kana))
- (skk-context-set-head! sc (append (reverse
- residual-kana)
- (skk-context-head
- sc)))
- (skk-context-set-head! sc
- (cons
- residual-kana
- (skk-context-head sc)))))
- #t)
- #t)
(begin
(set! key (skk-ichar-downcase key))
(set! stat (skk-context-state sc))
=======================================
--- /trunk/scm/social-ime.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/social-ime.scm Fri Jul 23 00:59:01 2010
@@ -1345,27 +1345,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (social-ime-context-alnum sc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule social-ime-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (social-ime-context-alnum sc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/wnn.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/wnn.scm Fri Jul 23 00:59:01 2010
@@ -1203,27 +1203,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (wnn-context-alnum wc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule wnn-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (wnn-context-alnum wc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
=======================================
--- /trunk/scm/yahoo-jp.scm Fri Jul 23 00:35:10 2010
+++ /trunk/scm/yahoo-jp.scm Fri Jul 23 00:59:01 2010
@@ -1361,27 +1361,6 @@
#f)
(else
- ;; handle "n1" sequence as "¤ó1"
- (if (and (not (yahoo-jp-context-alnum yc))
- (not (ichar-alphabetic? key))
- (not (rk-expect-key? rkc
- (charcode->string
- (if (= rule yahoo-jp-input-rule-kana)
- key
- (ichar-downcase key))))))
- (let ((pend (rk-pending rkc))
- (residual-kana (rk-push-key-last! rkc)))
- (if residual-kana
- (begin
- (if (list? (car residual-kana))
- (begin
- (ustr-insert-seq! preconv-str residual-kana)
- (ustr-insert-elem! raw-str (reverse
- (string-to-list pend))))
- (begin
- (ustr-insert-elem! preconv-str residual-kana)
- (ustr-insert-elem! raw-str pend)))))))
-
(if (yahoo-jp-context-alnum yc)
(let ((key-str (charcode->string key))
(pend (rk-pending rkc))
