From a5ee4dc6ff1db6645f0602fc20b83e220d1b86dc Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 12 Mar 2010 08:37:42 +0000
Subject: [PATCH] *** empty log message ***

---
 MIM/cmc-kbd.mimx           |   69 +++++++++----------
 MIM/si-wijesekera.mimx     |   84 ++++++++++++-----------
 MIM/ta-lk-renganathan.mimx |  161 ++++++++++++++++++++++----------------------
 3 files changed, 159 insertions(+), 155 deletions(-)

diff --git a/MIM/cmc-kbd.mimx b/MIM/cmc-kbd.mimx
index ad1a7d7..4f65902 100644
--- a/MIM/cmc-kbd.mimx
+++ b/MIM/cmc-kbd.mimx
@@ -4,6 +4,7 @@
     <language>cmc</language>
     <name>kbd</name>
   </tags>
+  <m17n-version>1.6.0</m17n-version>
   <description>
     <gettext>Cham input method simulating Cham keyboard.
 Cham characters are encoded in logical order in memory and in files.
@@ -779,7 +780,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
             </set>
             <cond>
               <list>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="PREV"/>
                     <integer>0xAA00</integer>
@@ -788,7 +789,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     <varref vname="PREV"/>
                     <integer>0xAA28</integer>
                   </le>
-                </and>
+                </logand>
                 <delete>
                   <marker>@-2</marker>
                 </delete>
@@ -803,7 +804,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
             </cond>
           </list>
           <list>
-            <or>
+            <logior>
               <eq>
                 <varref vname="PREV"/>
                 <varref vname="PV1"/>
@@ -812,7 +813,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="PREV"/>
                 <varref vname="PV2"/>
               </eq>
-            </or>
+            </logior>
             <cond>
               <list>
                 <eq>
@@ -823,7 +824,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </eq>
                 <cond>
                   <list>
-                    <and>
+                    <logand>
                       <ge>
                         <char-at>
                           <marker>@-3</marker>
@@ -836,7 +837,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                         </char-at>
                         <integer>0xAA28</integer>
                       </le>
-                    </and>
+                    </logand>
                     <delete>
                       <marker>@-4</marker>
                     </delete>
@@ -854,7 +855,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </cond>
               </list>
               <list>
-                <and>
+                <logand>
                   <ge>
                     <char-at>
                       <marker>@-2</marker>
@@ -867,7 +868,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     </char-at>
                     <integer>0xAA28</integer>
                   </le>
-                </and>
+                </logand>
                 <delete>
                   <marker>@-2</marker>
                 </delete>
@@ -895,12 +896,12 @@ Backspace and Delete also work in the manner of visual order.</gettext>
         </keyseq>
         <set vname="NEXT">
           <char-at>
-            <marker>@+1</marker>
+            <marker>@+0</marker>
           </char-at>
         </set>
         <cond>
           <list>
-            <and>
+            <logand>
               <ge>
                 <varref vname="NEXT"/>
                 <integer>0xAA00</integer>
@@ -909,10 +910,10 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="NEXT"/>
                 <integer>0xAA28</integer>
               </le>
-            </and>
+            </logand>
             <set vname="N2">
               <char-at>
-                <marker>@+2</marker>
+                <marker>@+1</marker>
               </char-at>
             </set>
             <cond>
@@ -923,12 +924,12 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </eq>
                 <set vname="N3">
                   <char-at>
-                    <marker>@+3</marker>
+                    <marker>@+2</marker>
                   </char-at>
                 </set>
                 <cond>
                   <list>
-                    <or>
+                    <logior>
                       <eq>
                         <varref vname="N3"/>
                         <varref vname="PV1"/>
@@ -937,7 +938,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                         <varref vname="N3"/>
                         <varref vname="PV2"/>
                       </eq>
-                    </or>
+                    </logior>
                     <delete>
                       <marker>@+3</marker>
                     </delete>
