[uim-commit] r3112 - in trunk: pixmaps scm

yamaken at freedesktop.org yamaken at freedesktop.org
Fri Feb 17 10:43:43 PST 2006


Author: yamaken
Date: 2006-02-17 10:43:27 -0800 (Fri, 17 Feb 2006)
New Revision: 3112

Added:
   trunk/pixmaps/indication-id.txt
Modified:
   trunk/pixmaps/Makefile.am
   trunk/scm/action.scm
   trunk/scm/anthy-custom.scm
   trunk/scm/anthy.scm
   trunk/scm/byeoru.scm
   trunk/scm/canna-custom.scm
   trunk/scm/canna.scm
   trunk/scm/direct.scm
   trunk/scm/generic.scm
   trunk/scm/m17nlib.scm
   trunk/scm/mana-custom.scm
   trunk/scm/mana.scm
   trunk/scm/prime-custom.scm
   trunk/scm/prime.scm
   trunk/scm/scim.scm
   trunk/scm/skk-custom.scm
   trunk/scm/skk.scm
   trunk/scm/tutcode.scm
Log:
* scm/action.scm
* scm/skk-custom.scm
* scm/byeoru.scm
* scm/m17nlib.scm
* scm/prime.scm
* scm/generic.scm
* scm/mana-custom.scm
* scm/anthy-custom.scm
* scm/direct.scm
* scm/anthy.scm
* scm/canna-custom.scm
* scm/skk.scm
* scm/tutcode.scm
* scm/mana.scm
* scm/prime-custom.scm
* scm/canna.scm
* scm/scim.scm
  - Rename all indication-id in action definitions appropriately
* pixmaps/Makefile.am
  - (EXTRA_DIST): Add indication-id.txt
* pixmaps/indication-id.txt
  - New file
  - List indication-ids


Modified: trunk/pixmaps/Makefile.am
===================================================================
--- trunk/pixmaps/Makefile.am	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/pixmaps/Makefile.am	2006-02-17 18:43:27 UTC (rev 3112)
@@ -1,3 +1,3 @@
-EXTRA_DIST = $(pixmaps_DATA)
+EXTRA_DIST = $(pixmaps_DATA) indication-id.txt
 pixmapsdir =  $(datadir)/uim/pixmaps
 pixmaps_DATA = switcher-icon.png configure-qt.png uim-icon.png

Added: trunk/pixmaps/indication-id.txt
===================================================================
--- trunk/pixmaps/indication-id.txt	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/pixmaps/indication-id.txt	2006-02-17 18:43:27 UTC (rev 3112)
@@ -0,0 +1,99 @@
+List of indication-id appeared in current and future uim
+distribution. Make icons for them.
+
+* uim
+  im_switcher
+  preference
+  dictionary_tool
+  input_pad
+  handwriting_pad
+  help
+  unknown
+
+* input modes
+  direct_input
+  off
+  on
+  ja_direct
+  ja_hiragana
+  ja_katakana
+  ja_halfwidth_katakana
+  ja_halfwidth_alnum
+  ja_fullwidth_alnum
+  ja_romaji
+  ja_kana
+  ja_azik
+  ja_nicola
+  ja_phone
+  ja_pocketbell
+  ko_direct
+  ko_hangulchar
+  ko_hangulword
+  prime_mode_application
+
+* input methods
+  py
+  pyunihan
+  pinyin-big5
+  anthy
+  canna
+  mana
+  prime
+  skk
+  tcode
+  tutcode
+  byeoru
+  hangul2
+  hangul3
+  romaja
+  scim
+  viqr
+  ipa-x-sampa
+  latin
+
+* input methods (m17n library)
+  m17n-am-sera
+  m17n-as-itrans
+  m17n-bn-itrans
+  m17n-bo-wylie
+  m17n-dv-phonetic
+  m17n-el-kbd
+  m17n-en-ispell
+  m17n-ar-kbd
+  m17n-fa-isiri
+  m17n-gu-itrans
+  m17n-he-kbd
+  m17n-hi-itrans
+  m17n-hr-kbd
+  m17n-hy-kbd
+  m17n-ja-anthy
+  m17n-ja-tcode
+  m17n-ka-kdb
+  m17n-kk-arabic
+  m17n-kk-kbd
+  m17n-km-yannis
+  m17n-kn-itrans
+  m17n-ko-hangul2
+  m17n-ko-romaja
+  m17n-lo-lrt
+  m17n-ml-itrans
+  m17n-my-kdb
+  m17n-or-itrans
+  m17n-pa-itrans
+  m17n-ru-yawerty
+  m17n-si-samanala
+  m17n-sk-kbd
+  m17n-sr-kbd
+  m17n-ta-itrans
+  m17n-te-itrans
+  m17n-th-kesmanee
+  m17n-vi-telex
+  m17n-vi-viqr
+  m17n-zh-py
+  m17n-zh-pinyin
+  m17n-latn-post
+  m17n-latn-pre
+  m17n-syrc-phonetic
+  m17n-bopo-kbd
+  m17n-unicode
+  m17n-rfc1345

