Author: yusuke
Date: Mon Mar 7 06:27:51 2005
New Revision: 764
Modified:
trunk/scm/japanese-azik.scm
trunk/scm/japanese.scm
trunk/scm/skk-custom.scm
trunk/scm/skk.scm
Log:
* scm/japanese-azik.scm
AZIK support again. Thanks to OHASHI-san [anthy-dev 1922]
- (ja-azik-rule-basic): renamed from ja-azik-rule
- (ja-azik-rule): new procedure to compose azik table
* scm/japanese.scm
- (load-azik-table): use ja-azik-rule
* scm/skk-custom.scm
- (skk-use-azik): new custom item
* scm/skk.scm
- use azik rule if specified so
Modified: trunk/scm/japanese-azik.scm
==============================================================================
--- trunk/scm/japanese-azik.scm (original)
+++ trunk/scm/japanese-azik.scm Mon Mar 7 06:27:51 2005
@@ -28,7 +28,7 @@
;;; SUCH DAMAGE.
;;;;
-(define ja-azik-rule
+(define ja-azik-rule-basic
'(
(((":"). ())("��" "��" "��"))
@@ -520,3 +520,5 @@
((("z" "y" "z"). ())(("��" "��" "����") ("��" "��" "��") ("��" "��" "��")))
((("z" "z"). ())(("��" "��" "����") ("��" "��" "��")))
))
+
+(define ja-azik-rule (append ja-azik-rule-basic ja-rk-rule-basic))
Modified: trunk/scm/japanese.scm
==============================================================================
--- trunk/scm/japanese.scm (original)
+++ trunk/scm/japanese.scm Mon Mar 7 06:27:51 2005
@@ -748,7 +748,7 @@
(define load-azik-table
(lambda ()
(require "japanese-azik.scm")
- (set! ja-rk-rule (append ja-azik-rule ja-rk-rule-basic))
+ (set! ja-rk-rule ja-azik-rule)
(define-key skk-prev-candidate-key? 'generic-prev-candidate-key?)
(define-key skk-kana-toggle-key? "@")
(define-key skk-kanji-mode-key? "`")
Modified: trunk/scm/skk-custom.scm
==============================================================================
--- trunk/scm/skk-custom.scm (original)
+++ trunk/scm/skk-custom.scm Mon Mar 7 06:27:51 2005
@@ -207,6 +207,12 @@
(_ "Use recursive learning")
(_ "long description will be here."))
+(define-custom 'skk-use-azik? #f
+ '(skk-advanced)
+ '(boolean)
+ (_ "AZIK extended romaji input mode")
+ (_ "long description will be here."))
+
(define-custom 'skk-use-numeric-conversion? #t
'(skk-advanced)
'(boolean)
Modified: trunk/scm/skk.scm
==============================================================================
--- trunk/scm/skk.scm (original)
+++ trunk/scm/skk.scm Mon Mar 7 06:27:51 2005
@@ -44,6 +44,7 @@
;;
;;
(require "japanese.scm")
+(require "japanese-azik.scm")
(require-custom "generic-key-custom.scm")
(require-custom "skk-custom.scm")
(require-custom "skk-key-custom.scm")
@@ -301,6 +302,7 @@
(skk-read-personal-dictionary)))
(let ((sc (skk-context-new-internal id im))
(rkc (rk-context-new ja-rk-rule #t #f)))
+ (if skk-use-azik? (rk-context-set-rule! rkc ja-azik-rule))
(skk-context-set-widgets! sc skk-widgets)
(skk-context-set-head! sc '())
(skk-context-set-rk-context! sc rkc)
