*** empty log message ***

diff --git a/MIM/th-kesmanee.mimx b/MIM/th-kesmanee.mimx
index 0739704..5941a0c 100644 (file)
--- a/MIM/th-kesmanee.mimx
+++ b/MIM/th-kesmanee.mimx
@@ -74,12 +74,12 @@ The level of character sequence acceptance defined in WTT 2.0.
       </set>
       <cond>
         <list>
-          <or>
+          <logior>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E31</integer>
             </eq>
-            <and>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E34</integer>
@@ -88,16 +88,16 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E3A</integer>
               </le>
-            </and>
+            </logand>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E4E</integer>
             </eq>
-          </or>
+          </logior>
           <cond>
             <list>
-              <or>
-                <and>
+              <logior>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E01</integer>
@@ -106,12 +106,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E23</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E25</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E27</integer>
@@ -120,8 +120,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E2E</integer>
                   </le>
-                </and>
-              </or>
+                </logand>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -129,7 +129,7 @@ The level of character sequence acceptance defined in WTT 2.0.
           </cond>
         </list>
         <list>
-          <and>
+          <logand>
             <ge>
               <varref vname="arg2"/>
               <integer>0x0E48</integer>
@@ -138,11 +138,11 @@ The level of character sequence acceptance defined in WTT 2.0.
               <varref vname="arg2"/>
               <integer>0x0E4B</integer>
             </le>
-          </and>
+          </logand>
           <cond>
             <list>
-              <or>
-                <and>
+              <logior>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E01</integer>
@@ -151,12 +151,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E23</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E25</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E27</integer>
@@ -165,12 +165,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E2E</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E31</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E34</integer>
@@ -179,8 +179,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E39</integer>
                   </le>
-                </and>
-              </or>
+                </logand>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -188,7 +188,7 @@ The level of character sequence acceptance defined in WTT 2.0.
           </cond>
         </list>
         <list>
-          <and>
+          <logand>
             <ge>
               <varref vname="arg2"/>
               <integer>0x0E4C</integer>
@@ -197,11 +197,11 @@ The level of character sequence acceptance defined in WTT 2.0.
               <varref vname="arg2"/>
               <integer>0x0E4D</integer>
             </le>
-          </and>
+          </logand>
           <cond>
             <list>
-              <or>
-                <and>
+              <logior>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E01</integer>
@@ -210,12 +210,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E23</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E25</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E27</integer>
@@ -224,7 +224,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E2E</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E38</integer>
@@ -233,7 +233,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="arg1"/>
                   <integer>0x0E34</integer>
                 </eq>
-              </or>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -247,8 +247,8 @@ The level of character sequence acceptance defined in WTT 2.0.
           </eq>
           <cond>
             <list>
-              <or>
-                <and>
+              <logior>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E01</integer>
@@ -257,12 +257,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E23</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E25</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E27</integer>
@@ -271,7 +271,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E2E</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E35</integer>
@@ -280,7 +280,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="arg1"/>
                   <integer>0x0E37</integer>
                 </eq>
-              </or>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -295,12 +295,12 @@ The level of character sequence acceptance defined in WTT 2.0.
       </set>
       <cond>
         <list>
-          <or>
+          <logior>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E31</integer>
             </eq>
-            <and>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E34</integer>
@@ -309,8 +309,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E3A</integer>
               </le>
-            </and>
-            <and>
+            </logand>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E47</integer>
@@ -319,8 +319,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E4E</integer>
               </le>
-            </and>
-          </or>
+            </logand>
+          </logior>
           <set vname="ret">
             <integer>0</integer>
           </set>
@@ -333,12 +333,12 @@ The level of character sequence acceptance defined in WTT 2.0.
       </set>
       <cond>
         <list>
-          <or>
+          <logior>
             <le>
               <varref vname="arg2"/>
               <integer>0x001F</integer>
             </le>
-            <and>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0080</integer>
@@ -347,8 +347,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x009F</integer>
               </le>
-            </and>
-            <and>
+            </logand>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E01</integer>
@@ -357,12 +357,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E23</integer>
               </le>
-            </and>
+            </logand>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E25</integer>
             </eq>
-            <and>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E27</integer>
@@ -371,15 +371,15 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E2E</integer>
               </le>
-            </and>
-          </or>
+            </logand>
+          </logior>
           <set vname="ret">
             <integer>1</integer>
           </set>
         </list>
         <list>
-          <or>
-            <and>
+          <logior>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0020</integer>
@@ -388,8 +388,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x007E</integer>
               </le>