Modified: trunk/scm/action.scm
===================================================================
--- trunk/scm/action.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/action.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -499,7 +499,7 @@
 ;;
 
 (define fallback-indication
-  (list 'figure_unknown
+  (list 'unknown
 	"?"
 	(N_ "unknown")
 	(N_ "unknown")))
@@ -512,10 +512,10 @@
 
 ;; should be replaced with real separator by helper tool implementations
 (register-action 'action_separator
-		 (list 'figure_separator ;; dummy indication
+		 (list 'separator ;; dummy indication
 		       "--"
 		       "--------"
-		       "should be replaced with real separator")
+		       "")
 		 #f  ;; has no activity
 		 #f) ;; has no handler
 
@@ -538,13 +538,13 @@
 ;;; internal definitions
 
 (define example-im-name-indication
-  (list 'figure_im_name_example
+  (list 'im_name_example
 	"example"
 	"example (ja)"
 	(N_ "Japanese Kana Kanji Conversion Engine, Example")))
 
 (define example-exec-im-switcher-indication
-  (list 'figure_im_switcher
+  (list 'im_switcher
 	"sw"
 	(N_ "exec im-switcher")
 	(N_ "exec im-switcher")))

Modified: trunk/scm/anthy-custom.scm
===================================================================
--- trunk/scm/anthy-custom.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/anthy-custom.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -114,27 +114,27 @@
 (define anthy-input-mode-indication-alist
   (list
    (list 'action_anthy_direct
-	 'figure_ja_direct
+	 'ja_direct
 	 "a"
 	 (N_ "Direct input")
 	 (N_ "Direct input mode"))
    (list 'action_anthy_hiragana
-	 'figure_ja_hiragana
+	 'ja_hiragana
 	 "¤¢"
 	 (N_ "Hiragana")
 	 (N_ "Hiragana input mode"))
    (list 'action_anthy_katakana
-	 'figure_ja_katakana
+	 'ja_katakana
 	 "¥¢"
 	 (N_ "Katakana")
 	 (N_ "Katakana input mode"))
    (list 'action_anthy_hankana
-	 'figure_ja_hankana
+	 'ja_halfwidth_katakana
 	 "Ž±"
 	 (N_ "Halfwidth Katakana")
 	 (N_ "Halfwidth Katakana input mode"))
    (list 'action_anthy_zenkaku
-	 'figure_ja_zenkaku
+	 'ja_fullwidth_alnum
 	 "£Á"
 	 (N_ "Fullwidth Alphanumeric")
 	 (N_ "Fullwidth Alphanumeric input mode"))))
@@ -142,17 +142,17 @@
 (define anthy-kana-input-method-indication-alist
   (list
    (list 'action_anthy_roma
-	 'figure_ja_roma
+	 'ja_romaji
 	 "£Ò"
 	 (N_ "Romaji")
 	 (N_ "Romaji input mode"))
    (list 'action_anthy_kana
-	 'figure_ja_kana
+	 'ja_kana
 	 "¤«"
 	 (N_ "Kana")
 	 (N_ "Kana input mode"))
    (list 'action_anthy_azik
-	 'figure_ja_azik
+	 'ja_azik
 	 "£Á"
 	 (N_ "AZIK")
 	 (N_ "AZIK extended romaji input mode"))))

Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/anthy.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -63,7 +63,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_hiragana
 ;;					     anthy-input-mode-indication-alist)
 		 (lambda (ac) ;; indication handler
-		   '(figure_ja_hiragana
+		   '(ja_hiragana
 		     "¤¢"
 		     "¤Ò¤é¤¬¤Ê"
 		     "¤Ò¤é¤¬¤ÊÆþÎϥ⡼¥É"))
@@ -82,7 +82,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_katakana
 ;;					     anthy-input-mode-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_katakana
+		   '(ja_katakana
 		     "¥¢"
 		     "¥«¥¿¥«¥Ê"
 		     "¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -99,7 +99,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_hankana
 ;;					     anthy-input-mode-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_hankana
+		   '(ja_halfwidth_katakana
 		     "Ž±"
 		     "Ⱦ³Ñ¥«¥¿¥«¥Ê"
 		     "Ⱦ³Ñ¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -116,7 +116,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_direct
 ;;					     anthy-input-mode-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_direct
+		   '(ja_direct
 		     "a"
 		     "ľÀÜÆþÎÏ"
 		     "ľÀÜ(̵ÊÑ´¹)ÆþÎϥ⡼¥É"))