@@ -960,7 +961,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </cond>
               </list>
               <list>
-                <or>
+                <logior>
                   <eq>
                     <varref vname="N2"/>
                     <varref vname="PV1"/>
@@ -969,7 +970,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     <varref vname="N2"/>
                     <varref vname="PV2"/>
                   </eq>
-                </or>
+                </logior>
                 <delete>
                   <marker>@+2</marker>
                 </delete>
@@ -1028,7 +1029,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
             </set>
             <cond>
               <list>
-                <or>
+                <logior>
                   <eq>
                     <varref vname="PREV"/>
                     <varref vname="PV1"/>
@@ -1037,7 +1038,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     <varref vname="PREV"/>
                     <varref vname="PV2"/>
                   </eq>
-                </or>
+                </logior>
                 <delete>
                   <marker>@-3</marker>
                 </delete>
@@ -1052,7 +1053,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </insert>
               </list>
               <list>
-                <or>
+                <logior>
                   <lt>
                     <varref vname="PREV"/>
                     <integer>0xAA00</integer>
@@ -1061,7 +1062,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     <varref vname="PREV"/>
                     <integer>0xAA28</integer>
                   </gt>
-                </or>
+                </logior>
                 <delete>
                   <marker>@-2</marker>
                 </delete>
@@ -1075,7 +1076,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
             </cond>
           </list>
           <list>
-            <or>
+            <logior>
               <eq>
                 <varref vname="PREV"/>
                 <varref vname="PV1"/>
@@ -1084,7 +1085,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="PREV"/>
                 <varref vname="PV2"/>
               </eq>
-            </or>
+            </logior>
             <cond>
               <list>
                 <eq>
@@ -1095,7 +1096,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 </eq>
               </list>
               <list>
-                <or>
+                <logior>
                   <lt>
                     <char-at>
                       <marker>@-3</marker>
@@ -1108,7 +1109,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                     </char-at>
                     <integer>0xAA28</integer>
                   </gt>
-                </or>
+                </logior>
                 <delete>
                   <marker>@-2</marker>
                 </delete>
@@ -1131,12 +1132,12 @@ Backspace and Delete also work in the manner of visual order.</gettext>
         </set>
         <set vname="NEXT">
           <char-at>
-            <marker>@+1</marker>
+            <marker>@+0</marker>
           </char-at>
         </set>
         <cond>
           <list>
-            <and>
+            <logand>
               <ge>
                 <varref vname="NEXT"/>
                 <integer>0xAA00</integer>
@@ -1145,7 +1146,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="NEXT"/>
                 <integer>0xAA28</integer>
               </le>
-            </and>
+            </logand>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1160,14 +1161,14 @@ Backspace and Delete also work in the manner of visual order.</gettext>
             </insert>
             <set vname="NEXT">
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
             </set>
           </list>
         </cond>
         <cond>
           <list>
-            <and>
+            <logand>
               <ge>
                 <varref vname="NEXT"/>
                 <integer>0xAA33</integer>
@@ -1176,7 +1177,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="NEXT"/>
                 <integer>0xAA36</integer>
               </le>
-            </and>
+            </logand>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1200,12 +1201,12 @@ Backspace and Delete also work in the manner of visual order.</gettext>
         </set>
         <set vname="NEXT">
           <char-at>
-            <marker>@+1</marker>
+            <marker>@+0</marker>
           </char-at>
         </set>
         <cond>
           <list>
-            <and>
+            <logand>
               <ge>
                 <varref vname="NEXT"/>
                 <integer>0xAA00</integer>
@@ -1214,7 +1215,7 @@ Backspace and Delete also work in the manner of visual order.</gettext>
                 <varref vname="NEXT"/>
                 <integer>0xAA28</integer>
               </le>
-            </and>
+            </logand>
             <delete>
               <marker>@-1</marker>
             </delete>
