From: nisikimi <nisikimi>
Date: Mon, 22 Mar 2010 23:21:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-2-0-0alpha~21
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a9508300696bc409e9952bb7361763e99d91efc;p=m17n%2Fm17n-db.git

*** empty log message ***
---

diff --git a/MIM/vi-base.mimx b/MIM/vi-base.mimx
index 0ba8ec2..c6b31e1 100644
--- a/MIM/vi-base.mimx
+++ b/MIM/vi-base.mimx
@@ -25,7 +25,7 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
           <varref vname="V-3"/>
           <cond>
             <list>
-              <or>
+              <logior>
                 <eq>
                   <varref vname="V-1"/>
                   <integer>234</integer>
@@ -42,7 +42,7 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                   <varref vname="V-1"/>
                   <integer>416</integer>
                 </eq>
-              </or>
+              </logior>
               <set vname="TPLACE">
                 <integer>3</integer>
               </set>
@@ -62,13 +62,13 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
           <varref vname="V-2"/>
           <cond>
             <list>
-              <or>
+              <logior>
                 <gt>
                   <varref vname="V-1"/>
                   <integer>127</integer>
                 </gt>
-                <and>
-                  <or>
+                <logand>
+                  <logior>
                     <eq>
                       <varref vname="C"/>
                       <integer>103</integer>
@@ -77,8 +77,8 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                       <varref vname="C"/>
                       <integer>71</integer>
                     </eq>
-                  </or>
-                  <or>
+                  </logior>
+                  <logior>
                     <eq>
                       <varref vname="V-2"/>
                       <integer>105</integer>
@@ -87,10 +87,10 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                       <varref vname="V-2"/>
                       <integer>73</integer>
                     </eq>
-                  </or>
-                </and>
-                <and>
-                  <or>
+                  </logior>
+                </logand>
+                <logand>
+                  <logior>
                     <eq>
                       <varref vname="C"/>
                       <integer>113</integer>
@@ -99,8 +99,8 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                       <varref vname="C"/>
                       <integer>81</integer>
                     </eq>
-                  </or>
-                  <or>
+                  </logior>
+                  <logior>
                     <eq>
                       <varref vname="V-2"/>
                       <integer>117</integer>
@@ -109,19 +109,19 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                       <varref vname="V-2"/>
                       <integer>85</integer>
                     </eq>
-                  </or>
-                </and>
-                <and>
-                  <or>
+                  </logior>
+                </logand>
+                <logand>
+                  <logior>
                     <varref vname="tone-mark-on-last"/>
                     <gt>
                       <varref vname="C-AFTER-V"/>
                       <integer>0</integer>
                     </gt>
-                  </or>
-                  <or>
-                    <and>
-                      <or>
+                  </logior>
+                  <logior>
+                    <logand>
+                      <logior>
                         <eq>
                           <varref vname="V-2"/>
                           <integer>111</integer>
@@ -130,8 +130,8 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                           <varref vname="V-2"/>
                           <integer>79</integer>
                         </eq>
-                      </or>
-                      <or>
+                      </logior>
+                      <logior>
                         <eq>
                           <varref vname="V-1"/>
                           <integer>97</integer>
@@ -156,10 +156,10 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                           <varref vname="V-1"/>
                           <integer>79</integer>
                         </eq>
-                      </or>
-                    </and>
-                    <and>
-                      <or>
+                      </logior>
+                    </logand>
+                    <logand>
+                      <logior>
                         <eq>
                           <varref vname="V-2"/>
                           <integer>117</integer>
@@ -168,8 +168,8 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                           <varref vname="V-2"/>
                           <integer>85</integer>
                         </eq>
-                      </or>
-                      <or>
+                      </logior>
+                      <logior>
                         <eq>
                           <varref vname="V-1"/>
                           <integer>121</integer>
@@ -178,11 +178,11 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
                           <varref vname="V-1"/>
                           <integer>89</integer>
                         </eq>
-                      </or>
-                    </and>
-                  </or>
-                </and>
-              </or>
+                      </logior>
+                    </logand>
+                  </logior>
+                </logand>
+              </logior>
               <set vname="TPLACE">
                 <integer>2</integer>
               </set>
@@ -1342,4 +1342,4 @@ to be included in the other Vietnamese input method (e.g. vi-telex, vi-vni).
       </rule>
     </map>
   </map-list>
-</input-method>
\ No newline at end of file
+</input-method>