[uim-commit] r275 - in trunk: po scm uim

Thu Jan 13 02:29:53 PST 2005

Author: yamaken
Date: 2005-01-13 02:29:50 -0800 (Thu, 13 Jan 2005)
New Revision: 275

Modified:
   trunk/po/ja.po
   trunk/po/uim.pot
   trunk/scm/custom-vars.scm
   trunk/scm/util.scm
   trunk/uim/uim-compat-scm.c
Log:
* scm/custom-vars.scm
  - (custom candidate-window-position):
    * Restore the custom variable removed by misunderstanding
    * Change custom type from string to choice
* uim/uim-compat-scm.c
  - (uim_symbol_value_str): Allow value as symbol
* scm/util.scm
  - (uim-symbol-value-str): New procedure for uim_symbol_value_str()

* po/uim.pot
* po/ja.po
  - Update


Modified: trunk/po/ja.po
===================================================================

--- trunk/po/ja.po	2005-01-13 09:29:13 UTC (rev 274)
+++ trunk/po/ja.po	2005-01-13 10:29:50 UTC (rev 275)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: uim 2010\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-12 06:34+0900\n"
-"PO-Revision-Date: 2005-01-2 07:49+0900\n"
+"POT-Creation-Date: 2005-01-13 18:36+0900\n"
+"PO-Revision-Date: 2005-01-13 19:18+0900\n"
 "Last-Translator: YamaKen <yamaken@bp.iij4u.or.jp>\n"
 "Language-Team: Japanese <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -336,12 +336,16 @@
 "Some value(s) have been changed.\n"
 "Save?"
 msgstr ""
+"ÀßÄê¤¬ÊÑ¹¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"¥»¡¼¥Ö¤·¤Þ¤¹¤«?"
 
 #: helper/pref-gtk.c:176
 msgid ""
 "Some value(s) have been changed.\n"
 "Do you realy quit this program?"
 msgstr ""
+"ÀßÄê¤¬ÊÑ¹¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"¥»¡¼¥Ö¤·¤Þ¤¹¤«?"
 
 #: helper/pref-gtk.c:215
 msgid "Group"
@@ -387,7 +391,7 @@
 msgid "Japanese Kana Kanji Conversion Engine, Example"
 msgstr "ÆüËÜ¸ì¤«¤Ê´Á»úÊÑ´¹¥¨¥ó¥¸¥óÎã"
 
-#: scm/anthy.lisp:989
+#: scm/anthy.lisp:986
 msgid "Japanese Kana Kanji Conversion Engine, Anthy"
 msgstr "ÆüËÜ¸ì¤«¤Ê´Á»úÊÑ´¹¥¨¥ó¥¸¥óAnthy"
 
@@ -499,19 +503,20 @@
 #: scm/custom-vars.lisp:59 scm/custom-vars.lisp:63 scm/custom-vars.lisp:70
 #: scm/custom-vars.lisp:76 scm/custom-vars.lisp:94 scm/custom-vars.lisp:172
 #: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:191
-#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:214 scm/custom-vars.lisp:218
-#: scm/custom-vars.lisp:340 scm/custom-vars.lisp:346 scm/custom-vars.lisp:352
-#: scm/custom-vars.lisp:358 scm/custom-vars.lisp:364 scm/custom-vars.lisp:370
-#: scm/custom-vars.lisp:384 scm/custom-vars.lisp:390 scm/custom-vars.lisp:396
-#: scm/custom-vars.lisp:402 scm/custom-vars.lisp:408 scm/custom-vars.lisp:415
-#: scm/custom-vars.lisp:421 scm/custom-vars.lisp:427 scm/custom-vars.lisp:493
-#: scm/custom-vars.lisp:500 scm/custom-vars.lisp:507 scm/custom-vars.lisp:513
-#: scm/custom-vars.lisp:519 scm/custom-vars.lisp:525 scm/custom-vars.lisp:533
-#: scm/custom-vars.lisp:539 scm/custom-vars.lisp:545 scm/custom-vars.lisp:551
-#: scm/custom-vars.lisp:557 scm/custom-vars.lisp:563 scm/custom-vars.lisp:589
-#: scm/custom-vars.lisp:595 scm/custom-vars.lisp:601 scm/custom-vars.lisp:607
-#: scm/custom-vars.lisp:613 scm/custom-vars.lisp:620 scm/custom-vars.lisp:634
-#: scm/custom-vars.lisp:640 scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
+#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:221 scm/custom-vars.lisp:230
+#: scm/custom-vars.lisp:234 scm/custom-vars.lisp:356 scm/custom-vars.lisp:362
+#: scm/custom-vars.lisp:368 scm/custom-vars.lisp:374 scm/custom-vars.lisp:380
+#: scm/custom-vars.lisp:386 scm/custom-vars.lisp:400 scm/custom-vars.lisp:406
+#: scm/custom-vars.lisp:412 scm/custom-vars.lisp:418 scm/custom-vars.lisp:424
+#: scm/custom-vars.lisp:431 scm/custom-vars.lisp:437 scm/custom-vars.lisp:443
+#: scm/custom-vars.lisp:508 scm/custom-vars.lisp:514 scm/custom-vars.lisp:520
+#: scm/custom-vars.lisp:528 scm/custom-vars.lisp:534 scm/custom-vars.lisp:540
+#: scm/custom-vars.lisp:546 scm/custom-vars.lisp:552 scm/custom-vars.lisp:558
+#: scm/custom-vars.lisp:564 scm/custom-vars.lisp:571 scm/custom-vars.lisp:578
+#: scm/custom-vars.lisp:585 scm/custom-vars.lisp:611 scm/custom-vars.lisp:617
+#: scm/custom-vars.lisp:623 scm/custom-vars.lisp:629 scm/custom-vars.lisp:635
+#: scm/custom-vars.lisp:642 scm/custom-vars.lisp:656 scm/custom-vars.lisp:662
+#: scm/custom-vars.lisp:668 scm/custom-vars.lisp:674
 msgid "long description will be here."
 msgstr "¾ÜºÙµ½ÒÍ½Äê"
 
