[uim-commit] r429 - trunk/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-01-31 08:41:11 -0800 (Mon, 31 Jan 2005)
New Revision: 429

Modified:
   trunk/scm/generic.scm
   trunk/scm/latin.scm
   trunk/scm/viqr.scm
Log:
* scm/generic.scm
  - (ascii-rule): New variable. This rule is defined as dump
    ASCII-to-ASCII map
* scm/latin.scm
  - (latin-im-rule): New variable. This rule is define as combination
    of ascii-rule and latin-compose-rule
  - (latin-init-handler): Replace latin-compose-rule with
    latin-im-rule. This enables typing ASCII characters on 'on' mode
    of the IM

* scm/viqr.scm
  - Add lacking (require "generic.scm")


Modified: trunk/scm/generic.scm
===================================================================
--- trunk/scm/generic.scm	2005-01-31 16:09:46 UTC (rev 428)
+++ trunk/scm/generic.scm	2005-01-31 16:41:11 UTC (rev 429)
@@ -50,6 +50,13 @@
 
 ;;; implementations
 
+(define ascii-rule
+  (map (compose (lambda (entry)
+		  (list (list entry) entry))
+		list
+		charcode->string)
+       (iota 127 32)))
+
 (define generic-prepare-activation
   (lambda (gc)
     (let ((rkc (generic-context-rk-context gc)))

Modified: trunk/scm/latin.scm
===================================================================
--- trunk/scm/latin.scm	2005-01-31 16:09:46 UTC (rev 428)
+++ trunk/scm/latin.scm	2005-01-31 16:41:11 UTC (rev 429)
@@ -566,9 +566,12 @@
 ((("\\" "~" "u" ))("ũ"))
 ))
 
+(define latin-im-rule
+  (append ascii-rule latin-compose-rule))
+
 (define latin-init-handler
   (lambda (id im arg)
-    (generic-context-new id im latin-compose-rule #f)))
+    (generic-context-new id im latin-im-rule #f)))
 
 (generic-register-im
  'latin

Modified: trunk/scm/viqr.scm
===================================================================
--- trunk/scm/viqr.scm	2005-01-31 16:09:46 UTC (rev 428)
+++ trunk/scm/viqr.scm	2005-01-31 16:41:11 UTC (rev 429)
@@ -28,6 +28,8 @@
 ;;; SUCH DAMAGE.
 ;;;;
 
+(require "generic.scm")
+
 (define viqr-rule
   '(
 ((("A" ))("A"))