-            </and>
-            <and>
+            </logand>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x00A0</integer>
@@ -398,12 +398,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E00</integer>
               </le>
-            </and>
+            </logand>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E2F</integer>
             </eq>
-            <and>
+            <logand>
               <ge>
                 <varref vname="arg2"/>
                 <integer>0x0E3F</integer>
@@ -412,7 +412,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="arg2"/>
                 <integer>0x0E44</integer>
               </le>
-            </and>
+            </logand>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E46</integer>
@@ -421,10 +421,10 @@ The level of character sequence acceptance defined in WTT 2.0.
               <varref vname="arg2"/>
               <integer>0x0E4E</integer>
             </gt>
-          </or>
+          </logior>
           <cond>
             <list>
-              <or>
+              <logior>
                 <lt>
                   <varref vname="arg1"/>
                   <integer>0x0E40</integer>
@@ -433,7 +433,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="arg1"/>
                   <integer>0x0E44</integer>
                 </gt>
-              </or>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -441,7 +441,7 @@ The level of character sequence acceptance defined in WTT 2.0.
           </cond>
         </list>
         <list>
-          <or>
+          <logior>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E30</integer>
@@ -454,11 +454,11 @@ The level of character sequence acceptance defined in WTT 2.0.
               <varref vname="arg2"/>
               <integer>0x0E33</integer>
             </eq>
-          </or>
+          </logior>
           <cond>
             <list>
-              <or>
-                <and>
+              <logior>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E01</integer>
@@ -467,12 +467,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E23</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E25</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E27</integer>
@@ -481,7 +481,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E2E</integer>
                   </le>
-                </and>
+                </logand>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E30</integer>
@@ -502,7 +502,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="arg1"/>
                   <integer>0x0E38</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E48</integer>
@@ -511,8 +511,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E4B</integer>
                   </le>
-                </and>
-              </or>
+                </logand>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -526,7 +526,7 @@ The level of character sequence acceptance defined in WTT 2.0.
           </eq>
           <cond>
             <list>
-              <or>
+              <logior>
                 <eq>
                   <varref vname="arg1"/>
                   <integer>0x0E24</integer>
@@ -535,7 +535,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="arg1"/>
                   <integer>0x0E26</integer>
                 </eq>
-                <and>
+                <logand>
                   <ge>
                     <varref vname="arg1"/>
                     <integer>0x0E48</integer>
@@ -544,8 +544,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E4B</integer>
                   </le>
-                </and>
-              </or>
+                </logand>
+              </logior>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -553,7 +553,7 @@ The level of character sequence acceptance defined in WTT 2.0.
           </cond>
         </list>
         <list>
-          <or>
+          <logior>
             <eq>
               <varref vname="arg2"/>
               <integer>0x0E24</integer>
@@ -562,11 +562,11 @@ The level of character sequence acceptance defined in WTT 2.0.
               <varref vname="arg2"/>
               <integer>0x0E26</integer>
             </eq>
-          </or>
+          </logior>
           <cond>
             <list>
-              <and>
-                <or>
+              <logand>
+                <logior>
                   <lt>
                     <varref vname="arg1"/>
                     <integer>0x0E40</integer>
@@ -575,7 +575,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <varref vname="arg1"/>
                     <integer>0x0E44</integer>
                   </gt>
-                </or>
+                </logior>
                 <not>
                   <eq>
                     <varref vname="arg1"/>
@@ -588,7 +588,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <integer>0x0E26</integer>
                   </eq>
                 </not>
-              </and>
+              </logand>
               <set vname="ret">
                 <integer>1</integer>
               </set>
@@ -1358,7 +1358,7 @@ The level of character sequence acceptance defined in WTT 2.0.
     <state sname="state-init">
       <branch mname="map-map">
         <delete>
-          <marker>@first</marker>
+          <marker>@&lt;</marker>
         </delete>
         <pushback>
           <integer>1</integer>
@@ -1470,8 +1470,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                             </insert>
                           </list>
                           <list>
-                            <and>
-                              <or>
+                            <logand>
+                              <logior>
                                 <eq>
                                   <varref vname="y"/>
                                   <integer>0x0E30</integer>
@@ -1484,7 +1484,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                                   <varref vname="y"/>
                                   <integer>0x0E33</integer>
                                 </eq>
-                              </or>
+                              </logior>
                               <ge>
                                 <varref vname="z"/>
                                 <integer>0x0E48</integer>
@@ -1493,7 +1493,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                                 <varref vname="z"/>
                                 <integer>0x0E4B</integer>
                               </le>
-                            </and>
+                            </logand>
                             <delete>
                               <marker>@-2</marker>
                             </delete>