@@ -543,11 +548,11 @@
 msgid "IM switching key"
 msgstr "IMÀÚÂØ¤¨¥¡¼"
 
-#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
+#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:526
 msgid "uim"
 msgstr ""
 
-#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
+#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:526
 msgid "uim native"
 msgstr "uim¥Í¥¤¥Æ¥£¥Ö"
 
@@ -563,199 +568,219 @@
 msgid "Preedit color"
 msgstr "¥×¥ê¥¨¥Ç¥£¥Ã¥È¿§"
 
-#: scm/custom-vars.lisp:213
+#: scm/custom-vars.lisp:212 scm/custom-vars.lisp:213
+msgid "Adjacent to caret"
+msgstr "¥¥ã¥ì¥Ã¥È¤ËÎÙÀÜ"
+
+#: scm/custom-vars.lisp:215 scm/custom-vars.lisp:216
+msgid "Left end of preedit area"
+msgstr "ÊÔ½¸ÎÎ°è¤Îº¸Ã¼"
+
+#: scm/custom-vars.lisp:218 scm/custom-vars.lisp:219
+msgid "Right end of preedit area"
+msgstr "ÊÔ½¸ÎÎ°è¤Î±¦Ã¼"
+
+#: scm/custom-vars.lisp:220
+msgid "Candidate window position"
+msgstr "¸õÊä¥¦¥£¥ó¥É¥¦É½¼¨°ÌÃÖ"
+
+#: scm/custom-vars.lisp:229
 msgid "Key bindings"
 msgstr "¥¡¼ÀßÄê"
 
-#: scm/custom-vars.lisp:217
+#: scm/custom-vars.lisp:233
 msgid "Global key bindings"
 msgstr "Á´ÂÎ¥¡¼ÀßÄê"
 
-#: scm/custom-vars.lisp:223
+#: scm/custom-vars.lisp:239
 msgid "[Global] on"
 msgstr "[Á´ÂÎ] ¥ª¥ó"
 
-#: scm/custom-vars.lisp:224 scm/custom-vars.lisp:230 scm/custom-vars.lisp:236
-#: scm/custom-vars.lisp:242 scm/custom-vars.lisp:248 scm/custom-vars.lisp:254
-#: scm/custom-vars.lisp:260 scm/custom-vars.lisp:266 scm/custom-vars.lisp:272
-#: scm/custom-vars.lisp:278 scm/custom-vars.lisp:284 scm/custom-vars.lisp:290
-#: scm/custom-vars.lisp:296 scm/custom-vars.lisp:302 scm/custom-vars.lisp:308
-#: scm/custom-vars.lisp:314 scm/custom-vars.lisp:320 scm/custom-vars.lisp:326
+#: scm/custom-vars.lisp:240 scm/custom-vars.lisp:246 scm/custom-vars.lisp:252
+#: scm/custom-vars.lisp:258 scm/custom-vars.lisp:264 scm/custom-vars.lisp:270
+#: scm/custom-vars.lisp:276 scm/custom-vars.lisp:282 scm/custom-vars.lisp:288
+#: scm/custom-vars.lisp:294 scm/custom-vars.lisp:300 scm/custom-vars.lisp:306
+#: scm/custom-vars.lisp:312 scm/custom-vars.lisp:318 scm/custom-vars.lisp:324
+#: scm/custom-vars.lisp:330 scm/custom-vars.lisp:336 scm/custom-vars.lisp:342
 msgid "long description will be here"
 msgstr "¾ÜºÙµ½ÒÍ½Äê"
 
-#: scm/custom-vars.lisp:229
+#: scm/custom-vars.lisp:245
 msgid "[Global] off"
 msgstr "[Á´ÂÎ] ¥ª¥Õ"
 