diff --git a/MIM/si-wijesekera.mimx b/MIM/si-wijesekera.mimx
index b874121..3e579eb 100644
--- a/MIM/si-wijesekera.mimx
+++ b/MIM/si-wijesekera.mimx
@@ -4,19 +4,21 @@
     <language>si</language>
     <name>wijesekera</name>
   </tags>
+  <m17n-version>1.6.0</m17n-version>
   <description>Sinhala input method based on SLS 1134 Rev. 2:2004.
-  &lt;http://www.fonts.lk/doc/sin-kbd-layout4.pdf&gt;
-This input method uses surrounding text if possible, or a preedit
-buffer otherwise.
+  &lt;http://www.siyabas.lk/docs/sin-kbd-layout5.pdf&gt;
+Although this code supports both surrounding text and preedit,
+the former is disabled by default to avoid confusion caused by
+faulty applications.
 </description>
   <title>සි</title>
   <variable-list>
     <defvar vname="use-surrounding-text">
       <description>
-        <gettext>Surrounding text vs. preedit
+        <gettext>Surrounding text vs. preedit.
 If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       </description>
-      <integer>1</integer>
+      <integer>0</integer>
       <possible-value>
         <integer>1</integer>
         <integer>0</integer>
@@ -27,7 +29,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
     <defmacro fname="macro-forward">
       <set vname="cc3">
         <char-at>
-          <marker>@+3</marker>
+          <marker>@+2</marker>
         </char-at>
       </set>
       <cond>
@@ -35,13 +37,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logand>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0DCA</integer>
             </eq>
             <eq>
               <char-at>
-                <marker>@+2</marker>
+                <marker>@+1</marker>
               </char-at>
               <integer>0x200D</integer>
             </eq>
@@ -149,13 +151,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logior>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200C</integer>
             </eq>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200D</integer>
             </eq>
@@ -559,21 +561,21 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>S- </string>
+            <symbol>S- </symbol>
           </list>
         </keyseq>
       </rule>
       <rule>
         <keyseq>
           <list>
-            <string>A- </string>
+            <symbol>A- </symbol>
           </list>
         </keyseq>
       </rule>
       <rule>
         <keyseq>
           <list>
-            <string>A-,</string>
+            <symbol>A-,</symbol>
           </list>
         </keyseq>
       </rule>
@@ -587,7 +589,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-'</string>
+            <symbol>A-'</symbol>
           </list>
         </keyseq>
       </rule>
@@ -1013,7 +1015,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-,</string>
+            <symbol>A-,</symbol>
           </list>
         </keyseq>
         <insert>
@@ -1073,7 +1075,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-'</string>
+            <symbol>A-'</symbol>
           </list>
         </keyseq>
         <insert>
@@ -1147,7 +1149,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>S- </string>
+            <symbol>S- </symbol>
           </list>
         </keyseq>
         <insert>
@@ -1157,7 +1159,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A- </string>
+            <symbol>A- </symbol>
           </list>
         </keyseq>
         <insert>
@@ -1535,7 +1537,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
         </keyseq>
         <set vname="c">
           <char-at>
-            <marker>@+1</marker>
+            <marker>@+0</marker>
           </char-at>
         </set>
         <cond>
@@ -1559,7 +1561,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <funcall fname="macro-forward"/>
             <set vname="c">
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
             </set>
             <cond>
@@ -1651,7 +1653,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0DD9</integer>
               </eq>
@@ -2237,7 +2239,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0D91</integer>
                 </eq>
@@ -2255,27 +2257,27 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                 <logand>
                   <ge>
                     <char-at>
-                      <marker>@+1</marker>
+                      <marker>@+0</marker>
                     </char-at>
                     <integer>0x0D9A</integer>
                   </ge>
                   <le>
                     <char-at>