@@ -132,7 +132,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_zenkaku
 ;;					     anthy-input-mode-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_zenkaku
+		   '(ja_fullwidth_alnum
 		     "£Á"
 		     "Á´³Ñ±Ñ¿ô"
 		     "Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É"))
@@ -148,7 +148,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_roma
 ;;					     anthy-kana-input-method-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_roma
+		   '(ja_romaji
 		     "£Ò"
 		     "¥í¡¼¥Þ»ú"
 		     "¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))
@@ -165,7 +165,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_kana
 ;;					     anthy-kana-input-method-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_kana
+		   '(ja_kana
 		     "¤«"
 		     "¤«¤Ê"
 		     "¤«¤ÊÆþÎϥ⡼¥É"))
@@ -185,7 +185,7 @@
 ;;		 (indication-alist-indicator 'action_anthy_azik
 ;;					     anthy-kana-input-method-indication-alist)
 		 (lambda (ac)
-		   '(figure_ja_azik
+		   '(ja_azik
 		     "£Á"
 		     "AZIK"
 		     "AZIK³ÈÄ¥¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))

Modified: trunk/scm/byeoru.scm
===================================================================
--- trunk/scm/byeoru.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/byeoru.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -1198,7 +1198,7 @@
 
 (register-action 'action_byeoru_direct
 		 (lambda (bc)
-		   '(figure_ko_direct
+		   '(ko_direct
 		     "A"
 		     ;; Change this to a more reasonable name.
 		     "영문"
@@ -1211,7 +1211,7 @@
 
 (register-action 'action_byeoru_hangulchar
 		 (lambda (bc)
-		   '(figure_ko_hangulchar
+		   '(ko_hangulchar
 		     "ê°€"
 		     "한글 글자"
 		     "한글 글자단위 입력모드"))
@@ -1225,7 +1225,7 @@
 
 (register-action 'action_byeoru_hangulword
 		 (lambda (bc)
-		   '(figure_ko_hangulword
+		   '(ko_hangulword
 		     "말"
 		     "한글 낱말"
 		     "한글 단어단위 입력모드"))

Modified: trunk/scm/canna-custom.scm
===================================================================
--- trunk/scm/canna-custom.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/canna-custom.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -118,27 +118,27 @@
 (define canna-input-mode-indication-alist
   (list
    (list 'action_canna_direct
-	 'figure_ja_direct
+	 'ja_direct
 	 "a"
 	 (N_ "Direct input")
 	 (N_ "Direct input mode"))
    (list 'action_canna_hiragana
-	 'figure_ja_hiragana
+	 'ja_hiragana
 	 "¤¢"
 	 (N_ "Hiragana")
 	 (N_ "Hiragana input mode"))
    (list 'action_canna_katakana
-	 'figure_ja_katakana
+	 'ja_katakana
 	 "¥¢"
 	 (N_ "Katakana")
 	 (N_ "Katakana input mode"))
    (list 'action_canna_hankana
-	 'figure_ja_hankana
+	 'ja_halfwidth_katakana
 	 "Ž±"
 	 (N_ "Halfwidth Katakana")
 	 (N_ "Halfwidth Katakana input mode"))
    (list 'action_canna_zenkaku
-	 'figure_ja_zenkaku
+	 'ja_fullwidth_alnum
 	 "£Á"
 	 (N_ "Fullwidth Alphanumeric")
 	 (N_ "Fullwidth Alphanumeric input mode"))))
@@ -146,17 +146,17 @@
 (define canna-kana-input-method-indication-alist
   (list
    (list 'action_canna_roma
-	 'figure_ja_roma
+	 'ja_romaji
 	 "£Ò"
 	 (N_ "Romaji")
 	 (N_ "Romaji input mode"))
    (list 'action_canna_kana
-	 'figure_ja_kana
+	 'ja_kana
 	 "¤«"
 	 (N_ "Kana")
 	 (N_ "Kana input mode"))
    (list 'action_canna_azik
-	 'figure_ja_azik
+	 'ja_azik
 	 "£Á"
 	 (N_ "AZIK")
 	 (N_ "AZIK extended romaji input mode"))))

Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/canna.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -55,7 +55,7 @@
 
 (register-action 'action_canna_hiragana
 		 (lambda (cc) ;; indication handler
-		   '(figure_ja_hiragana
+		   '(ja_hiragana
 		     "¤¢"
 		     "¤Ò¤é¤¬¤Ê"
 		     "¤Ò¤é¤¬¤ÊÆþÎϥ⡼¥É"))
@@ -73,7 +73,7 @@
 
 (register-action 'action_canna_katakana
 		 (lambda (cc)
-		   '(figure_ja_katakana
+		   '(ja_katakana
 		     "¥¢"
 		     "¥«¥¿¥«¥Ê"
 		     "¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -89,7 +89,7 @@
 
 (register-action 'action_canna_hankana
 		 (lambda (cc)
-		   '(figure_ja_hankana
+		   '(ja_halfwidth_katakana
 		     "Ž±"
 		     "Ⱦ³Ñ¥«¥¿¥«¥Ê"
 		     "Ⱦ³Ñ¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -105,7 +105,7 @@
 
 (register-action 'action_canna_direct
 		 (lambda (cc)
-		   '(figure_ja_direct
+		   '(ja_direct
 		     "a"
 		     "ľÀÜÆþÎÏ"
 		     "ľÀÜ(̵ÊÑ´¹)ÆþÎϥ⡼¥É"))
@@ -119,7 +119,7 @@
 
 (register-action 'action_canna_zenkaku
 		 (lambda (cc)
-		   '(figure_ja_zenkaku
+		   '(ja_fullwidth_alnum
 		     "£Á"
 		     "Á´³Ñ±Ñ¿ô"
 		     "Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É"))
@@ -133,7 +133,7 @@
 
 (register-action 'action_canna_roma
 		 (lambda (cc)
-		   '(figure_ja_roma
+		   '(ja_romaji
 		     "£Ò"
 		     "¥í¡¼¥Þ»ú"
 		     "¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))
@@ -148,7 +148,7 @@
 
 (register-action 'action_canna_kana
 		 (lambda (cc)
-		   '(figure_ja_kana
+		   '(ja_kana
 		     "¤«"
 		     "¤«¤Ê"
 		     "¤«¤ÊÆþÎϥ⡼¥É"))
@@ -163,7 +163,7 @@
 
 (register-action 'action_canna_azik
 		 (lambda (cc)
-		   '(figure_ja_azik
+		   '(ja_azik
 		     "£Á"
 		     "AZIK"
 		     "AZIK³ÈÄ¥¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))

Modified: trunk/scm/direct.scm
===================================================================
--- trunk/scm/direct.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/direct.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -48,7 +48,7 @@
 (register-action 'action_direct_direct
 		 (lambda (dc)
 		   (list
-		    'figure_direct_direct
+		    'direct_input
 		    "-"
 		    (N_ "direct")
 		    (N_ "Direct Input Mode")))

Modified: trunk/scm/generic.scm
===================================================================
--- trunk/scm/generic.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/generic.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -66,7 +66,7 @@
 (register-action 'action_generic_off
 		 (lambda (gc)
 		   (list
-		    'figure_generic_off
+		    'off
 		    "-"
 		    (N_ "off")
 		    (N_ "Direct Input Mode")))
@@ -81,7 +81,7 @@
 		   (let* ((im (generic-context-im gc))
 			  (name (symbol->string (im-name im))))
 		     (list
-		      'figure_generic_on
+		      'on
 		      "O"
 		      (N_ "on")
 		      (string-append name (N_ " Mode")))))

Modified: trunk/scm/m17nlib.scm
===================================================================
--- trunk/scm/m17nlib.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/m17nlib.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -57,7 +57,7 @@
 (register-action 'action_m17nlib_off
 		 (lambda (mc)
 		   (list
-		    'figure_m17nlib_off
+		    'off
 		    "-"
 		    (N_ "off")
 		    (N_ "Direct Input Mode")))
@@ -71,7 +71,7 @@
 		   (let* ((im (m17nlib-context-im mc))
 			  (name (symbol->string (im-name im))))
 		     (list
-		      'figure_m17nlib_on
+		      'on
 		      "O"
 		      (N_ "on")
 		      (string-append name (N_ " Mode")))))

Modified: trunk/scm/mana-custom.scm
===================================================================
--- trunk/scm/mana-custom.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/mana-custom.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -114,27 +114,27 @@
 (define mana-input-mode-indication-alist
   (list
    (list 'action_mana_direct
-	 'figure_ja_direct
+	 'ja_direct
 	 "a"
 	 (N_ "Direct input")
 	 (N_ "Direct input mode"))
    (list 'action_mana_hiragana
-	 'figure_ja_hiragana
+	 'ja_hiragana
 	 "¤¢"
 	 (N_ "Hiragana")
 	 (N_ "Hiragana input mode"))
    (list 'action_mana_katakana
-	 'figure_ja_katakana
+	 'ja_katakana
 	 "¥¢"
 	 (N_ "Katakana")
 	 (N_ "Katakana input mode"))
    (list 'action_mana_hankana
-	 'figure_ja_hankana
+	 'ja_halfwidth_katakana
 	 "Ž±"
 	 (N_ "Halfwidth Katakana")
 	 (N_ "Halfwidth Katakana input mode"))
    (list 'action_mana_zenkaku
-	 'figure_ja_zenkaku
+	 'ja_fullwidth_alnum
 	 "£Á"
 	 (N_ "Fullwidth Alphanumeric")
 	 (N_ "Fullwidth Alphanumeric input mode"))))
@@ -142,17 +142,17 @@
 (define mana-kana-input-method-indication-alist
   (list
    (list 'action_mana_roma
-	 'figure_ja_roma
+	 'ja_romaji
 	 "£Ò"
 	 (N_ "Romaji")
 	 (N_ "Romaji input mode"))
    (list 'action_mana_kana
-	 'figure_ja_kana
+	 'ja_kana
 	 "¤«"
 	 (N_ "Kana")
 	 (N_ "Kana input mode"))
    (list 'action_mana_azik
-	 'figure_ja_azik
+	 'ja_azik
 	 "£Á"
 	 (N_ "AZIK")
 	 (N_ "AZIK extended romaji input mode"))))

Modified: trunk/scm/mana.scm
===================================================================
--- trunk/scm/mana.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/mana.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -212,7 +212,7 @@
                  ;;              (indication-alist-indicator 'action_mana_hiragana
                  ;;                                          mana-input-mode-indication-alist)
                  (lambda (mc) ;; indication handler
-                   '(figure_ja_hiragana
+                   '(ja_hiragana
                       "¤¢"
                       "¤Ò¤é¤¬¤Ê"
                       "¤Ò¤é¤¬¤ÊÆþÎϥ⡼¥É"))
@@ -231,7 +231,7 @@
                  ;;              (indication-alist-indicator 'action_mana_katakana
                  ;;                                          mana-input-mode-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_katakana
+                   '(ja_katakana
                       "¥¢"
                       "¥«¥¿¥«¥Ê"
                       "¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -248,7 +248,7 @@
                  ;;              (indication-alist-indicator 'action_mana_hankana
                  ;;                                          mana-input-mode-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_hankana
+                   '(ja_halfwidth_katakana
                       "Ž±"
                       "Ⱦ³Ñ¥«¥¿¥«¥Ê"
                       "Ⱦ³Ñ¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -265,7 +265,7 @@
                  ;;              (indication-alist-indicator 'action_mana_direct
                  ;;                                          mana-input-mode-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_direct
+                   '(ja_direct
                       "a"
                       "ľÀÜÆþÎÏ"
                       "ľÀÜ(̵ÊÑ´¹)ÆþÎϥ⡼¥É"))
@@ -281,7 +281,7 @@
                  ;;              (indication-alist-indicator 'action_mana_zenkaku
                  ;;                                          mana-input-mode-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_zenkaku
+                   '(ja_fullwidth_alnum
                       "£Á"
                       "Á´³Ñ±Ñ¿ô"
                       "Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É"))
@@ -297,7 +297,7 @@
                  ;;              (indication-alist-indicator 'action_mana_roma
                  ;;                                          mana-kana-input-method-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_roma
+                   '(ja_romaji
                       "£Ò"
                       "¥í¡¼¥Þ»ú"
                       "¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))
@@ -314,7 +314,7 @@
                  ;;              (indication-alist-indicator 'action_mana_kana
                  ;;                                          mana-kana-input-method-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_kana
+                   '(ja_kana
                       "¤«"
                       "¤«¤Ê"
                       "¤«¤ÊÆþÎϥ⡼¥É"))
@@ -334,7 +334,7 @@
                  ;;              (indication-alist-indicator 'action_mana_azik
                  ;;                                          mana-kana-input-method-indication-alist)
                  (lambda (mc)
-                   '(figure_ja_azik
+                   '(ja_azik
                       "£Á"
                       "AZIK"
                       "AZIK³ÈÄ¥¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))

Modified: trunk/scm/prime-custom.scm
===================================================================
--- trunk/scm/prime-custom.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/prime-custom.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -155,17 +155,17 @@
 (define prime-input-mode-indication-alist
   (list
    (list 'action_prime_mode_latin
-	 'figure_prime_mode_latin
+	 'ja_direct
 	 "P"
 	 (N_ "Direct input")
 	 (N_ "PRIME off"))
    (list 'action_prime_mode_hiragana
-	 'figure_prime_mode_hiragana
+	 'ja_hiragana
 	 "¤×"
 	 (N_ "Japanese")
 	 (N_ "PRIME on"))
    (list 'action_prime_mode_wide_latin
-	 'figure_prime_mode_wide_latin
+	 'ja_fullwidth_alnum
 	 "£Ð"
 	 (N_ "Fullwidth Alphanumeric")
 	 (N_ "Fullwidth Alphanumeric input mode"))))

Modified: trunk/scm/prime.scm
===================================================================
--- trunk/scm/prime.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/prime.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -429,7 +429,7 @@
 
 (register-action 'action_prime_mode_latin
 		 (lambda (context)
-		   '(figure_prime_mode_latin
+		   '(ja_direct
 		     "--"
 		     "Ä̾ïÆþÎÏ"
 		     "PRIME¤ò¥ª¥Õ"))
@@ -441,7 +441,7 @@
 
 (register-action 'action_prime_mode_hiragana
 		 (lambda (context)
-		   '(figure_prime_mode_hiragana
+		   '(ja_hiragana
 		     "¤¢"
 		     "ÆüËܸì"
 		     "PRIME¤ò¥ª¥ó"))
@@ -453,7 +453,7 @@
 
 (register-action 'action_prime_mode_wide_latin
 		 (lambda (context)
-		   '(figure_prime_mode_wide_latin
+		   '(ja_fullwidth_alnum
 		     "£Á"
 		     "Á´³Ñ±Ñ¿ô"
 		     "Á´³Ñ¤òÆþÎÏ"))
@@ -465,7 +465,7 @@
 
 (register-action 'action_prime_mode_application
 		 (lambda (context)
-		   '(figure_prime_mode_application
+		   '(prime_mode_application
 		     "¡ª"
 		     "Æüì"
 		     "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó°Í¸"))

Modified: trunk/scm/scim.scm
===================================================================
--- trunk/scm/scim.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/scim.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -57,7 +57,7 @@
 (register-action 'action_scim_off
 		 (lambda (mc)
 		   (list
-		    'figure_scim_off
+		    'off
 		    "-"
 		    (N_ "off")
 		    (N_ "Direct Input Mode")))
@@ -71,7 +71,7 @@
 		   (let* ((im (scim-context-im mc))
 			  (name (symbol->string (im-name im))))
 		     (list
-		      'figure_scim_on
+		      'on
 		      "O"
 		      (N_ "on")
 		      (string-append name (N_ " Mode")))))

Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/skk-custom.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -163,27 +163,27 @@
 (define skk-input-mode-indication-alist
   (list
    (list 'action_skk_latin
-	 'figure_ja_latin
+	 'ja_direct
 	 "s"
 	 (N_ "Direct input")
 	 (N_ "Direct input mode"))
    (list 'action_skk_hiragana
-	 'figure_ja_hiragana
+	 'ja_hiragana
 	 "¤¨"
 	 (N_ "Hiragana")
 	 (N_ "Hiragana input mode"))
    (list 'action_skk_katakana
-	 'figure_ja_katakana
+	 'ja_katakana
 	 "¥¨"
 	 (N_ "Katakana")
 	 (N_ "Katakana input mode"))
    (list 'action_skk_hankana
-	 'figure_ja_hankana
+	 'ja_halfwidth_katakana
 	 "Ž´"
 	 (N_ "Halfwidth Katakana")
 	 (N_ "Halfwidth Katakana input mode"))
    (list 'action_skk_wide_latin
-	 'figure_ja_wide_latin
+	 'ja_fullwidth_alnum
 	 "£Ó"
 	 (N_ "Fullwidth Alphanumeric")
 	 (N_ "Fullwidth Alphanumeric input mode"))))
@@ -191,12 +191,12 @@
 (define skk-kana-input-method-indication-alist
   (list
    (list 'action_skk_roma
-	 'figure_ja_roma
+	 'ja_romaji
 	 "£Ò"
 	 (N_ "Romaji")
 	 (N_ "Romaji input mode"))
    (list 'action_skk_azik
-	 'figure_ja_azik
+	 'ja_azik
 	 "£Á"
 	 (N_ "AZIK")
 	 (N_ "AZIK extended romaji input mode"))))

Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/skk.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -156,7 +156,7 @@
 
 (register-action 'action_skk_hiragana
 		 (lambda (sc)
-		   '(figure_ja_hiragana
+		   '(ja_hiragana
 		     "¤¢"
 		     "¤Ò¤é¤¬¤Ê"
 		     "¤Ò¤é¤¬¤ÊÆþÎϥ⡼¥É"))
@@ -173,7 +173,7 @@
 
 (register-action 'action_skk_katakana
 		 (lambda (sc)
-		   '(figure_ja_katakana
+		   '(ja_katakana
 		     "¥¢"
 		     "¥«¥¿¥«¥Ê"
 		     "¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -190,7 +190,7 @@
 
 (register-action 'action_skk_hankana
 		 (lambda (sc)
-		   '(figure_ja_hankana
+		   '(ja_halfwidth_katakana
 		     "Ž±"
 		     "Ⱦ³Ñ¥«¥¿¥«¥Ê"
 		     "Ⱦ³Ñ¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"))
@@ -207,7 +207,7 @@
 
 (register-action 'action_skk_latin
 		 (lambda (sc)
-		   '(figure_ja_latin
+		   '(ja_direct
 		     "a"
 		     "ľÀÜÆþÎÏ"
 		     "ľÀÜ(̵ÊÑ´¹)ÆþÎϥ⡼¥É"))
@@ -222,7 +222,7 @@
 
 (register-action 'action_skk_wide_latin
 		 (lambda (sc)
-		   '(figure_ja_wide_latin
+		   '(ja_fullwidth_alnum
 		     "£Á"
 		     "Á´³Ñ±Ñ¿ô"
 		     "Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É"))
@@ -237,7 +237,7 @@
 
 (register-action 'action_skk_roma
 		 (lambda (sc)
-		   '(figure_ja_roma
+		   '(ja_romaji
 		     "£Ò"
 		     "¥í¡¼¥Þ»ú"
 		     "¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))
@@ -252,7 +252,7 @@
 
 (register-action 'action_skk_azik
 		 (lambda (sc)
-		   '(figure_ja_azik
+		   '(ja_azik
 		     "£Á"
 		     "AZIK"
 		     "AZIK³ÈÄ¥¥í¡¼¥Þ»úÆþÎϥ⡼¥É"))

Modified: trunk/scm/tutcode.scm
===================================================================
--- trunk/scm/tutcode.scm	2006-02-17 17:30:57 UTC (rev 3111)
+++ trunk/scm/tutcode.scm	2006-02-17 18:43:27 UTC (rev 3112)
@@ -79,7 +79,7 @@
 
 (register-action 'action_tutcode_direct
 		 (lambda (tc)
-		   '(figure_ja_direct
+		   '(ja_direct
 		     "a"
 		     "ľÀÜÆþÎÏ"
 		     "ľÀÜÆþÎϥ⡼¥É"))
@@ -91,7 +91,7 @@
 
 (register-action 'action_tutcode_hiragana
 		 (lambda (tc)
-		   '(figure_ja_hiragana
+		   '(ja_hiragana
 		     "¤¢"
 		     "¤Ò¤é¤¬¤Ê"
 		     "¤Ò¤é¤¬¤Ê¥â¡¼¥É"))
@@ -105,7 +105,7 @@
 
 (register-action 'action_tutcode_katakana
 		 (lambda (tc)
-		   '(figure_ja_katakana
+		   '(ja_katakana
 		     "¥¢"
 		     "¥«¥¿¥«¥Ê"
 		     "¥«¥¿¥«¥Ê¥â¡¼¥É"))



More information about the uim-commit mailing list