-#: scm/custom-vars.lisp:235
+#: scm/custom-vars.lisp:251
 msgid "[Global] begin conversion"
 msgstr "[Á´ÂÎ] ÊÑ´¹³«»Ï"
 
-#: scm/custom-vars.lisp:241
+#: scm/custom-vars.lisp:257
 msgid "[Global] commit"
 msgstr "[Á´ÂÎ] ³ÎÄê"
 
-#: scm/custom-vars.lisp:247
+#: scm/custom-vars.lisp:263
 msgid "[Global] cancel"
 msgstr "[Á´ÂÎ] ¥¥ã¥ó¥»¥ë"
 
-#: scm/custom-vars.lisp:253
+#: scm/custom-vars.lisp:269
 msgid "[Global] next candidate"
 msgstr "[Á´ÂÎ] ¼¡¸õÊä"
 
-#: scm/custom-vars.lisp:259
+#: scm/custom-vars.lisp:275
 msgid "[Global] previous candidate"
 msgstr "[Á´ÂÎ] Á°¸õÊä"
 
-#: scm/custom-vars.lisp:265
+#: scm/custom-vars.lisp:281
 msgid "[Global] next page of candidate window"
 msgstr "[Á´ÂÎ] ¸õÊä¥¦¥£¥ó¥É¥¦¤Î¼¡¥Ú¡¼¥¸"
 
-#: scm/custom-vars.lisp:271
+#: scm/custom-vars.lisp:287
 msgid "[Global] previous page of candidate window"
 msgstr "[Á´ÂÎ] ¸õÊä¥¦¥£¥ó¥É¥¦¤ÎÁ°¥Ú¡¼¥¸"
 
-#: scm/custom-vars.lisp:277
+#: scm/custom-vars.lisp:293
 msgid "[Global] beginning of preedit"
 msgstr "[Á´ÂÎ] ÊÔ½¸ÎÎ°è¤ÎÀèÆ¬"
 
-#: scm/custom-vars.lisp:283
+#: scm/custom-vars.lisp:299
 msgid "[Global] end of preedit"
 msgstr "[Á´ÂÎ] ÊÔ½¸ÎÎ°è¤ÎËöÈø"
 
-#: scm/custom-vars.lisp:289
+#: scm/custom-vars.lisp:305
 msgid "[Global] erase after cursor"
 msgstr "[Á´ÂÎ] ¥«¡¼¥½¥ë°Ê¹ß¤ò¾Ãµî"
 
-#: scm/custom-vars.lisp:295
+#: scm/custom-vars.lisp:311
 msgid "[Global] erase before cursor"
 msgstr "[Á´ÂÎ] ¥«¡¼¥½¥ë°ÊÁ°¤ò¾Ãµî"
 
-#: scm/custom-vars.lisp:301
+#: scm/custom-vars.lisp:317
 msgid "[Global] backspace"
 msgstr "[Á´ÂÎ] ¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹"
 
-#: scm/custom-vars.lisp:307
+#: scm/custom-vars.lisp:323
 msgid "[Global] delete"
 msgstr "[Á´ÂÎ] ¥Ç¥ê¡¼¥È"
 
-#: scm/custom-vars.lisp:313
+#: scm/custom-vars.lisp:329
 msgid "[Global] left"
 msgstr "[Á´ÂÎ] º¸"
 
-#: scm/custom-vars.lisp:319
+#: scm/custom-vars.lisp:335
 msgid "[Global] right"
 msgstr "[Á´ÂÎ] ±¦"
 
-#: scm/custom-vars.lisp:325
+#: scm/custom-vars.lisp:341
 msgid "[Global] return"
 msgstr "[Á´ÂÎ] ¥ê¥¿¡¼¥ó"
 
-#: scm/custom-vars.lisp:339 scm/custom-vars.lisp:383 scm/custom-vars.lisp:512
-#: scm/custom-vars.lisp:639
+#: scm/custom-vars.lisp:355 scm/custom-vars.lisp:399 scm/custom-vars.lisp:507
+#: scm/custom-vars.lisp:661
 msgid "Use candidate window"
 msgstr "¸õÊä¥¦¥£¥ó¥É¥¦¤ò»ÈÍÑ¤¹¤ë"
 
-#: scm/custom-vars.lisp:345 scm/custom-vars.lisp:389 scm/custom-vars.lisp:518
-#: scm/custom-vars.lisp:645
+#: scm/custom-vars.lisp:361 scm/custom-vars.lisp:405 scm/custom-vars.lisp:513
+#: scm/custom-vars.lisp:667
 msgid "Conversion key press count to show candidate window"
 msgstr "¸õÊä¥¦¥£¥ó¥É¥¦¤ÎÉ½¼¨¤ò³«»Ï¤¹¤ë¤Þ¤Ç¤ÎÊÑ´¹¥¡¼²¡²¼¿ô"
 
