From: handa <handa>
Date: Thu, 3 Jul 2008 00:46:48 +0000 (+0000)
Subject: Use @-1 instead of @- to refer to the previous character.
X-Git-Tag: REL-1-5-3~69
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=09ee9dbeed328eeee7a790f9d0d73e5c40843f14;p=m17n%2Fm17n-db.git

Use @-1 instead of @- to refer to the previous character.
---

diff --git a/MIM/cmc-kbd.mim b/MIM/cmc-kbd.mim
index 09104df..56b1b1f 100644
--- a/MIM/cmc-kbd.mim
+++ b/MIM/cmc-kbd.mim
@@ -191,7 +191,7 @@ Backspace and Delete also work in the manner of visual order."))
      )
 
   (independent
-   (set C @-) (set PREV @-2)
+   (set C @-1) (set PREV @-2)
    (cond ((= PREV PM)
 	  (set PREV @-3)
 	  (cond ((| (= PREV PV1) (= PREV PV2))
@@ -204,14 +204,14 @@ Backspace and Delete also work in the manner of visual order."))
 		 (delete @-2) (insert C) (insert PREV))))))
 
   (pre-vowel
-   (set C @-) (set NEXT @+1)
+   (set C @-1) (set NEXT @+1)
    (cond ((& (>= NEXT 0xAA00) (<= NEXT 0xAA28))
 	  (delete @-1) (delete @+1) (insert NEXT) (insert C) (set NEXT @+1)))
    (cond ((& (>= NEXT 0xAA33) (<= NEXT 0xAA36))
 	  (delete @-1) (delete @+1) (insert NEXT) (insert C))))
 
   (pre-medial
-   (set C @-) (set NEXT @+1)
+   (set C @-1) (set NEXT @+1)
    (cond ((& (>= NEXT 0xAA00) (<= NEXT 0xAA28))
 	  (delete @-1) (delete @+1) (insert NEXT) (insert C))))
 
diff --git a/MIM/si-wijesekera-preedit.mim b/MIM/si-wijesekera-preedit.mim
index 5b8335a..9abc5e1 100644
--- a/MIM/si-wijesekera-preedit.mim
+++ b/MIM/si-wijesekera-preedit.mim
@@ -118,7 +118,7 @@ This input method uses preedit rather than surrounding text.
   ("E"
    (cond
     ((= @- 0x0D85) (delete @-) "ඈ")	; 0D88
-    ((& (= @-2 0x0DC5) (= @- 0x0DD4))
+    ((& (= @-2 0x0DC5) (= @-1 0x0DD4))
      (delete @-) "ූ")			; 0DD6
     (1 "ෑ")))				; 0DD1
   ("s" "ි")				; 0DD2
@@ -146,14 +146,14 @@ This input method uses preedit rather than surrounding text.
 
   ("H"					; yansaya (0DCA 200D 0DBA)
    (cond
-    ((| (= @- 0x0DD9) (= @- 0x0DDB))
+    ((| (= @-1 0x0DD9) (= @-1 0x0DDB))
      (move @-) "්‍ය" (move @>))
     (1
      "්‍ය")))
 
   ("`"					; rakaransaya (0DCA 200D 0DBB)
    (cond
-    ((| (= @- 0x0DD2) (= @- 0x0DD3) (= @- 0x0DD9) (= @- 0x0DDB))
+    ((| (= @-1 0x0DD2) (= @-1 0x0DD3) (= @-1 0x0DD9) (= @-1 0x0DDB))
      (move @-) "්‍ර" (move @>))
     (1 "්‍ර")))
 
@@ -185,9 +185,9 @@ This input method uses preedit rather than surrounding text.
   (dependent)
   (join
    (cond
-    ((| (= @- 0x0DD9) (= @- 0x0DDB))
+    ((| (= @-1 0x0DD9) (= @-1 0x0DDB))
      (shift join-state))
-    ((| (< @- 0x0D9A) (> @- 0x0DC6))
+    ((| (< @-1 0x0D9A) (> @-1 0x0DC6))
      (undo -1))
     (1
      (shift join-state))))
@@ -199,7 +199,7 @@ This input method uses preedit rather than surrounding text.
    (mark p))
   (independent
    (move p)
-   (set c @-)
+   (set c @-1)
    (cond
     ((| (= c 0x0DD9) (= c 0x0DDB))
      (delete @-)