Revision: 7286
Author: nogu.dev
Date: Fri Sep 9 21:57:37 2011
Log: * scm/japanese-custom.scm
- (ja-rk-rule-keep-consonant?): Don't update ja-rk-rule-basic.
- (ja-rk-rule-type): Remove hook
because we have hook for ja-rk-rule-table-basic
* scm/japanese.scm
- (ja-rk-rule-keep-consonant-update): New.
- (ja-rk-rule-update)
* Add comments.
* Use ja-rk-rule-keep-consonant-update.
http://code.google.com/p/uim/source/detail?r=7286
Modified:
/trunk/scm/japanese-custom.scm
/trunk/scm/japanese.scm
=======================================
--- /trunk/scm/japanese-custom.scm Fri Sep 9 19:58:21 2011
+++ /trunk/scm/japanese-custom.scm Fri Sep 9 21:57:37 2011
@@ -675,9 +675,9 @@
(custom-add-hook 'ja-rk-rule-keep-consonant?
'custom-set-hooks
(lambda ()
- (ja-rk-rule-update)))
-
-(custom-add-hook 'ja-rk-rule-type
+ (ja-rk-rule-keep-consonant-update)))
+
+(custom-add-hook 'ja-rk-rule-table-basic
'custom-set-hooks
(lambda ()
(and
@@ -689,10 +689,3 @@
'custom-activity-hooks
(lambda ()
(eq? ja-rk-rule-type 'custom)))
-
-(custom-add-hook 'ja-rk-rule-table-basic
- 'custom-set-hooks
- (lambda ()
- (set! ja-rk-rule-basic
- (ja-rk-rule-table->rule ja-rk-rule-table-basic))
- (ja-rk-rule-update)))
=======================================
--- /trunk/scm/japanese.scm Fri Sep 9 20:38:59 2011
+++ /trunk/scm/japanese.scm Fri Sep 9 21:57:37 2011
@@ -393,12 +393,8 @@
(filter (lambda (x) (not (string=? "n" x)))
(map car ja-consonant-syllable-table))))
-(define ja-rk-rule-update
+(define ja-rk-rule-keep-consonant-update
(lambda ()
- (and
- (eq? ja-rk-rule-type 'custom)
- (set! ja-rk-rule-basic
- (ja-rk-rule-table->rule ja-rk-rule-table-basic)))
(if ja-rk-rule-keep-consonant?
(set! ja-rk-rule (append ja-rk-rule-consonant-to-keep
ja-rk-rule-basic
@@ -406,6 +402,23 @@
(set! ja-rk-rule (append ja-rk-rule-basic
ja-rk-rule-additional)))))
+;; In ja-rk-rule-update,
+;; don't set ja-rk-rule-basic to ja-rk-rule-basic-uim
+;;
+;; If you do so, when
+;; 1) users call ja-rk-rule-update
+;; in ~/.uim and ja-rk-rule-type is 'uim
+;; 2) ja-rk-rule-type is 'uim (default value)
+;; ja-rk-rule-basic is always overriden
+;; with ja-rk-rule-basic-uim.
+;; This is an unwanted behavior for users.
+(define ja-rk-rule-update
+ (lambda ()
+ (and
+ (eq? ja-rk-rule-type 'custom)
+ (set! ja-rk-rule-basic
+ (ja-rk-rule-table->rule ja-rk-rule-table-basic)))
+ (ja-rk-rule-keep-consonant-update)))
;;; Convert EUC-JP code to EUC-JP string (cf. ucs->utf8-string in
ichar.scm)
(define (ja-euc-jp-code->euc-jp-string code)