-#: scm/custom-vars.lisp:351 scm/custom-vars.lisp:395 scm/custom-vars.lisp:524
-#: scm/custom-vars.lisp:588 scm/custom-vars.lisp:651
+#: scm/custom-vars.lisp:367 scm/custom-vars.lisp:411 scm/custom-vars.lisp:519
+#: scm/custom-vars.lisp:610 scm/custom-vars.lisp:673
 msgid "Number of candidates in candidate window at a time"
 msgstr "¸õÊä¥¦¥£¥ó¥É¥¦¤ËÉ½¼¨¤¹¤ë¸õÊä¿ô"
 
-#: scm/custom-vars.lisp:357
+#: scm/custom-vars.lisp:373
 msgid "Select candidate by numeral keys"
 msgstr "¿ô»ú¥¡¼¤Ç¸õÊä¤òÁªÂò¤¹¤ë"
 
-#: scm/custom-vars.lisp:363 scm/custom-vars.lisp:401
+#: scm/custom-vars.lisp:379 scm/custom-vars.lisp:417
 msgid "Show segment separator"
 msgstr "Ê¸Àá¶èÀÚ¤ê¤òÉ½¼¨¤¹¤ë"
 
-#: scm/custom-vars.lisp:369 scm/custom-vars.lisp:407
+#: scm/custom-vars.lisp:385 scm/custom-vars.lisp:423
 msgid "Segment separator"
 msgstr "Ê¸Àá¶èÀÚ¤ê"
 
-#: scm/custom-vars.lisp:414
+#: scm/custom-vars.lisp:430
 msgid "Canna server"
 msgstr "Canna¥µ¡¼¥Ð"
 
-#: scm/custom-vars.lisp:420
+#: scm/custom-vars.lisp:436
 msgid "Use Canna server"
 msgstr "Canna¥µ¡¼¥Ð¤ò»ÈÍÑ¤¹¤ë"
 
-#: scm/custom-vars.lisp:426
+#: scm/custom-vars.lisp:442
 msgid "Canna server name"
 msgstr "Canna¥µ¡¼¥ÐÌ¾"
 
-#: scm/custom-vars.lisp:492
-msgid "Dictionary file"
-msgstr "¼½ñ¥Õ¥¡¥¤¥ë"
-
-#: scm/custom-vars.lisp:499
-msgid "Personal dictionary file"
-msgstr "¸Ä¿Í¼½ñ¥Õ¥¡¥¤¥ë"
-
-#: scm/custom-vars.lisp:506
-msgid "Personal dictionary file (dedicated to uim)"
-msgstr "¸Ä¿Í¼½ñ¥Õ¥¡¥¤¥ë (uimÀìÍÑ)"
-
-#: scm/custom-vars.lisp:530
+#: scm/custom-vars.lisp:525
 msgid "ddskk"
 msgstr ""
 
-#: scm/custom-vars.lisp:530
+#: scm/custom-vars.lisp:525
 msgid "Similar to ddskk"
 msgstr "ddskkÉ÷"
 
-#: scm/custom-vars.lisp:532
+#: scm/custom-vars.lisp:527
 msgid "Visual style"
 msgstr "¥Ó¥¸¥å¥¢¥ë¥¹¥¿¥¤¥ë"
 
-#: scm/custom-vars.lisp:538
+#: scm/custom-vars.lisp:533
 msgid "Use recursive learning"
 msgstr "ºÆµ¢³Ø½¬¤ò»ÈÍÑ¤¹¤ë"
 
-#: scm/custom-vars.lisp:544
+#: scm/custom-vars.lisp:539
 msgid "Use Enter key as just committing (egg-like operation)"
 msgstr "Enter¥¡¼¤òÃ±¤Ë¥³¥ß¥Ã¥È¤Î¤¿¤á¤Ë»È¤¦ (eggÉ÷¤ÎÁàºî)"
 
-#: scm/custom-vars.lisp:550
+#: scm/custom-vars.lisp:545
 msgid "Commit newline as ASCII string instead of native key-event"
 msgstr "¿·µ¬¹Ô¤ò¥Í¥¤¥Æ¥£¥Ö¥¡¼¥¤¥Ù¥ó¥È¤ÎÂå¤ï¤ê¤ËASCIIÊ¸»úÎó¤È¤·¤Æ¥³¥ß¥Ã¥È¤¹¤ë"
 
-#: scm/custom-vars.lisp:556
+#: scm/custom-vars.lisp:551
 msgid "Use numeric conversion"
 msgstr "¿ôÃÍÊÑ´¹¤ò»ÈÍÑ¤¹¤ë"
 
-#: scm/custom-vars.lisp:562
+#: scm/custom-vars.lisp:557
 msgid "Friendly for vi user"
 msgstr "vi¤ËÅ¬±þ¤·¤¿ÆþÎÏÀ©¸æ¤ò»ÈÍÑ¤¹¤ë"
 
