[uim-commit] r735 - branches/composer/scm
yamaken at freedesktop.org
yamaken at freedesktop.org
Mon Feb 28 12:51:49 PST 2005
Author: yamaken
Date: 2005-02-28 12:51:46 -0800 (Mon, 28 Feb 2005)
New Revision: 735
Modified:
branches/composer/scm/japanese-nicola.scm
branches/composer/scm/ng-japanese-azik.scm
branches/composer/scm/ng-japanese-kana.scm
branches/composer/scm/ng-japanese-romaji.scm
branches/composer/scm/ng-japanese.scm
Log:
* scm/ng-japanese.scm
- (ja-direct-ruleset, ja-direct-ruletree,
ja-halfwidth-alphanumeric-ruletree,
ja-fullwidth-alphanumeric-ruletree): New variable
* scm/ng-japanese-romaji.scm
- (ja-romaji-generate-double-consonant-ruleset): Fix invalid
listification of raw string in action-seq
- (ja-romaji-hiragana-ruletree, ja-romaji-katakana-ruletree,
ja-romaji-halfkana-ruletree): New variable
* scm/ng-japanese-kana.scm
- (ja-kana-core-ruleset): Fix typo of modifier symbol
- (ja-kana-hiragana-ruletree, ja-kana-katakana-ruletree,
ja-kana-halfkana-ruletree): New variable
* scm/japanese-nicola.scm
- (ja-nicola-hiragana-ruletree, ja-nicola-katakana-ruletree,
ja-nicola-halfkana-ruletree): New variable
* scm/ng-japanese-azik.scm
- (ja-azik-hiragana-ruletree, ja-azik-katakana-ruletree,
ja-azik-halfkana-ruletree): New variable
Modified: branches/composer/scm/japanese-nicola.scm
===================================================================
--- branches/composer/scm/japanese-nicola.scm 2005-02-28 17:14:21 UTC (rev 734)
+++ branches/composer/scm/japanese-nicola.scm 2005-02-28 20:51:46 UTC (rev 735)
@@ -267,3 +267,12 @@
ja-nicola-halfkana-core-ruleset
ja-nicola-halfkana-postfixed-voiced-consonant-ruleset
ja-nicola-jp106-pseudo-thumb-shift-ruleset))
+
+(define ja-nicola-hiragana-ruletree
+ (evmap-parse-ruleset ja-nicola-hiragana-ruleset))
+
+(define ja-nicola-katakana-ruletree
+ (evmap-parse-ruleset ja-nicola-katakana-ruleset))
+
+(define ja-nicola-halfkana-ruletree
+ (evmap-parse-ruleset ja-nicola-halfkana-ruleset))
Modified: branches/composer/scm/ng-japanese-azik.scm
===================================================================
--- branches/composer/scm/ng-japanese-azik.scm 2005-02-28 17:14:21 UTC (rev 734)
+++ branches/composer/scm/ng-japanese-azik.scm 2005-02-28 20:51:46 UTC (rev 735)
@@ -608,3 +608,12 @@
;;ja-romaji-halfkana-skk-like-symbol-ruleset
ja-azik-halfkana-core-ruleset
))
+
+(define ja-azik-hiragana-ruletree
+ (evmap-parse-ruleset ja-azik-hiragana-ruleset))
+
+(define ja-azik-katakana-ruletree
+ (evmap-parse-ruleset ja-azik-katakana-ruleset))
+
+(define ja-azik-halfkana-ruletree
+ (evmap-parse-ruleset ja-azik-halfkana-ruleset))
Modified: branches/composer/scm/ng-japanese-kana.scm
===================================================================
--- branches/composer/scm/ng-japanese-kana.scm 2005-02-28 17:14:21 UTC (rev 734)
+++ branches/composer/scm/ng-japanese-kana.scm 2005-02-28 20:51:46 UTC (rev 735)
@@ -203,7 +203,7 @@
((pkey_jp106_backslash) ("¤í" "¥í" "ŽÛ")) ;; be careful
((pkey_jp106_0) ("¤ï" "¥ï" "ŽÜ"))
- ((pkey_jp106_0 mod_shift) ("¤ò" "¥ò" "Ž¦"))
+ ((pkey_jp106_0 mod_Shift) ("¤ò" "¥ò" "Ž¦"))
((pkey_jp106_y) ("¤ó" "¥ó" "ŽÝ"))
((pkey_jp106_4 pkey_jp106_at) (("¤¦" "¡«") "¥ô" ("Ž³" "ŽÞ")))
@@ -238,26 +238,26 @@
((pkey_jp106_asciicircum pkey_jp106_bracketleft) ("¤Ú" "¥Ú" ("ŽÍ" "Žß")))
((pkey_jp106_minus pkey_jp106_bracketleft) ("¤Ý" "¥Ý" ("ŽÎ" "Žß")))
- ((pkey_jp106_3 mod_shift) ("¤¡" "¥¡" "Ž§"))
- ((pkey_jp106_e mod_shift) ("¤£" "¥£" "Ž¨"))
- ((pkey_jp106_4 mod_shift) ("¤¥" "¥¥" "Ž©"))
- ((pkey_jp106_5 mod_shift) ("¤§" "¥§" "Žª"))
- ((pkey_jp106_6 mod_shift) ("¤©" "¥©" "Ž«"))
+ ((pkey_jp106_3 mod_Shift) ("¤¡" "¥¡" "Ž§"))
+ ((pkey_jp106_e mod_Shift) ("¤£" "¥£" "Ž¨"))
+ ((pkey_jp106_4 mod_Shift) ("¤¥" "¥¥" "Ž©"))
+ ((pkey_jp106_5 mod_Shift) ("¤§" "¥§" "Žª"))
+ ((pkey_jp106_6 mod_Shift) ("¤©" "¥©" "Ž«"))
- ((pkey_jp106_7 mod_shift) ("¤ã" "¥ã" "Ž¬"))
- ((pkey_jp106_8 mod_shift) ("¤å" "¥å" "Ž"))
- ((pkey_jp106_9 mod_shift) ("¤ç" "¥ç" "Ž®"))
+ ((pkey_jp106_7 mod_Shift) ("¤ã" "¥ã" "Ž¬"))
+ ((pkey_jp106_8 mod_Shift) ("¤å" "¥å" "Ž"))
+ ((pkey_jp106_9 mod_Shift) ("¤ç" "¥ç" "Ž®"))
- ((pkey_jp106_z mod_shift) ("¤Ã" "¥Ã" "Ž¯"))
+ ((pkey_jp106_z mod_Shift) ("¤Ã" "¥Ã" "Ž¯"))
((pkey_jp106_at) ("¡«" "¡«" "ŽÞ"))
((pkey_jp106_bracketleft) ("¡¬" "¡¬" "Žß"))
((pkey_jp106_yen) ("¡¼" "¡¼" "Ž°")) ;; be careful
- ((pkey_jp106_period mod_shift) ("¡£" "¡£" "Ž¡"))
- ((pkey_jp106_comma mod_shift) ("¡¢" "¡¢" "Ž¤"))
- ((pkey_jp106_slash mod_shift) ("¡¦" "¡¦" "Ž¥"))
- ((pkey_jp106_bracketleft mod_shift) ("¡Ö" "¡Ö" "Ž¢"))
- ((pkey_jp106_bracketright mod_shift) ("¡×" "¡×" "Ž£")) ;; be careful
+ ((pkey_jp106_period mod_Shift) ("¡£" "¡£" "Ž¡"))
+ ((pkey_jp106_comma mod_Shift) ("¡¢" "¡¢" "Ž¤"))
+ ((pkey_jp106_slash mod_Shift) ("¡¦" "¡¦" "Ž¥"))
+ ((pkey_jp106_bracketleft mod_Shift) ("¡Ö" "¡Ö" "Ž¢"))
+ ((pkey_jp106_bracketright mod_Shift) ("¡×" "¡×" "Ž£")) ;; be careful
))
(define ja-kana-ruleset-name-list
@@ -269,3 +269,12 @@
(define ja-kana-hiragana-ruleset ja-kana-hiragana-core-ruleset)
(define ja-kana-katakana-ruleset ja-kana-katakana-core-ruleset)
(define ja-kana-halfkana-ruleset ja-kana-halfkana-core-ruleset)
+
+(define ja-kana-hiragana-ruletree
+ (evmap-parse-ruleset ja-kana-hiragana-ruleset))
+
+(define ja-kana-katakana-ruletree
+ (evmap-parse-ruleset ja-kana-katakana-ruleset))
+
+(define ja-kana-halfkana-ruletree
+ (evmap-parse-ruleset ja-kana-halfkana-ruleset))
Modified: branches/composer/scm/ng-japanese-romaji.scm
===================================================================
--- branches/composer/scm/ng-japanese-romaji.scm 2005-02-28 17:14:21 UTC (rev 734)
+++ branches/composer/scm/ng-japanese-romaji.scm 2005-02-28 20:51:46 UTC (rev 735)
@@ -62,9 +62,11 @@
(filter-map (lambda (rule)
(let* ((seq (evmap-rule-event-seq rule))
(res (evmap-rule-action-seq rule))
- (listified (if (list? (car res))
- res
- (map list res))))
+ (listified (map (lambda (elem)
+ (if (list? elem)
+ elem
+ (list elem)))
+ res)))
(and (string=? letter
(car seq))
(list (cons letter seq)
@@ -673,3 +675,11 @@
ja-romaji-halfkana-hepburn-irregular-double-consonant-ruleset
ja-romaji-halfkana-skk-like-symbol-ruleset))
+(define ja-romaji-hiragana-ruletree
+ (evmap-parse-ruleset ja-romaji-hiragana-ruleset))
+
+(define ja-romaji-katakana-ruletree
+ (evmap-parse-ruleset ja-romaji-katakana-ruleset))
+
+(define ja-romaji-halfkana-ruletree
+ (evmap-parse-ruleset ja-romaji-halfkana-ruleset))
Modified: branches/composer/scm/ng-japanese.scm
===================================================================
--- branches/composer/scm/ng-japanese.scm 2005-02-28 17:14:21 UTC (rev 734)
+++ branches/composer/scm/ng-japanese.scm 2005-02-28 20:51:46 UTC (rev 735)
@@ -429,6 +429,8 @@
(("Y") ("£Ù"))
(("Z") ("£Ú"))))
+(define ja-direct-ruleset '())
+
;; This ruleset will not be used in ordinary input method. Direct
;; input mode passes through almost of key events instead of using
;; this ruleset.
@@ -451,3 +453,12 @@
ja-fullwidth-basic-symbol-ruleset
ja-fullwidth-number-ruleset
ja-fullwidth-alphabet-ruleset))
+
+(define ja-direct-ruletree
+ (evmap-parse-ruleset ja-direct-ruleset))
+
+(define ja-halfwidth-alphanumeric-ruletree
+ (evmap-parse-ruleset ja-halfwidth-alphanumeric-ruleset))
+
+(define ja-fullwidth-alphanumeric-ruletree
+ (evmap-parse-ruleset ja-fullwidth-alphanumeric-ruleset))
More information about the Uim-commit
mailing list