[uim-commit] r352 - in trunk: . gtk scm test
yamaken@freedesktop.org
yamaken@freedesktop.org
Mon Jan 24 17:11:48 PST 2005
Author: yamaken
Date: 2005-01-24 17:11:45 -0800 (Mon, 24 Jan 2005)
New Revision: 352
Modified:
trunk/configure.ac
trunk/gtk/Makefile.am
trunk/scm/Makefile.am
trunk/scm/custom-rt.scm
trunk/scm/custom.scm
trunk/scm/im-custom.scm
trunk/scm/im.scm
trunk/scm/lazy-load.scm
trunk/scm/loader.scm
trunk/scm/uim-sh.scm
trunk/test/test-custom-rt.scm
trunk/test/test-im.scm
trunk/test/test-lazy-load.scm
trunk/test/test-plugin.scm
Log:
* This commit complements install-time configuration ability of
enabled-im-list and lazy-loading features. New behaviors of changed
procedures are not validated by unit test yet
At now, there are some weird fileset organizations and complex
variable handlings involving uim-custom, lazy-loading and
enabled-im-list. Some of them came from limited architectural change
of uim 0.4.6, some of others are intentionally made as development
step for future restructure of uim, and some others simply need
discussions. Ask me any intention, specification, usage or doubt
* configure.ac
- Define new AM_CONDITIONAL PRIME, SKK as always true. Add configure
option handlings if you want
* scm/Makefile.am
- (SCM_FILES): Add installed-modules.scm and enabled-ims.scm
- Add generation rules for installed-modules.scm and enabled-ims.scm
* scm/loader.scm
- (installed-im-module-list): Move to installed-modules.scm which is
generated automatically on install-time
- Add (load "installed-modules.scm")
- Support stub-im and enabled-im-list for lazy-loading that had been
configured in install-time. The data is acquired by loading
enabled-ims.scm
* scm/im.scm
- (enabled-im-list): New variable
- (normalize-im-list): Add a comment about inconsistency between
im-list and corresponding IM management entity in C-side
(uim_im_array)
- (register-im): Sense enabled-im-list to reject disabled IMs of a
IM module on lazy-loading. For example, a stub-im entry such as
hangul2 will also load unnecessary and disabled hangul3 and romaja
without this workaround
* scm/im-custom.scm
- (custom-installed-im-list): Remove 'direct' IM from enabled-im-list
- (custom-hook-literalize-enabled-im-list): Add definition of
per-user-enabled-im-list-loaded? and im-lazy-loading-enabled? in
accordance with install-time configurations
* scm/lazy-load.scm
- (stub-im-generate-stub-im-list): Replace determination logic of
lazy-loading in accordance with install-time configurations
* scm/custom.scm
- Cosmetic change
- (custom-reload-customs): Simplify
- (custom-full-featured?): New variable
* scm/custom-rt.scm
- (custom-full-featured?): New variable
* scm/uim-sh.scm
- (uim-sh-opt-strict-batch): New variable
- (uim-sh-loop, uim-sh-parse-args, uim-sh-usage): Support new -B
option (strict batch mode)
* test/test-lazy-load.scm
- (test stub-im-generate-stub-im-list, test
stub-im-generate-all-stub-im-list): Follow specification change of
stub-im-generate-stub-im-list
- svn propset svn:executable ON
* test/test-im.scm
- (testcase im im-management): Add temporary workaround to cheat on
revised register-im to setup proc. It should be rewritten as
proper tests in accordance with new enabled-im-list handlings of
register-im
* test/test-custom-rt.scm
* test/test-plugin.scm
- svn propset svn:executable ON
* gtk/Makefile.am
- Fix a spacing
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/configure.ac 2005-01-25 01:11:45 UTC (rev 352)
@@ -324,6 +324,8 @@
AM_CONDITIONAL(SCIM, test x$use_scim = xyes)
AM_CONDITIONAL(ANTHY, test x$use_anthy = xyes)
AM_CONDITIONAL(CANNA, test x$use_canna = xyes)
+AM_CONDITIONAL(PRIME, true)
+AM_CONDITIONAL(SKK, true)
AM_CONDITIONAL(GTK2, test x$use_gtk2 = xyes)
AM_CONDITIONAL(GTK2_4, test x$use_gtk2_4 = xyes)
AM_CONDITIONAL(GNOME2, test x$use_gnome2 = xyes)
Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/gtk/Makefile.am 2005-01-25 01:11:45 UTC (rev 352)
@@ -29,6 +29,6 @@
else
install-data-hook:
- uninstall-hook:
+uninstall-hook:
endif
Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/Makefile.am 2005-01-25 01:11:45 UTC (rev 352)
@@ -5,8 +5,9 @@
default.scm \
util.scm key.scm ustr.scm action.scm load-action.scm i18n.scm \
uim-sh.scm custom.scm custom-rt.scm \
+ installed-modules.scm enabled-ims.scm \
+ direct.scm \
rk.scm \
- direct.scm \
generic.scm generic-custom.scm generic-key-custom.scm \
pyload.scm PY.scm pyunihan.scm pinyin-big5.scm \
japanese.scm japanese-azik.scm japanese-kana.scm \
@@ -27,3 +28,48 @@
if COMPAT_TABLE
SCM_FILES += hk.scm
endif
+
+
+module_names = "pyload"
+
+if ANTHY
+ module_names += "anthy"
+endif
+
+if CANNA
+ module_names += "canna"
+endif
+
+if PRIME
+ module_names += "prime"
+endif
+
+if SKK
+ module_names += "skk"
+endif
+
+module_names += "tcode" "tutcode" "hangul" "viqr" "ipa" "latin"
+
+if M17NLIB
+ module_names += "m17nlib"
+endif
+
+if SCIM
+# module_names += "scim"
+endif
+
+installed-modules.scm:
+ echo ";; The described order of input methods affects which IM is preferred" >$@
+ echo ";; at the default IM selection process for each locale. i.e. list" >>$@
+ echo ";; preferable IM first for each language" >>$@
+ echo -n "(define installed-im-module-list '(" >>$@
+ echo -n '$(module_names)' >>$@
+ echo '))' >>$@
+
+# TODO: resolve dependency to $(top_builddir)/uim/uim-sh
+enabled-ims.scm: installed-modules.scm
+ echo ";; Don't edit this file manually" >$@
+ echo '(require "custom.scm") \
+ (puts (custom-hook-literalize-enabled-im-list))' \
+ | LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=${PWD} \
+ $(top_builddir)/uim/uim-sh -B >>$@
Modified: trunk/scm/custom-rt.scm
===================================================================
--- trunk/scm/custom-rt.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/custom-rt.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -43,6 +43,8 @@
(require "util.scm")
(require "key.scm")
+(define custom-full-featured? #f)
+
(define-record 'custom-choice-rec
'((sym #f)
(label "")
Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/custom.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -37,11 +37,9 @@
(require "util.scm")
(require "key.scm")
-;; private
-(define custom-rec-alist ())
-(define custom-group-rec-alist ())
-(define custom-subgroup-alist ())
+(define custom-full-featured? #t)
+;; public
(define custom-activity-hooks ())
(define custom-get-hooks ())
(define custom-set-hooks ())
@@ -50,6 +48,11 @@
(define custom-group-update-hooks ())
(define custom-group-list-update-hooks ())
+;; private
+(define custom-rec-alist ())
+(define custom-group-rec-alist ())
+(define custom-subgroup-alist ())
+
(define custom-validator-alist
'((boolean . custom-boolean?)
(integer . custom-integer?)
@@ -471,8 +474,6 @@
(define custom-reload-customs
(lambda ()
- (for-each (lambda (file)
- (load file))
- (reverse custom-required-custom-files))))
+ (for-each load (reverse custom-required-custom-files))))
(custom-reload-customs)
Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/im-custom.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -132,7 +132,8 @@
(begin
(if (symbol-bound? 'installed-im-module-list)
(for-each require-module installed-im-module-list))
- (custom-im-list-as-choice-rec (reverse im-list))))
+ (custom-im-list-as-choice-rec (reverse
+ (alist-delete 'direct im-list eq?)))))
(define-custom 'enabled-im-list
(map custom-choice-rec-sym custom-installed-im-list)
@@ -156,7 +157,8 @@
"(define enabled-im-list "
(custom-value-as-literal 'enabled-im-list)
")\n"
- "(require \"lazy-load.scm\")\n\n"
+ "(define per-user-enabled-im-list-loaded? #t)\n"
+ "(define im-lazy-loading-enabled? #t)\n\n"
(string-join "\n" (stub-im-generate-stub-im-list enabled-im-list)))))
(custom-add-hook 'enabled-im-list
Modified: trunk/scm/im.scm
===================================================================
--- trunk/scm/im.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/im.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -58,6 +58,11 @@
;;
(define im-list ())
+;; enabled-im-list cannot be changed once libuim has been
+;; initialized. This limitation may be removed after uim 0.4.6.
+;; -- YamaKen 2005-01-25
+(define enabled-im-list ())
+
(define-record 'im
(list
(list 'name #f) ;; must be first member
@@ -83,6 +88,12 @@
custom-prop-update-custom-handler
list)))
+;; Invoking this procedure causes inconsistency between im-list and
+;; corresponding IM management entity in C-side
+;; (uim_im_array). uim-im-switcher may show IM list in strange
+;; order. This inconsistency problem is also preventing IM removal
+;; feature implementation. We should resolve it after uim 0.4.6.
+;; -- YamaKen 2005-01-25
(define normalize-im-list
(lambda ()
(let ((ordinary-im-list (alist-delete 'direct im-list eq?))
@@ -97,14 +108,17 @@
(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 label-name short-desc
- init-arg init release
- mode key-press key-release reset
- get-candidate set-candidate-index prop
- currently-loading-module-name)))
- (set! im-list (alist-replace im im-list))
- (normalize-im-list)
- (im-register-im name lang encoding short-desc))))
+ (and (or (memq name enabled-im-list)
+ (not (assq 'direct im-list)) ;; bootstrap
+ custom-full-featured?)
+ (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
+ currently-loading-module-name)))
+ (set! im-list (alist-replace im im-list))
+ (normalize-im-list)
+ (im-register-im name lang encoding short-desc)))))
;; called from C
(define uim-get-im-short-desc
Modified: trunk/scm/lazy-load.scm
===================================================================
--- trunk/scm/lazy-load.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/lazy-load.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -29,8 +29,6 @@
;;; SUCH DAMAGE.
;;;;
-;; TODO: write test
-
(require "util.scm")
(define stub-im-generate-init-handler
@@ -75,15 +73,16 @@
(let* ((im (retrieve-im name))
(name-str (symbol->string name)))
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member '" name-str " enabled-im-list))\n"
- " (register-stub-im\n"
- " '" name-str "\n"
- " \"" (im-lang im) "\"\n"
- " \"" (im-encoding im) "\"\n"
- " \"" (im-label-name im) "\"\n"
- " \"" (im-short-desc im) "\"\n"
- " \"" (im-module-name im) "\"))\n")))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " '" name-str "\n"
+ " \"" (im-lang im) "\"\n"
+ " \"" (im-encoding im) "\"\n"
+ " \"" (im-label-name im) "\"\n"
+ " \"" (im-short-desc im) "\"\n"
+ " \"" (im-module-name im) "\")))\n")))
im-names)))
;; side effect: invoke require-module for all IM listed in
Modified: trunk/scm/loader.scm
===================================================================
--- trunk/scm/loader.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/loader.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -28,39 +28,14 @@
;;; SUCH DAMAGE.
;;;;
-;; The described order of input methods affects which IM is preferred
-;; at the default IM selection process for each locale. i.e. list
-;; preferable IM first for each language
-(define installed-im-module-list
- '(;; Chinese input methods
- "pyload"
+(load "installed-modules.scm")
- ;; Japanese input methods
- "anthy"
- "canna"
- "prime"
- "skk"
- "tcode"
- "tutcode"
-
- ;; Korean input methods
- "hangul"
-
- ;; Vietnamese input methods
- "viqr"
-
- ;; other input methods
- "ipa"
- ;;"spellcheck"
-
- ;; latin input method
- "latin"
-
- ;; other input method frameworks
- "m17nlib"
- ;;"scim"
- ))
-
-;; don't touch this
-(if (not (symbol-bound? '*lazy-load.scm-loaded*))
- (for-each require-module installed-im-module-list))
+(or (and (symbol-bound? 'per-user-enabled-im-list-loaded?)
+ per-user-enabled-im-list-loaded?)
+ (and (symbol-bound? 'im-lazy-loading-enabled?)
+ im-lazy-loading-enabled?
+ (try-load "enabled-ims.scm"))
+ (begin
+ (for-each require-module installed-im-module-list)
+ (define enabled-im-list (reverse (cons 'direct
+ (map im-name im-list))))))
Modified: trunk/scm/uim-sh.scm
===================================================================
--- trunk/scm/uim-sh.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/scm/uim-sh.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -32,6 +32,7 @@
(define uim-sh-prompt "uim> ")
(define uim-sh-opt-batch #f)
+(define uim-sh-opt-strict-batch #f)
(define uim-sh-opt-help #f)
(define uim-sh-loop
@@ -42,21 +43,31 @@
(eof (eq? (eof-val) expr)))
(if (not eof)
(begin
- (print (eval expr))
+ ((if uim-sh-opt-strict-batch
+ (lambda () #f)
+ print)
+ (eval expr))
(uim-sh-loop))
#f))))
(define uim-sh-parse-args
(lambda (args)
- (set! uim-sh-opt-batch (or (string-find args "-b")
- (string-find args "--batch")))
- (set! uim-sh-opt-help (or (string-find args "-h")
- (string-find args "--help")))))
+ (let ((batch? (or (member "-b" args)
+ (member "--batch" args)))
+ (strict-batch? (or (member "-B" args)
+ (member "--strict-batch" args))))
+ (set! uim-sh-opt-batch (or batch?
+ strict-batch?))
+ (set! uim-sh-opt-strict-batch strict-batch?)
+ (set! uim-sh-opt-help (or (member "-h" args)
+ (member "--help" args))))))
(define uim-sh-usage
(lambda ()
(puts "Usage: uim-sh [options]
-b batch mode. suppress shell prompts
+ -B strict batch mode, implies -b. suppress shell prompts and
+ evaluated results
-h show this help
")))
Property changes on: trunk/test/test-custom-rt.scm
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/test/test-im.scm
===================================================================
--- trunk/test/test-im.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/test/test-im.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -48,12 +48,15 @@
(define-uim-test-case "testcase im im-management"
(setup
(lambda ()
- (uim '(for-each require-module installed-im-module-list))
- (uim '(define prev-im #f))
- (uim '(define prev-nr-ims (length im-list)))
- (uim '(define test-im-init-args #f))
- (uim '(define test-im-alt-init-args #f))
(uim '(begin
+ (for-each require-module installed-im-module-list)
+ (define prev-im #f)
+ (define prev-nr-ims (length im-list))
+ (define test-im-init-args #f)
+ (define test-im-alt-init-args #f)
+ ;; temporary workaround to cheat on revised register-im
+ ;; TODO: rewrite tests in accordance with enabled-im-list
+ (define custom-full-featured? #t)
(set! test-im-init-args (list 'test-im
"ja"
"UTF-8"
Modified: trunk/test/test-lazy-load.scm
===================================================================
--- trunk/test/test-lazy-load.scm 2005-01-24 23:53:40 UTC (rev 351)
+++ trunk/test/test-lazy-load.scm 2005-01-25 01:11:45 UTC (rev 352)
@@ -132,72 +132,78 @@
(uim '(stub-im-generate-stub-im-list ())))
(assert-equal (list
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul2 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul2))))
(assert-equal (list
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul3 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul3))))
(assert-equal (list
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'tcode enabled-im-list))\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n"))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")))\n"))
(uim '(stub-im-generate-stub-im-list '(tcode))))
(assert-equal (list
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul2 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n")
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")))\n")
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'tcode enabled-im-list))\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n")
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")))\n")
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul3 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul2 tcode hangul3)))))
("test stub-im-generate-all-stub-im-list"
@@ -208,35 +214,38 @@
im-list)))
(assert-equal (list
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'tcode enabled-im-list))\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n")
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")))\n")
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul2 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n")
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")))\n")
(string-append
- "(if (and (symbol-bound? '*lazy-load.scm-loaded*)\n"
- " (member 'hangul3 enabled-im-list))\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ "(if im-lazy-loading-enabled?\n"
+ " (begin\n"
+ " (require \"lazy-load.scm\")\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")))\n"))
(uim '(stub-im-generate-all-stub-im-list)))
(uim '(set! im-list ()))
Property changes on: trunk/test/test-lazy-load.scm
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: trunk/test/test-plugin.scm
___________________________________________________________________
Name: svn:executable
+ *
More information about the Uim-commit
mailing list