-#: scm/custom-vars.lisp:594
+#: scm/custom-vars.lisp:563
+msgid "Commit candidate by heading label keys"
+msgstr "¸«½Ð¤·É½¼¨¤Î¥¡¼¤Ç¸õÊä¤òÁªÂò¤¹¤ë"
+
+#: scm/custom-vars.lisp:570
+msgid "Dictionary file"
+msgstr "¼½ñ¥Õ¥¡¥¤¥ë"
+
+#: scm/custom-vars.lisp:577
+msgid "Personal dictionary file"
+msgstr "¸Ä¿Í¼½ñ¥Õ¥¡¥¤¥ë"
+
+#: scm/custom-vars.lisp:584
+msgid "Personal dictionary file (dedicated to uim)"
+msgstr "¸Ä¿Í¼½ñ¥Õ¥¡¥¤¥ë (uimÀìÍÑ)"
+
+#: scm/custom-vars.lisp:616
 msgid "Always showing candidate window"
 msgstr "¸õÊä¥¦¥£¥ó¥É¥¦¤ò¾ï¤ËÉ½¼¨¤¹¤ë"
 
-#: scm/custom-vars.lisp:600
+#: scm/custom-vars.lisp:622
 msgid "Enable auto register mode"
 msgstr ""
 
-#: scm/custom-vars.lisp:606
+#: scm/custom-vars.lisp:628
 msgid "Enable pseudo mode cursor"
 msgstr ""
 
-#: scm/custom-vars.lisp:612
+#: scm/custom-vars.lisp:634
 msgid "Show candidate annotations"
 msgstr ""
 
-#: scm/custom-vars.lisp:619
+#: scm/custom-vars.lisp:641
 msgid "Mask preedit strings (For T-Code users)"
 msgstr ""
 
-#: scm/custom-vars.lisp:633
+#: scm/custom-vars.lisp:655
 msgid "Other input methods"
 msgstr "¤½¤ÎÂ¾¤ÎÆþÎÏÊý¼°"
 
@@ -819,7 +844,7 @@
 msgid "PinYin input method (Big5 version)"
 msgstr "¥Ô¥ó¥¤¥óÆþÎÏÊý¼° (ÈËÂÎ»ú)"
 
-#: scm/skk.lisp:1582
+#: scm/skk.lisp:1608
 msgid "Uim's SKK like input method"
 msgstr "Uim¤ÎSKKÉ÷ÆþÎÏÊý¼°"
 

Modified: trunk/po/uim.pot
===================================================================
--- trunk/po/uim.pot	2005-01-13 09:29:13 UTC (rev 274)
+++ trunk/po/uim.pot	2005-01-13 10:29:50 UTC (rev 275)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-12 06:34+0900\n"
+"POT-Creation-Date: 2005-01-13 18:36+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -388,7 +388,7 @@
 msgid "Japanese Kana Kanji Conversion Engine, Example"
 msgstr ""
 
-#: scm/anthy.lisp:989
+#: scm/anthy.lisp:986
 msgid "Japanese Kana Kanji Conversion Engine, Anthy"
 msgstr ""
 
@@ -500,19 +500,20 @@
 #: scm/custom-vars.lisp:59 scm/custom-vars.lisp:63 scm/custom-vars.lisp:70
 #: scm/custom-vars.lisp:76 scm/custom-vars.lisp:94 scm/custom-vars.lisp:172
 #: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:191
-#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:214 scm/custom-vars.lisp:218
-#: scm/custom-vars.lisp:340 scm/custom-vars.lisp:346 scm/custom-vars.lisp:352
-#: scm/custom-vars.lisp:358 scm/custom-vars.lisp:364 scm/custom-vars.lisp:370
-#: scm/custom-vars.lisp:384 scm/custom-vars.lisp:390 scm/custom-vars.lisp:396
-#: scm/custom-vars.lisp:402 scm/custom-vars.lisp:408 scm/custom-vars.lisp:415
-#: scm/custom-vars.lisp:421 scm/custom-vars.lisp:427 scm/custom-vars.lisp:493
-#: scm/custom-vars.lisp:500 scm/custom-vars.lisp:507 scm/custom-vars.lisp:513
-#: scm/custom-vars.lisp:519 scm/custom-vars.lisp:525 scm/custom-vars.lisp:533
-#: scm/custom-vars.lisp:539 scm/custom-vars.lisp:545 scm/custom-vars.lisp:551
-#: scm/custom-vars.lisp:557 scm/custom-vars.lisp:563 scm/custom-vars.lisp:589
-#: scm/custom-vars.lisp:595 scm/custom-vars.lisp:601 scm/custom-vars.lisp:607
-#: scm/custom-vars.lisp:613 scm/custom-vars.lisp:620 scm/custom-vars.lisp:634
-#: scm/custom-vars.lisp:640 scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
+#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:221 scm/custom-vars.lisp:230
+#: scm/custom-vars.lisp:234 scm/custom-vars.lisp:356 scm/custom-vars.lisp:362
+#: scm/custom-vars.lisp:368 scm/custom-vars.lisp:374 scm/custom-vars.lisp:380
+#: scm/custom-vars.lisp:386 scm/custom-vars.lisp:400 scm/custom-vars.lisp:406
+#: scm/custom-vars.lisp:412 scm/custom-vars.lisp:418 scm/custom-vars.lisp:424
+#: scm/custom-vars.lisp:431 scm/custom-vars.lisp:437 scm/custom-vars.lisp:443
+#: scm/custom-vars.lisp:508 scm/custom-vars.lisp:514 scm/custom-vars.lisp:520
+#: scm/custom-vars.lisp:528 scm/custom-vars.lisp:534 scm/custom-vars.lisp:540
+#: scm/custom-vars.lisp:546 scm/custom-vars.lisp:552 scm/custom-vars.lisp:558
+#: scm/custom-vars.lisp:564 scm/custom-vars.lisp:571 scm/custom-vars.lisp:578
+#: scm/custom-vars.lisp:585 scm/custom-vars.lisp:611 scm/custom-vars.lisp:617
+#: scm/custom-vars.lisp:623 scm/custom-vars.lisp:629 scm/custom-vars.lisp:635
+#: scm/custom-vars.lisp:642 scm/custom-vars.lisp:656 scm/custom-vars.lisp:662
+#: scm/custom-vars.lisp:668 scm/custom-vars.lisp:674
 msgid "long description will be here."
 msgstr ""
 
