From d0ea47e569354693299ac27a13e26597dbdf5eec Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Wed, 9 Sep 2009 05:57:21 +0000
Subject: [PATCH] *** empty log message ***

---
 MIM/vi-base.mimx  |   37 +++++++++++++++++++-------------
 MIM/vi-tcvn.mimx  |   59 ++++++++++++++++++++++++++++-----------------------
 MIM/vi-telex.mimx |   59 ++++++++++++++++++++++++++++-----------------------
 MIM/vi-viqr.mimx  |   58 +++++++++++++++++++++++++++-----------------------
 MIM/vi-vni.mimx   |   61 ++++++++++++++++++++++++++++++-----------------------
 5 files changed, 155 insertions(+), 119 deletions(-)

diff --git a/MIM/vi-base.mimx b/MIM/vi-base.mimx
index 45241b1..8543261 100644
--- a/MIM/vi-base.mimx
+++ b/MIM/vi-base.mimx
@@ -1,16 +1,5 @@
 <?xml version='1.0'?>
 <input-method xmlns="http://www.m17n.org/MIM">
-<!--Usage of variables:
-M (mark): point after the last vowel 
-T (mark): point after the tone-mark-attached vowel
-TPLACE: On which vowel a tone is attached (0:none, 1:1st, 2:2nd, or 3:3rd)
-C: The initial consonant
-V-1: The last vowel
-V-2: The second from the last vowel (or 0 if there aren't two vowels)
-V-3: The third from the last vowel (or 0 if there aren't three vowels)
-C-AFTER-V: Number of the final consonants
-SELECT: Which tone is selected
--->
   <tags>
     <language>t</language>
     <name>nil</name>
@@ -33,19 +22,19 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
               <expr operator="|">
                 <expr operator="=">
                   <variable-reference id="V-1"/>
-                  <int-val>234</int-val>
+                  <int-val>2282</int-val>
                 </expr>
                 <expr operator="=">
                   <variable-reference id="V-1"/>
-                  <int-val>417</int-val>
+                  <int-val>332001</int-val>
                 </expr>
                 <expr operator="=">
                   <variable-reference id="V-1"/>
-                  <int-val>202</int-val>
+                  <int-val>2250</int-val>
                 </expr>
                 <expr operator="=">
                   <variable-reference id="V-1"/>
-                  <int-val>416</int-val>
+                  <int-val>332000</int-val>
                 </expr>
               </expr>
               <set id="TPLACE">
@@ -778,6 +767,24 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
         <insert character="57"/>
       </rule>
     </map>
+    <map id="map-smart-quotes">
+      <rule>
+        <keyseq keys="&apos;"/>
+        <insert character="39"/>
+      </rule>
+      <rule>
+        <keyseq keys="&apos;&apos;"/>
+        <insert string="‘’"/>
+      </rule>
+      <rule>
+        <keyseq keys="&quot;"/>
+        <insert character="34"/>
+      </rule>
+      <rule>
+        <keyseq keys="&quot;&quot;"/>
+        <insert string="“”"/>
+      </rule>
+    </map>
     <map id="map-permanent-escape">
       <rule>
         <keyseq keys="\"/>
diff --git a/MIM/vi-tcvn.mimx b/MIM/vi-tcvn.mimx
index bd09034..2d020fa 100644
--- a/MIM/vi-tcvn.mimx
+++ b/MIM/vi-tcvn.mimx
@@ -13,39 +13,45 @@ The following variables are customizable:
   </description>
   <title>Ắ(TCVN)</title>
   <variable-list>
-    <variable id="tone-mark-on-last">
-      <description>
-        <get-text>Flag to control tone mark position in equivocal cases.
+    <variable id="tone-mark-on-last"><description>
+      <get-text>Flag to control tone mark position in equivocal cases.
 If this variable is 0 (the default), put tone mark on the first vowel
 in such equivocal cases as "oa", "oe", "uy".
 Otherwise, put tone mark on the last vowel.</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
-    <variable id="backspace-is-undo">
-      <description>
-        <get-text>Flag to control the action of Backspace key (delete or undo).
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
+    <variable id="backspace-is-undo"><description>
+      <get-text>Flag to control the action of Backspace key (delete or undo).
 If this variable is 0 (the default), Backspace key deletes the previous
 character (e.g. "q u a i s BS" =&gt; "quá").
 If the value is 1, Backspace key undoes the previous key
 (e.g. "q u a i s BS" =&gt; "quai").</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
   </variable-list>
   <macro-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>macro</section>
+    </xi:include>
   </macro-list>
   <map-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>map</section>
+    </xi:include>
     <map id="map-vowel-ext">
       <rule>
         <keyseq keys="2"/>
@@ -123,11 +129,11 @@ If the value is 1, Backspace key undoes the previous key
     <map id="map-consonant-ext">
       <rule>
         <keyseq keys="0"/>
-        <insert character="273"/>
+        <insert character="331825"/>
       </rule>
       <rule>
         <keyseq keys=")"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
     </map>
     <map id="map-tone-mark">
@@ -170,7 +176,7 @@ If the value is 1, Backspace key undoes the previous key
     <map id="map-misc">
       <rule>
         <keyseq keys="="/>
-        <insert character="8363"/>
+        <insert character="342603"/>
       </rule>
       <rule>
         <keyseq keys="=="/>
@@ -475,6 +481,7 @@ If the value is 1, Backspace key undoes the previous key
         <shift-to id="state-escape-in-normal-mode"/>
       </branch>
       <branch branch-selecting-map="map-misc"/>
+      <branch branch-selecting-map="map-smart-quotes"/>
     </state>
     <state id="state-after-v">
       <branch branch-selecting-map="map-consonant">
@@ -693,4 +700,4 @@ If the value is 1, Backspace key undoes the previous key
       </branch>
     </state>
   </state-list>
-</input-method>
+</input-method>
\ No newline at end of file
diff --git a/MIM/vi-telex.mimx b/MIM/vi-telex.mimx
index 85178d4..189cd37 100644
--- a/MIM/vi-telex.mimx
+++ b/MIM/vi-telex.mimx
@@ -13,39 +13,45 @@ The following variables are customizable:
   </description>
   <title>Ắ(TLX)</title>
   <variable-list>
-    <variable id="tone-mark-on-last">
-      <description>
-        <get-text>Flag to control tone mark position in equivocal cases.
+    <variable id="tone-mark-on-last"><description>
+      <get-text>Flag to control tone mark position in equivocal cases.
 If this variable is 0 (the default), put tone mark on the first vowel
 in such equivocal cases as "oa", "oe", "uy".
 Otherwise, put tone mark on the last vowel.</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
-    <variable id="backspace-is-undo">
-      <description>
-        <get-text>Flag to control the action of Backspace key (delete or undo).
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
+    <variable id="backspace-is-undo"><description>
+      <get-text>Flag to control the action of Backspace key (delete or undo).
 If this variable is 0 (the default), Backspace key deletes the previous
 character (e.g. "q u a i s BS" =&gt; "quá").
 If the value is 1, Backspace key undoes the previous key
 (e.g. "q u a i s BS" =&gt; "quai").</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
   </variable-list>
   <macro-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>macro</section>
+    </xi:include>
   </macro-list>
   <map-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>map</section>
+    </xi:include>
     <map id="map-vowel-ext">
       <rule>
         <keyseq keys="aa"/>
@@ -240,15 +246,15 @@ If the value is 1, Backspace key undoes the previous key
     <map id="map-consonant-ext">
       <rule>
         <keyseq keys="dd"/>
-        <insert character="273"/>
+        <insert character="331825"/>
       </rule>
       <rule>
         <keyseq keys="DD"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
       <rule>
         <keyseq keys="Dd"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
     </map>
     <map id="map-tone-mark">
@@ -643,6 +649,7 @@ If the value is 1, Backspace key undoes the previous key
       <branch branch-selecting-map="map-permanent-escape">
         <shift-to id="state-escape-in-normal-mode"/>
       </branch>
+      <branch branch-selecting-map="map-smart-quotes"/>
     </state>
     <state id="state-after-v">
       <branch branch-selecting-map="map-ending-1st-consonant">
@@ -895,4 +902,4 @@ If the value is 1, Backspace key undoes the previous key
       </branch>
     </state>
   </state-list>
-</input-method>
+</input-method>
\ No newline at end of file
diff --git a/MIM/vi-viqr.mimx b/MIM/vi-viqr.mimx
index ccdee35..7a21bc2 100644
--- a/MIM/vi-viqr.mimx
+++ b/MIM/vi-viqr.mimx
@@ -13,39 +13,45 @@ The following variables are customizable:
   </description>
   <title>Ắ(VIQR)</title>
   <variable-list>
-    <variable id="tone-mark-on-last">
-      <description>
-        <get-text>Flag to control tone mark position in equivocal cases.
+    <variable id="tone-mark-on-last"><description>
+      <get-text>Flag to control tone mark position in equivocal cases.
 If this variable is 0 (the default), put tone mark on the first vowel
 in such equivocal cases as "oa", "oe", "uy".
 Otherwise, put tone mark on the last vowel.</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
-    <variable id="backspace-is-undo">
-      <description>
-        <get-text>Flag to control the action of Backspace key (delete or undo).
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
+    <variable id="backspace-is-undo"><description>
+      <get-text>Flag to control the action of Backspace key (delete or undo).
 If this variable is 0 (the default), Backspace key deletes the previous
 character (e.g. "q u a i s BS" =&gt; "quá").
 If the value is 1, Backspace key undoes the previous key
 (e.g. "q u a i s BS" =&gt; "quai").</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
   </variable-list>
   <macro-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>macro</section>
+    </xi:include>
   </macro-list>
   <map-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>map</section>
+    </xi:include>
     <map id="map-vowel-ext">
       <rule>
         <keyseq keys="a^"/>
@@ -123,15 +129,15 @@ If the value is 1, Backspace key undoes the previous key
     <map id="map-consonant-ext">
       <rule>
         <keyseq keys="dd"/>
-        <insert character="273"/>
+        <insert character="331825"/>
       </rule>
       <rule>
         <keyseq keys="DD"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
       <rule>
         <keyseq keys="Dd"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
     </map>
     <map id="map-tone-mark">
@@ -505,4 +511,4 @@ If the value is 1, Backspace key undoes the previous key
       </branch>
     </state>
   </state-list>
-</input-method>
+</input-method>
\ No newline at end of file
diff --git a/MIM/vi-vni.mimx b/MIM/vi-vni.mimx
index ca4e434..774f3af 100644
--- a/MIM/vi-vni.mimx
+++ b/MIM/vi-vni.mimx
@@ -13,39 +13,47 @@ The following variables are customizable:
   </description>
   <title>Ắ(VNI)</title>
   <variable-list>
-    <variable id="tone-mark-on-last">
-      <description>
-        <get-text>Flag to control tone mark position in equivocal cases.
+    <variable id="tone-mark-on-last"><description>
+     <get-text>
+Flag to control tone mark position in equivocal cases.
 If this variable is 0 (the default), put tone mark on the first vowel
 in such equivocal cases as "oa", "oe", "uy".
-Otherwise, put tone mark on the last vowel.</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
-    <variable id="backspace-is-undo">
-      <description>
-        <get-text>Flag to control the action of Backspace key (delete or undo).
+Otherwise, put tone mark on the last vowel.
+     </get-text>
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
+    <variable id="backspace-is-undo"><description>
+      <get-text>Flag to control the action of Backspace key (delete or undo).
 If this variable is 0 (the default), Backspace key deletes the previous
 character (e.g. "q u a i s BS" =&gt; "quá").
 If the value is 1, Backspace key undoes the previous key
 (e.g. "q u a i s BS" =&gt; "quai").</get-text>
-      </description>
-      <value type="integer">0</value>
-      <variable-value-candidate>
-        <c-value type="integer">0</c-value>
-        <c-value type="integer">1</c-value>
-      </variable-value-candidate>
-    </variable>
+    </description><value type="integer"/>0<variable-value-candidate>
+      <c-value type="integer">0</c-value>
+      <c-value type="integer">1</c-value>
+    </variable-value-candidate></variable>
   </variable-list>
   <macro-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:macro)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>macro</section>
+    </xi:include>
   </macro-list>
   <map-list>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx#xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="vi-base.mimx" xpointer="xmlns(mim=http://www.m17n.org/MIM)xpointer(//mim:map)">
+      <tags>
+        <language>t</language>
+        <name>nil</name>
+        <extra-id>vi-base</extra-id>
+      </tags>
+      <section>map</section>
+    </xi:include>
     <map id="map-vowel-ext">
       <rule>
         <keyseq keys="a6"/>
@@ -123,11 +131,11 @@ If the value is 1, Backspace key undoes the previous key
     <map id="map-consonant-ext">
       <rule>
         <keyseq keys="d9"/>
-        <insert character="273"/>
+        <insert character="331825"/>
       </rule>
       <rule>
         <keyseq keys="D9"/>
-        <insert character="272"/>
+        <insert character="331824"/>
       </rule>
     </map>
     <map id="map-tone-mark">
@@ -283,6 +291,7 @@ If the value is 1, Backspace key undoes the previous key
       <branch branch-selecting-map="map-permanent-escape">
         <shift-to id="state-escape-in-normal-mode"/>
       </branch>
+      <branch branch-selecting-map="map-smart-quotes"/>
     </state>
     <state id="state-after-v">
       <branch branch-selecting-map="map-consonant">
@@ -501,4 +510,4 @@ If the value is 1, Backspace key undoes the previous key
       </branch>
     </state>
   </state-list>
-</input-method>
+</input-method>
\ No newline at end of file
-- 
1.7.10.4