-                      <marker>@+1</marker>
+                      <marker>@+0</marker>
                     </char-at>
                     <integer>0x0DC6</integer>
                   </le>
                 </logand>
                 <set vname="c1">
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                 </set>
                 <cond>
                   <list>
                     <eq>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0DD9</integer>
                     </eq>
@@ -2287,7 +2289,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                   <list>
                     <eq>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0DCA</integer>
                     </eq>
@@ -2299,7 +2301,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                   <list>
                     <eq>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0DCF</integer>
                     </eq>
@@ -2311,7 +2313,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                   <list>
                     <eq>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0DDF</integer>
                     </eq>
@@ -2638,13 +2640,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <logior>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DD9</integer>
                 </eq>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DDB</integer>
                 </eq>
@@ -2665,7 +2667,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
         <funcall fname="macro-delete-following-zw"/>
         <set vname="c">
           <char-at>
-            <marker>@+1</marker>
+            <marker>@+0</marker>
           </char-at>
         </set>
         <cond>
@@ -2769,7 +2771,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DD9</integer>
                 </eq>
@@ -2786,7 +2788,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DDB</integer>
                 </eq>
@@ -2806,7 +2808,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DDA</integer>
                 </eq>
@@ -2826,7 +2828,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DDC</integer>
                 </eq>
@@ -2846,7 +2848,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0DDE</integer>
                 </eq>
@@ -2927,7 +2929,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-,</string>
+            <symbol>A-,</symbol>
           </list>
         </keyseq>
         <insert>
@@ -3333,7 +3335,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-'</string>
+            <symbol>A-'</symbol>
           </list>
         </keyseq>
         <insert>
@@ -3351,7 +3353,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>S- </string>
+            <symbol>S- </symbol>
           </list>
         </keyseq>
         <insert>
@@ -3361,7 +3363,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A- </string>
+            <symbol>A- </symbol>
           </list>
         </keyseq>
         <insert>
diff --git a/MIM/ta-lk-renganathan.mimx b/MIM/ta-lk-renganathan.mimx
index 377f18a..8caa106 100644
--- a/MIM/ta-lk-renganathan.mimx
+++ b/MIM/ta-lk-renganathan.mimx
@@ -4,6 +4,7 @@
     <language>ta</language>
     <name>lk-renganathan</name>
   </tags>
+  <m17n-version>1.6.0</m17n-version>
   <description>Tamil input method with Renganathan layout.
 For the detail, see the page: &lt;http://www.locallanguages.lk/&gt;
 </description>
@@ -40,7 +41,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
         <list>
           <eq>
             <char-at>
-              <marker>@+1</marker>
+              <marker>@+0</marker>
             </char-at>
             <integer>0x200C</integer>
           </eq>
@@ -68,13 +69,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             </le>
             <ge>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BC6</integer>
             </ge>
             <le>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BCC</integer>
             </le>
@@ -113,26 +114,26 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             </le>
             <ge>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0B95</integer>
             </ge>
             <le>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BB9</integer>
             </le>
             <logior>
               <lt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BBE</integer>
               </lt>
               <gt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BD7</integer>
               </gt>
@@ -145,7 +146,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           </set>
           <set vname="c">
             <char-at>
-              <marker>@+1</marker>
+              <marker>@+0</marker>
             </char-at>
           </set>
           <delete>
@@ -184,13 +185,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               </gt>
               <lt>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BC6</integer>
               </lt>
               <gt>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BCC</integer>
               </gt>
@@ -204,7 +205,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logand>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200C</integer>
             </eq>
@@ -223,13 +224,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               </gt>
               <lt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BC6</integer>
               </lt>
               <gt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BCC</integer>
               </gt>
@@ -329,20 +330,20 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logand>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200C</integer>
             </eq>
             <logior>
               <lt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BC6</integer>
               </lt>
               <gt>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BCC</integer>
               </gt>
@@ -363,7 +364,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <list>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BBE</integer>
               </eq>
@@ -378,13 +379,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <logior>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0BB3</integer>
                 </eq>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0BD7</integer>
                 </eq>