@@ -544,11 +545,11 @@
 msgid "IM switching key"
 msgstr ""
 
-#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
+#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:526
 msgid "uim"
 msgstr ""
 
-#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
+#: scm/custom-vars.lisp:202 scm/custom-vars.lisp:526
 msgid "uim native"
 msgstr ""
 
@@ -564,199 +565,219 @@
 msgid "Preedit color"
 msgstr ""
 
-#: scm/custom-vars.lisp:213
+#: scm/custom-vars.lisp:212 scm/custom-vars.lisp:213
+msgid "Adjacent to caret"
+msgstr ""
+
+#: scm/custom-vars.lisp:215 scm/custom-vars.lisp:216
+msgid "Left end of preedit area"
+msgstr ""
+
+#: scm/custom-vars.lisp:218 scm/custom-vars.lisp:219
+msgid "Right end of preedit area"
+msgstr ""
+
+#: scm/custom-vars.lisp:220
+msgid "Candidate window position"
+msgstr ""
+
+#: scm/custom-vars.lisp:229
 msgid "Key bindings"
 msgstr ""
 
-#: scm/custom-vars.lisp:217
+#: scm/custom-vars.lisp:233
 msgid "Global key bindings"
 msgstr ""
 
-#: scm/custom-vars.lisp:223
+#: scm/custom-vars.lisp:239
 msgid "[Global] on"
 msgstr ""
 
-#: scm/custom-vars.lisp:224 scm/custom-vars.lisp:230 scm/custom-vars.lisp:236
-#: scm/custom-vars.lisp:242 scm/custom-vars.lisp:248 scm/custom-vars.lisp:254
-#: scm/custom-vars.lisp:260 scm/custom-vars.lisp:266 scm/custom-vars.lisp:272
-#: scm/custom-vars.lisp:278 scm/custom-vars.lisp:284 scm/custom-vars.lisp:290
-#: scm/custom-vars.lisp:296 scm/custom-vars.lisp:302 scm/custom-vars.lisp:308
-#: scm/custom-vars.lisp:314 scm/custom-vars.lisp:320 scm/custom-vars.lisp:326
+#: scm/custom-vars.lisp:240 scm/custom-vars.lisp:246 scm/custom-vars.lisp:252
+#: scm/custom-vars.lisp:258 scm/custom-vars.lisp:264 scm/custom-vars.lisp:270
+#: scm/custom-vars.lisp:276 scm/custom-vars.lisp:282 scm/custom-vars.lisp:288
+#: scm/custom-vars.lisp:294 scm/custom-vars.lisp:300 scm/custom-vars.lisp:306
+#: scm/custom-vars.lisp:312 scm/custom-vars.lisp:318 scm/custom-vars.lisp:324
+#: scm/custom-vars.lisp:330 scm/custom-vars.lisp:336 scm/custom-vars.lisp:342
 msgid "long description will be here"
 msgstr ""
 
-#: scm/custom-vars.lisp:229
+#: scm/custom-vars.lisp:245
 msgid "[Global] off"
 msgstr ""
 
-#: scm/custom-vars.lisp:235
+#: scm/custom-vars.lisp:251
 msgid "[Global] begin conversion"
 msgstr ""
 
-#: scm/custom-vars.lisp:241
+#: scm/custom-vars.lisp:257
 msgid "[Global] commit"
 msgstr ""
 
-#: scm/custom-vars.lisp:247
+#: scm/custom-vars.lisp:263
 msgid "[Global] cancel"
 msgstr ""
 
