*** empty log message ***

[m17n/m17n-lib-js.git] / vi-tcvn.mimx

diff --git a/vi-tcvn.mimx b/vi-tcvn.mimx
index 69026ff..f3f54c9 100644 (file)
--- a/vi-tcvn.mimx
+++ b/vi-tcvn.mimx
@@ -363,7 +363,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-=</string>
+            <symbol>A-=</symbol>
           </list>
         </keyseq>
         <insert>
@@ -373,7 +373,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-\</string>
+            <symbol>A-\</symbol>
           </list>
         </keyseq>
         <insert>
@@ -383,7 +383,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-[</string>
+            <symbol>A-[</symbol>
           </list>
         </keyseq>
         <insert>
@@ -393,7 +393,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-]</string>
+            <symbol>A-]</symbol>
           </list>
         </keyseq>
         <insert>
@@ -403,7 +403,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-!</string>
+            <symbol>A-!</symbol>
           </list>
         </keyseq>
         <insert>
@@ -413,7 +413,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-@</string>
+            <symbol>A-@</symbol>
           </list>
         </keyseq>
         <insert>
@@ -423,7 +423,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-#</string>
+            <symbol>A-#</symbol>
           </list>
         </keyseq>
         <insert>
@@ -433,7 +433,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-$</string>
+            <symbol>A-$</symbol>
           </list>
         </keyseq>
         <insert>
@@ -443,7 +443,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-%</string>
+            <symbol>A-%</symbol>
           </list>
         </keyseq>
         <insert>
@@ -453,7 +453,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-^</string>
+            <symbol>A-^</symbol>
           </list>
         </keyseq>
         <insert>
@@ -463,7 +463,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-&amp;</string>
+            <symbol>A-&amp;</symbol>
           </list>
         </keyseq>
         <insert>
@@ -473,7 +473,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-*</string>
+            <symbol>A-*</symbol>
           </list>
         </keyseq>
         <insert>
@@ -483,7 +483,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-(</string>
+            <symbol>A-(</symbol>
           </list>
         </keyseq>
         <insert>
@@ -493,7 +493,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-)</string>
+            <symbol>A-)</symbol>
           </list>
         </keyseq>
         <insert>
@@ -513,7 +513,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-+</string>
+            <symbol>A-+</symbol>
           </list>
         </keyseq>
         <insert>
@@ -523,7 +523,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-|</string>
+            <symbol>A-|</symbol>
           </list>
         </keyseq>
         <insert>
@@ -533,7 +533,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-{</string>
+            <symbol>A-{</symbol>
           </list>
         </keyseq>
         <insert>
@@ -543,7 +543,7 @@ If the value is 1, Backspace key undoes the previous key
       <rule>
         <keyseq>
           <list>
-            <string>A-}</string>
+            <symbol>A-}</symbol>
           </list>
         </keyseq>
         <insert>
@@ -689,6 +689,12 @@ If the value is 1, Backspace key undoes the previous key
         <set vname="SELECT">
           <integer>0</integer>
         </set>
+        <set vname="NST">
+          <eq>
+            <surrounding-text-flag/>
+            <integer>-2</integer>
+          </eq>
+        </set>
       </state-hook>
       <branch mname="map-consonant">
         <set vname="C">
@@ -696,6 +702,14 @@ If the value is 1, Backspace key undoes the previous key
             <marker>@-1</marker>
           </char-at>
         </set>
+        <cond>
+          <list>
+            <varref vname="NST"/>
+            <shift>
+              <symbol>state-after-c</symbol>
+            </shift>
+          </list>
+        </cond>
       </branch>
       <branch mname="map-consonant-ext">
         <set vname="C">
@@ -703,6 +717,14 @@ If the value is 1, Backspace key undoes the previous key
             <marker>@-1</marker>
           </char-at>
         </set>
+        <cond>
+          <list>
+            <varref vname="NST"/>
+            <shift>
+              <symbol>state-after-c</symbol>
+            </shift>
+          </list>
+        </cond>
       </branch>
       <branch mname="map-vowel">
         <mark>
@@ -749,6 +771,40 @@ If the value is 1, Backspace key undoes the previous key
       <branch mname="map-misc"/>
       <branch mname="map-smart-quotes"/>
     </state>
+    <state sname="state-after-c">
+      <branch mname="map-vowel">
+        <mark>
+          <marker>M</marker>
+        </mark>
+        <set vname="V-2">
+          <varref vname="V-1"/>
+        </set>
+        <set vname="V-1">
+          <char-at>
+            <marker>@-1</marker>
+          </char-at>
+        </set>
+        <shift>
+          <symbol>state-after-v</symbol>
+        </shift>
+      </branch>
+      <branch mname="map-vowel-ext">
+        <mark>
+          <marker>M</marker>
+        </mark>
+        <set vname="V-2">
+          <varref vname="V-1"/>
+        </set>
+        <set vname="V-1">
+          <char-at>
+            <marker>@-1</marker>
+          </char-at>
+        </set>
+        <shift>
+          <symbol>state-after-v</symbol>
+        </shift>
+      </branch>
+    </state>
     <state sname="state-after-v">
       <branch mname="map-consonant">
         <shift>