@@ -413,7 +414,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <list>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BBE</integer>
               </eq>
@@ -459,13 +460,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             </le>
             <ge>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BC6</integer>
             </ge>
             <le>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BCC</integer>
             </le>
@@ -482,19 +483,19 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logand>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0B95</integer>
             </eq>
             <eq>
               <char-at>
-                <marker>@+2</marker>
+                <marker>@+1</marker>
               </char-at>
               <integer>0x0BCD</integer>
             </eq>
             <eq>
               <char-at>
-                <marker>@+3</marker>
+                <marker>@+2</marker>
               </char-at>
               <integer>0x0BB7</integer>
             </eq>
@@ -516,20 +517,20 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <logand>
             <ge>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0B95</integer>
             </ge>
             <le>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BB9</integer>
             </le>
           </logand>
           <set vname="c">
             <char-at>
-              <marker>@+1</marker>
+              <marker>@+0</marker>
             </char-at>
           </set>
           <insert>
@@ -982,14 +983,14 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-`</string>
+            <symbol>A-`</symbol>
           </list>
         </keyseq>
       </rule>
       <rule>
         <keyseq>
           <list>
-            <string>A-=</string>
+            <symbol>A-=</symbol>
           </list>
         </keyseq>
       </rule>
@@ -1713,7 +1714,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-`</string>
+            <symbol>A-`</symbol>
           </list>
         </keyseq>
         <insert>
@@ -1723,7 +1724,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
       <rule>
         <keyseq>
           <list>
-            <string>A-=</string>
+            <symbol>A-=</symbol>
           </list>
         </keyseq>
         <insert>
@@ -1912,7 +1913,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x200C</integer>
                 </eq>
@@ -1939,7 +1940,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x200C</integer>
                 </eq>
@@ -2005,7 +2006,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <list>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200C</integer>
             </eq>
@@ -2219,26 +2220,26 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <logand>
               <ge>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0B95</integer>
               </ge>
               <le>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BB9</integer>
               </le>
               <eq>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BB3</integer>
               </eq>
             </logand>
             <set vname="c">
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
             </set>
             <delete>
@@ -2258,7 +2259,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0BBE</integer>
                 </eq>
@@ -2272,7 +2273,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
               <list>
                 <eq>
                   <char-at>
-                    <marker>@+1</marker>
+                    <marker>@+0</marker>
                   </char-at>
                   <integer>0x0BD7</integer>
                 </eq>
@@ -2301,7 +2302,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <list>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BBE</integer>
             </eq>
@@ -2601,26 +2602,26 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                     <logand>
                       <ge>
                         <char-at>
-                          <marker>@+1</marker>
+                          <marker>@+0</marker>
                         </char-at>
                         <integer>0x0B95</integer>
                       </ge>
                       <le>
                         <char-at>
-                          <marker>@+1</marker>
+                          <marker>@+0</marker>
                         </char-at>
                         <integer>0x0BB9</integer>
                       </le>
                       <logior>
                         <lt>
                           <char-at>
-                            <marker>@+2</marker>
+                            <marker>@+1</marker>
                           </char-at>
                           <integer>0x0BBE</integer>
                         </lt>
                         <gt>
                           <char-at>
-                            <marker>@+2</marker>
+                            <marker>@+1</marker>
                           </char-at>
                           <integer>0x0BD7</integer>
                         </gt>
@@ -2631,19 +2632,19 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                         <logand>
                           <eq>
                             <char-at>
-                              <marker>@+1</marker>
+                              <marker>@+0</marker>
                             </char-at>
                             <integer>0x0B95</integer>
                           </eq>
                           <eq>
                             <char-at>
-                              <marker>@+2</marker>
+                              <marker>@+1</marker>
                             </char-at>
                             <integer>0x0BCD</integer>
                           </eq>
                           <eq>
                             <char-at>