-#: scm/custom-vars.lisp:253
+#: scm/custom-vars.lisp:269
 msgid "[Global] next candidate"
 msgstr ""
 
-#: scm/custom-vars.lisp:259
+#: scm/custom-vars.lisp:275
 msgid "[Global] previous candidate"
 msgstr ""
 
-#: scm/custom-vars.lisp:265
+#: scm/custom-vars.lisp:281
 msgid "[Global] next page of candidate window"
 msgstr ""
 
-#: scm/custom-vars.lisp:271
+#: scm/custom-vars.lisp:287
 msgid "[Global] previous page of candidate window"
 msgstr ""
 
-#: scm/custom-vars.lisp:277
+#: scm/custom-vars.lisp:293
 msgid "[Global] beginning of preedit"
 msgstr ""
 
-#: scm/custom-vars.lisp:283
+#: scm/custom-vars.lisp:299
 msgid "[Global] end of preedit"
 msgstr ""
 
-#: scm/custom-vars.lisp:289
+#: scm/custom-vars.lisp:305
 msgid "[Global] erase after cursor"
 msgstr ""
 
-#: scm/custom-vars.lisp:295
+#: scm/custom-vars.lisp:311
 msgid "[Global] erase before cursor"
 msgstr ""
 
-#: scm/custom-vars.lisp:301
+#: scm/custom-vars.lisp:317
 msgid "[Global] backspace"
 msgstr ""
 
-#: scm/custom-vars.lisp:307
+#: scm/custom-vars.lisp:323
 msgid "[Global] delete"
 msgstr ""
 
-#: scm/custom-vars.lisp:313
+#: scm/custom-vars.lisp:329
 msgid "[Global] left"
 msgstr ""
 
-#: scm/custom-vars.lisp:319
+#: scm/custom-vars.lisp:335
 msgid "[Global] right"
 msgstr ""
 
-#: scm/custom-vars.lisp:325
+#: scm/custom-vars.lisp:341
 msgid "[Global] return"
 msgstr ""
 
-#: scm/custom-vars.lisp:339 scm/custom-vars.lisp:383 scm/custom-vars.lisp:512
-#: scm/custom-vars.lisp:639
+#: scm/custom-vars.lisp:355 scm/custom-vars.lisp:399 scm/custom-vars.lisp:507
+#: scm/custom-vars.lisp:661
 msgid "Use candidate window"
 msgstr ""
 
-#: scm/custom-vars.lisp:345 scm/custom-vars.lisp:389 scm/custom-vars.lisp:518
-#: scm/custom-vars.lisp:645
+#: scm/custom-vars.lisp:361 scm/custom-vars.lisp:405 scm/custom-vars.lisp:513
+#: scm/custom-vars.lisp:667
 msgid "Conversion key press count to show candidate window"
 msgstr ""
 
-#: scm/custom-vars.lisp:351 scm/custom-vars.lisp:395 scm/custom-vars.lisp:524
-#: scm/custom-vars.lisp:588 scm/custom-vars.lisp:651
+#: scm/custom-vars.lisp:367 scm/custom-vars.lisp:411 scm/custom-vars.lisp:519
+#: scm/custom-vars.lisp:610 scm/custom-vars.lisp:673
 msgid "Number of candidates in candidate window at a time"
 msgstr ""
 
-#: scm/custom-vars.lisp:357
+#: scm/custom-vars.lisp:373
 msgid "Select candidate by numeral keys"
 msgstr ""
 
-#: scm/custom-vars.lisp:363 scm/custom-vars.lisp:401
+#: scm/custom-vars.lisp:379 scm/custom-vars.lisp:417
 msgid "Show segment separator"
 msgstr ""
 
-#: scm/custom-vars.lisp:369 scm/custom-vars.lisp:407
+#: scm/custom-vars.lisp:385 scm/custom-vars.lisp:423
 msgid "Segment separator"
 msgstr ""
 
-#: scm/custom-vars.lisp:414
+#: scm/custom-vars.lisp:430
 msgid "Canna server"
 msgstr ""
 
-#: scm/custom-vars.lisp:420
+#: scm/custom-vars.lisp:436
 msgid "Use Canna server"
 msgstr ""
 
-#: scm/custom-vars.lisp:426
+#: scm/custom-vars.lisp:442
 msgid "Canna server name"
 msgstr ""
 
-#: scm/custom-vars.lisp:492
-msgid "Dictionary file"
-msgstr ""
-
-#: scm/custom-vars.lisp:499
-msgid "Personal dictionary file"
-msgstr ""
-
-#: scm/custom-vars.lisp:506
-msgid "Personal dictionary file (dedicated to uim)"
-msgstr ""
-
-#: scm/custom-vars.lisp:530
+#: scm/custom-vars.lisp:525
 msgid "ddskk"
 msgstr ""
 
-#: scm/custom-vars.lisp:530
+#: scm/custom-vars.lisp:525
 msgid "Similar to ddskk"
 msgstr ""
 
