[uim-commit] r282 - trunk/scm
yamaken@freedesktop.org
yamaken@freedesktop.org
Fri Jan 14 03:46:02 PST 2005
Author: yamaken
Date: 2005-01-14 03:45:59 -0800 (Fri, 14 Jan 2005)
New Revision: 282
Modified:
trunk/scm/anthy.scm
trunk/scm/canna.scm
trunk/scm/direct.scm
trunk/scm/generic.scm
trunk/scm/hangul.scm
trunk/scm/im.scm
trunk/scm/ipa.scm
trunk/scm/latin.scm
trunk/scm/m17nlib.scm
trunk/scm/prime.scm
trunk/scm/pyload.scm
trunk/scm/skk.scm
trunk/scm/spellcheck.scm
trunk/scm/tcode.scm
trunk/scm/tutcode.scm
trunk/scm/viqr.scm
Log:
* scm/im.scm
- (record im): Add new member 'label-name'. The name is under
discussion and not final
- (register-im): Add label-name arg
* scm/m17nlib.scm
- (m17nlib-register):
* Add label-name arg to register-im
* Replace 'intern' with string->symbol to conform to R5RS
* scm/generic.scm
- (generic-register-im): Add label-name arg
* scm/hangul.scm
- (hangul-register-im):
* Update copyright
* Add label-name arg
- Add label-name arg to hangul-register-im invocations and apply
cosmetic change
* scm/tcode.scm
* scm/tutcode.scm
* scm/ipa.scm
* scm/prime.scm
* scm/spellcheck.scm
* scm/latin.scm
* scm/direct.scm
* scm/canna.scm
* scm/viqr.scm
* scm/anthy.scm
* scm/skk.scm
* scm/pyload.scm
- Update copyright
- Add label-name arg to register-im invocations
Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/anthy.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,7 +1,7 @@
;;; anthy.scm: Anthy for uim.
;;; charset: EUC-JP
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -983,6 +983,7 @@
'anthy
"ja"
"EUC-JP"
+ (N_ "Anthy")
(N_ "Japanese Kana Kanji Conversion Engine, Anthy")
#f
anthy-init-handler
Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/canna.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,6 +1,6 @@
;;; canna.scm: Canna for uim.
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -823,6 +823,7 @@
'canna
"ja"
"EUC-JP"
+ (N_ "Canna")
(N_ "Japanese Kana Kanji Conversion Engine, Canna")
#f
canna-init-handler
Modified: trunk/scm/direct.scm
===================================================================
--- trunk/scm/direct.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/direct.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -128,6 +128,7 @@
'direct
"*" ;; wildcard language. see i18n.scm
"UTF-8"
+ (N_ "Direct")
(N_ "Direct input method mainly used for latin languages")
#f
direct-init-handler
Modified: trunk/scm/generic.scm
===================================================================
--- trunk/scm/generic.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/generic.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -424,11 +424,12 @@
(init-handler id im #f)))
(define generic-register-im
- (lambda (name lang code short-desc init-arg)
+ (lambda (name lang code label-name short-desc init-arg)
(register-im
name
lang
code
+ label-name
short-desc
init-arg
generic-init-handler
Modified: trunk/scm/hangul.scm
===================================================================
--- trunk/scm/hangul.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/hangul.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -53,11 +53,12 @@
(generic-key-press-handler-with-this-env gc key state))))
(define hangul-register-im
- (lambda (name lang code short-desc init-arg)
+ (lambda (name lang code label-name short-desc init-arg)
(register-im
name
lang
code
+ label-name
short-desc
init-arg
generic-init-handler
@@ -86,11 +87,26 @@
(generic-context-new id im romaja-rule #t)))
(hangul-register-im
- 'hangul2 "ko" "UTF-8" (N_ "2-bul style hangul input method") hangul2-init-handler)
+ 'hangul2
+ "ko"
+ "UTF-8"
+ (N_ "Hangul (2-bul)")
+ (N_ "2-bul style hangul input method")
+ hangul2-init-handler)
;; hangul3 IM does not require generic-keys disabled
(generic-register-im
- 'hangul3 "ko" "UTF-8" (N_ "3-bul style hangul input method") hangul3-init-handler)
+ 'hangul3
+ "ko"
+ "UTF-8"
+ (N_ "Hangul (3-bul)")
+ (N_ "3-bul style hangul input method")
+ hangul3-init-handler)
(hangul-register-im
- 'romaja "ko" "UTF-8" (N_ "Romaja input style hangul input method") romaja-init-handler)
+ 'romaja
+ "ko"
+ "UTF-8"
+ (N_ "Hangul (Romaja)")
+ (N_ "Romaja input style hangul input method")
+ romaja-init-handler)
Modified: trunk/scm/im.scm
===================================================================
--- trunk/scm/im.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/im.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,6 +1,6 @@
;;; im.scm: Core IM management functions for uim
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -63,6 +63,7 @@
(list 'name #f) ;; must be first member
(list 'lang "")
(list 'encoding "")
+ (list 'label-name "") ;; under discussion
(list 'short-desc "")
(list 'init-arg #f)
(list 'init-handler list)
@@ -82,10 +83,11 @@
list)))
(define register-im
- (lambda (name lang encoding short-desc init-arg init release
+ (lambda (name lang encoding label-name short-desc init-arg init release
mode key-press key-release reset
get-candidate set-candidate-index prop)
- (let ((im (im-new name lang encoding short-desc init-arg init release
+ (let ((im (im-new name lang encoding label-name short-desc
+ init-arg init release
mode key-press key-release reset
get-candidate set-candidate-index prop)))
(if (im-register-im name lang encoding short-desc)
Modified: trunk/scm/ipa.scm
===================================================================
--- trunk/scm/ipa.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/ipa.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -100,4 +100,9 @@
(generic-context-new id im ipa-rule #f)))
(generic-register-im
- 'ipa "" "UTF-8" (N_ "International Phonetic Alphabet") ipa-init-handler)
+ 'ipa
+ ""
+ "UTF-8"
+ (N_ "International Phonetic Alphabet")
+ (N_ "International Phonetic Alphabet")
+ ipa-init-handler)
Modified: trunk/scm/latin.scm
===================================================================
--- trunk/scm/latin.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/latin.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -573,4 +573,5 @@
""
"UTF-8"
(N_ "euro")
+ (N_ "euro")
latin-init-handler)
Modified: trunk/scm/m17nlib.scm
===================================================================
--- trunk/scm/m17nlib.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/m17nlib.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -301,9 +301,10 @@
(begin
(if (not (duplicated-im? (m17nlib-lib-nth-input-method-name i)))
(register-im
- (intern (m17nlib-lib-nth-input-method-name i))
+ (string->symbol (m17nlib-lib-nth-input-method-name i))
(m17nlib-lib-nth-input-method-lang i)
"UTF-8"
+ (m17nlib-lib-nth-input-method-name i)
(N_ "An input method provided by the m17n library")
(m17nlib-lib-nth-input-method-name i)
m17nlib-init-handler
Modified: trunk/scm/prime.scm
===================================================================
--- trunk/scm/prime.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/prime.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -1596,6 +1596,7 @@
'prime
"ja"
"EUC-JP"
+ (N_ "PRIME")
(N_ "Japanese predictable input method")
#f
prime-init-handler
Modified: trunk/scm/pyload.scm
===================================================================
--- trunk/scm/pyload.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/pyload.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -36,7 +36,12 @@
(generic-context-new id im py-rule #f)))
(generic-register-im
- 'py "zh_CN" "GB18030" (N_ "PinYin input method") py-init-handler)
+ 'py
+ "zh_CN"
+ "GB18030"
+ (N_ "Pinyin (Simplified)")
+ (N_ "Pinyin input method (Simplified Chinese version)")
+ py-init-handler)
(define pyunihan-init-handler
(lambda (id im arg)
@@ -44,7 +49,12 @@
(generic-context-new id im pyunihan-rule #f)))
(generic-register-im
- 'pyunihan "zh_CN" "UTF-8" (N_ "PinYin input method (Unicode version)") pyunihan-init-handler)
+ 'pyunihan
+ "zh_CN"
+ "UTF-8"
+ (N_ "Pinyin (Unicode)")
+ (N_ "Pinyin input method (Unicode version)")
+ pyunihan-init-handler)
(define pinyin-big5-init-handler
(lambda (id im arg)
@@ -52,4 +62,9 @@
(generic-context-new id im pinyin-big5-rule #f)))
(generic-register-im
- 'pinyin-big5 "zh_TW:zh_HK" "UTF-8" (N_ "PinYin input method (Big5 version)") pinyin-big5-init-handler)
+ 'pinyin-big5
+ "zh_TW:zh_HK"
+ "UTF-8"
+ (N_ "Pinyin (Traditional)")
+ (N_ "Pinyin input method (Traditional Chinese version)")
+ pinyin-big5-init-handler)
Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/skk.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1590,6 +1590,7 @@
'skk
"ja"
"EUC-JP"
+ (N_ "SKK")
(N_ "Uim's SKK like input method")
#f
skk-init-handler
Modified: trunk/scm/spellcheck.scm
===================================================================
--- trunk/scm/spellcheck.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/spellcheck.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -556,6 +556,7 @@
"ja"
"EUC-JP"
(N_ "Spellcheck")
+ (N_ "Spellcheck")
#f
spell-init-handler
#f
Modified: trunk/scm/tcode.scm
===================================================================
--- trunk/scm/tcode.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/tcode.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -1723,4 +1723,5 @@
"ja"
"EUC-JP"
(N_ "T-Code")
+ (N_ "T-Code")
tcode-init-handler)
Modified: trunk/scm/tutcode.scm
===================================================================
--- trunk/scm/tutcode.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/tutcode.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -272,6 +272,7 @@
"ja"
"EUC-JP"
(N_ "TUT-Code")
+ (N_ "TUT-Code")
#f
tutcode-init-handler
#f
Modified: trunk/scm/viqr.scm
===================================================================
--- trunk/scm/viqr.scm 2005-01-14 10:21:56 UTC (rev 281)
+++ trunk/scm/viqr.scm 2005-01-14 11:45:59 UTC (rev 282)
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -198,4 +198,9 @@
(generic-context-new id im viqr-rule #f)))
(generic-register-im
- 'viqr "vi" "UTF-8" (N_ "VIetnamese Quoted-Readable") viqr-init-handler)
+ 'viqr
+ "vi"
+ "UTF-8"
+ (N_ "VIQR")
+ (N_ "VIetnamese Quoted-Readable")
+ viqr-init-handler)
More information about the Uim-commit
mailing list