-                              <marker>@+3</marker>
+                              <marker>@+2</marker>
                             </char-at>
                             <integer>0x0BB7</integer>
                           </eq>
@@ -2665,7 +2666,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                         <integer>1</integer>
                         <set vname="c">
                           <char-at>
-                            <marker>@+1</marker>
+                            <marker>@+0</marker>
                           </char-at>
                         </set>
                         <delete>
@@ -2740,25 +2741,25 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <logand>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BB6</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BCD</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+3</marker>
+                  <marker>@+2</marker>
                 </char-at>
                 <integer>0x0BB0</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+4</marker>
+                  <marker>@+3</marker>
                 </char-at>
                 <integer>0x0C0</integer>
               </eq>
@@ -2771,19 +2772,19 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <logand>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0B95</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+2</marker>
+                  <marker>@+1</marker>
                 </char-at>
                 <integer>0x0BCD</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+3</marker>
+                  <marker>@+2</marker>
                 </char-at>
                 <integer>0x0BB7</integer>
               </eq>
@@ -2793,13 +2794,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                 <logand>
                   <ge>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BC6</integer>
                   </ge>
                   <le>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BC8</integer>
                   </le>
@@ -2821,13 +2822,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                 <logior>
                   <eq>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BCA</integer>
                   </eq>
                   <eq>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BCB</integer>
                   </eq>
@@ -2853,26 +2854,26 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                   <logand>
                     <ge>
                       <char-at>
-                        <marker>@+4</marker>
+                        <marker>@+3</marker>
                       </char-at>
                       <integer>0x0BBE</integer>
                     </ge>
                     <le>
                       <char-at>
-                        <marker>@+4</marker>
+                        <marker>@+3</marker>
                       </char-at>
                       <integer>0x0BC2</integer>
                     </le>
                   </logand>
                   <eq>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BCC</integer>
                   </eq>
                   <eq>
                     <char-at>
-                      <marker>@+4</marker>
+                      <marker>@+3</marker>
                     </char-at>
                     <integer>0x0BCD</integer>
                   </eq>
@@ -2893,20 +2894,20 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <logand>
               <ge>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0B95</integer>
               </ge>
               <le>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BB9</integer>
               </le>
             </logand>
             <set vname="c">
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
             </set>
             <cond>
@@ -2914,13 +2915,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                 <logand>
                   <ge>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BC6</integer>
                   </ge>
                   <le>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BC8</integer>
                   </le>
@@ -2936,13 +2937,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                 <logior>
                   <eq>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BCA</integer>
                   </eq>
                   <eq>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BCB</integer>
                   </eq>
@@ -2962,26 +2963,26 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
                   <logand>
                     <ge>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0BBE</integer>
                     </ge>
                     <le>
                       <char-at>
-                        <marker>@+2</marker>
+                        <marker>@+1</marker>
                       </char-at>
                       <integer>0x0BC2</integer>
                     </le>
                   </logand>
                   <eq>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BCC</integer>
                   </eq>
                   <eq>
                     <char-at>
-                      <marker>@+2</marker>
+                      <marker>@+1</marker>
                     </char-at>
                     <integer>0x0BCD</integer>
                   </eq>
@@ -3002,13 +3003,13 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
             <logior>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BCA</integer>
               </eq>
               <eq>
                 <char-at>
-                  <marker>@+1</marker>
+                  <marker>@+0</marker>
                 </char-at>
                 <integer>0x0BCB</integer>
               </eq>
@@ -3023,7 +3024,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <list>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x0BCC</integer>
             </eq>
@@ -3068,7 +3069,7 @@ If 1, try to use surrounding text.  Otherwise, use preedit.</gettext>
           <list>
             <eq>
               <char-at>
-                <marker>@+1</marker>
+                <marker>@+0</marker>
               </char-at>
               <integer>0x200C</integer>
             </eq>
-- 
1.7.10.4