-#: scm/custom-vars.lisp:532
+#: scm/custom-vars.lisp:527
 msgid "Visual style"
 msgstr ""
 
-#: scm/custom-vars.lisp:538
+#: scm/custom-vars.lisp:533
 msgid "Use recursive learning"
 msgstr ""
 
-#: scm/custom-vars.lisp:544
+#: scm/custom-vars.lisp:539
 msgid "Use Enter key as just committing (egg-like operation)"
 msgstr ""
 
-#: scm/custom-vars.lisp:550
+#: scm/custom-vars.lisp:545
 msgid "Commit newline as ASCII string instead of native key-event"
 msgstr ""
 
-#: scm/custom-vars.lisp:556
+#: scm/custom-vars.lisp:551
 msgid "Use numeric conversion"
 msgstr ""
 
-#: scm/custom-vars.lisp:562
+#: scm/custom-vars.lisp:557
 msgid "Friendly for vi user"
 msgstr ""
 
-#: scm/custom-vars.lisp:594
+#: scm/custom-vars.lisp:563
+msgid "Commit candidate by heading label keys"
+msgstr ""
+
+#: scm/custom-vars.lisp:570
+msgid "Dictionary file"
+msgstr ""
+
+#: scm/custom-vars.lisp:577
+msgid "Personal dictionary file"
+msgstr ""
+
+#: scm/custom-vars.lisp:584
+msgid "Personal dictionary file (dedicated to uim)"
+msgstr ""
+
+#: scm/custom-vars.lisp:616
 msgid "Always showing candidate window"
 msgstr ""
 
-#: scm/custom-vars.lisp:600
+#: scm/custom-vars.lisp:622
 msgid "Enable auto register mode"
 msgstr ""
 
-#: scm/custom-vars.lisp:606
+#: scm/custom-vars.lisp:628
 msgid "Enable pseudo mode cursor"
 msgstr ""
 
-#: scm/custom-vars.lisp:612
+#: scm/custom-vars.lisp:634
 msgid "Show candidate annotations"
 msgstr ""
 
-#: scm/custom-vars.lisp:619
+#: scm/custom-vars.lisp:641
 msgid "Mask preedit strings (For T-Code users)"
 msgstr ""
 
-#: scm/custom-vars.lisp:633
+#: scm/custom-vars.lisp:655
 msgid "Other input methods"
 msgstr ""
 
@@ -820,7 +841,7 @@
 msgid "PinYin input method (Big5 version)"
 msgstr ""
 
-#: scm/skk.lisp:1582
+#: scm/skk.lisp:1608
 msgid "Uim's SKK like input method"
 msgstr ""
 

Modified: trunk/scm/custom-vars.scm
===================================================================
--- trunk/scm/custom-vars.scm	2005-01-13 09:29:13 UTC (rev 274)
+++ trunk/scm/custom-vars.scm	2005-01-13 10:29:50 UTC (rev 275)
@@ -204,6 +204,22 @@
   (_ "Preedit color")
   (_ "long description will be here."))
 
+;; referred by some bridges
+(define-custom 'candidate-window-position 'caret
+  '(global)
+  (list 'choice
+	(list 'caret
+	      (_ "Adjacent to caret")
+	      (_ "Adjacent to caret"))
+	(list 'left
+	      (_ "Left end of preedit area")
+	      (_ "Left end of preedit area"))
+	(list 'right
+	      (_ "Right end of preedit area")
+	      (_ "Right end of preedit area")))
+  (_ "Candidate window position")
+  (_ "long description will be here."))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; global-keys

Modified: trunk/scm/util.scm
===================================================================
--- trunk/scm/util.scm	2005-01-13 09:29:13 UTC (rev 274)
+++ trunk/scm/util.scm	2005-01-13 10:29:50 UTC (rev 275)
@@ -446,6 +446,16 @@
       (if (not (null? (cdr style)))
 	  (update-style style-spec (cdr style))))))
 
+;; for backward compatibility
+(define uim-symbol-value-str
+  (lambda (sym)
+    (let ((val (if (symbol-bound? sym)
+		   (symbol-value sym)
+		   "")))
+      (if (symbol? val)
+	  (symbol->string val)
+	  val))))
+
 ;;
 ;; Preedit color related configurations and functions.
 ;;

Modified: trunk/uim/uim-compat-scm.c
===================================================================
--- trunk/uim/uim-compat-scm.c	2005-01-13 09:29:13 UTC (rev 274)
+++ trunk/uim/uim-compat-scm.c	2005-01-13 10:29:50 UTC (rev 275)
@@ -115,7 +115,12 @@
 char *
 uim_symbol_value_str(const char *symbol_str)
 {
-  return uim_scm_symbol_value_str(symbol_str);
+  char *val;
+
+  UIM_EVAL_FSTRING1(NULL, "(uim-symbol-value-str '%s)", symbol_str);
+  val = uim_scm_c_str(uim_scm_return_value());
+
+  return val;
 }
 
 uim_lisp