@@ -1525,12 +1525,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <funcall fname="macro-ac"/>
                     <cond>
                       <list>
-                        <and>
+                        <logand>
                           <eq>
                             <varref vname="ret"/>
                             <integer>1</integer>
                           </eq>
-                          <and>
+                          <logand>
                             <ge>
                               <varref vname="y"/>
                               <integer>0x0E01</integer>
@@ -1539,8 +1539,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                               <varref vname="y"/>
                               <integer>0x0E5B</integer>
                             </le>
-                          </and>
-                          <and>
+                          </logand>
+                          <logand>
                             <ge>
                               <varref vname="z"/>
                               <integer>0x0E01</integer>
@@ -1549,8 +1549,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                               <varref vname="z"/>
                               <integer>0x0E5B</integer>
                             </le>
-                          </and>
-                        </and>
+                          </logand>
+                        </logand>
                         <delete>
                           <marker>@-2</marker>
                         </delete>
@@ -1585,8 +1585,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             <commit/>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0000</integer>
@@ -1595,7 +1595,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E00</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E2F</integer>
@@ -1612,12 +1612,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E4F</integer>
               </ge>
-            </or>
+            </logior>
             <commit/>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E01</integer>
@@ -1626,12 +1626,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E23</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E25</integer>
               </eq>
-              <and>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E27</integer>
@@ -1640,11 +1640,11 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E2E</integer>
                 </le>
-              </and>
-            </or>
+              </logand>
+            </logior>
             <cond>
               <list>
-                <or>
+                <logior>
                   <eq>
                     <char-at>
                       <marker>@-2</marker>
@@ -1657,7 +1657,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     </char-at>
                     <integer>0x0E26</integer>
                   </eq>
-                </or>
+                </logior>
               </list>
               <list>
                 <integer>1</integer>
@@ -1672,8 +1672,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             </cond>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E40</integer>
@@ -1682,7 +1682,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E45</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E24</integer>
@@ -1691,7 +1691,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E26</integer>
               </eq>
-            </or>
+            </logior>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1701,7 +1701,7 @@ The level of character sequence acceptance defined in WTT 2.0.
             </insert>
           </list>
           <list>
-            <or>
+            <logior>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E30</integer>
@@ -1710,7 +1710,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E32</integer>
               </eq>
-            </or>
+            </logior>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1721,8 +1721,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             </set>
             <cond>
               <list>
-                <or>
-                  <and>
+                <logior>
+                  <logand>
                     <ge>
                       <varref vname="v"/>
                       <integer>0x0E01</integer>
@@ -1731,12 +1731,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                       <varref vname="v"/>
                       <integer>0x0E23</integer>
                     </le>
-                  </and>
+                  </logand>
                   <eq>
                     <varref vname="v"/>
                     <integer>0x0E25</integer>
                   </eq>
-                  <and>
+                  <logand>
                     <ge>
                       <varref vname="v"/>
                       <integer>0x0E27</integer>
@@ -1745,8 +1745,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                       <varref vname="v"/>
                       <integer>0x0E2E</integer>
                     </le>
-                  </and>
-                </or>
+                  </logand>
+                </logior>
                 <delete>
                   <marker>@-1</marker>
                 </delete>
@@ -1771,4 +1771,4 @@ The level of character sequence acceptance defined in WTT 2.0.
       </branch>
     </state>
   </state-list>
-</input-method>
\ No newline at end of file
+</input-method>

diff --git a/MIM/th-tis820.mimx b/MIM/th-tis820.mimx
index adb9e3d..a5b8d3e 100644 (file)
--- a/MIM/th-tis820.mimx
+++ b/MIM/th-tis820.mimx
@@ -32,7 +32,7 @@ The level of character sequence acceptance defined in WTT 2.0.
         <language>th</language>
         <name>kesmanee</name>
       </tags>
-      <part>macro</part>
+      <section>macro</section>
     </xi:include>
   </macro-list>
   <map-list>
@@ -795,7 +795,7 @@ The level of character sequence acceptance defined in WTT 2.0.
     <state sname="state-init">
       <branch mname="map-map">
         <delete>
-          <marker>@first</marker>
+          <marker>@&lt;</marker>
         </delete>
         <pushback>
           <integer>1</integer>
@@ -907,8 +907,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                             </insert>
                           </list>
                           <list>
-                            <and>
-                              <or>
+                            <logand>
+                              <logior>
                                 <eq>
                                   <varref vname="y"/>
                                   <integer>0x0E30</integer>
@@ -921,7 +921,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                                   <varref vname="y"/>
                                   <integer>0x0E33</integer>
                                 </eq>
-                              </or>
+                              </logior>
                               <ge>
                                 <varref vname="z"/>
                                 <integer>0x0E48</integer>
@@ -930,7 +930,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                                 <varref vname="z"/>
                                 <integer>0x0E4B</integer>
                               </le>
-                            </and>
+                            </logand>
                             <delete>
                               <marker>@-2</marker>
                             </delete>
@@ -962,12 +962,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                     <funcall fname="macro-ac"/>
                     <cond>
                       <list>
-                        <and>
+                        <logand>
                           <eq>
                             <varref vname="ret"/>
                             <integer>1</integer>
                           </eq>
-                          <and>
+                          <logand>
                             <ge>
                               <varref vname="y"/>
                               <integer>0x0E01</integer>
@@ -976,8 +976,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                               <varref vname="y"/>
                               <integer>0x0E5B</integer>
                             </le>
-                          </and>
-                          <and>
+                          </logand>
+                          <logand>
                             <ge>
                               <varref vname="z"/>
                               <integer>0x0E01</integer>
@@ -986,8 +986,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                               <varref vname="z"/>
                               <integer>0x0E5B</integer>
                             </le>
-                          </and>
-                        </and>
+                          </logand>
+                        </logand>
                         <delete>
                           <marker>@-2</marker>
                         </delete>
@@ -1022,8 +1022,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             <commit/>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0000</integer>
@@ -1032,7 +1032,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E00</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E2F</integer>
@@ -1049,12 +1049,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E4F</integer>
               </ge>
-            </or>
+            </logior>
             <commit/>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E01</integer>
@@ -1063,12 +1063,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E23</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E25</integer>
               </eq>
-              <and>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E27</integer>
@@ -1077,11 +1077,11 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E2E</integer>
                 </le>
-              </and>
-            </or>
+              </logand>
+            </logior>
             <cond>
               <list>
-                <or>
+                <logior>
                   <eq>
                     <char-at>
                       <marker>@-2</marker>
@@ -1094,7 +1094,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                     </char-at>
                     <integer>0x0E26</integer>
                   </eq>
-                </or>
+                </logior>
               </list>
               <list>
                 <integer>1</integer>
@@ -1109,8 +1109,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             </cond>
           </list>
           <list>
-            <or>
-              <and>
+            <logior>
+              <logand>
                 <ge>
                   <varref vname="w"/>
                   <integer>0x0E40</integer>
@@ -1119,7 +1119,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                   <varref vname="w"/>
                   <integer>0x0E45</integer>
                 </le>
-              </and>
+              </logand>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E24</integer>
@@ -1128,7 +1128,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E26</integer>
               </eq>
-            </or>
+            </logior>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1138,7 +1138,7 @@ The level of character sequence acceptance defined in WTT 2.0.
             </insert>
           </list>
           <list>
-            <or>
+            <logior>
               <eq>
                 <varref vname="w"/>
                 <integer>0x0E30</integer>
@@ -1147,7 +1147,7 @@ The level of character sequence acceptance defined in WTT 2.0.
                 <varref vname="w"/>
                 <integer>0x0E32</integer>
               </eq>
-            </or>
+            </logior>
             <delete>
               <marker>@-1</marker>
             </delete>
@@ -1158,8 +1158,8 @@ The level of character sequence acceptance defined in WTT 2.0.
             </set>
             <cond>
               <list>
-                <or>
-                  <and>
+                <logior>
+                  <logand>
                     <ge>
                       <varref vname="v"/>
                       <integer>0x0E01</integer>
@@ -1168,12 +1168,12 @@ The level of character sequence acceptance defined in WTT 2.0.
                       <varref vname="v"/>
                       <integer>0x0E23</integer>
                     </le>
-                  </and>
+                  </logand>
                   <eq>
                     <varref vname="v"/>
                     <integer>0x0E25</integer>
                   </eq>
-                  <and>
+                  <logand>
                     <ge>
                       <varref vname="v"/>
                       <integer>0x0E27</integer>
@@ -1182,8 +1182,8 @@ The level of character sequence acceptance defined in WTT 2.0.
                       <varref vname="v"/>
                       <integer>0x0E2E</integer>
                     </le>
-                  </and>
-                </or>
+                  </logand>
+                </logior>
                 <delete>
                   <marker>@-1</marker>
                 </delete>
@@ -1208,4 +1208,4 @@ The level of character sequence acceptance defined in WTT 2.0.
       </branch>
     </state>
   </state-list>
-</input-method>
\ No newline at end of file
+</input-method>