commit 8624a0a1862116772d56e003f972242bea54e74a
author Tadashi G. Takaoka <takaoka@google.com> Fri Aug 31 19:19:35 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Sep 03 14:05:10 2012 +0900
tree 210be119d30c5c06052beb03a80bb5bc7b717440
parent 8251036616dc30db9ad1a981cc5af5843d474647

Use normal font for Thai

This change also adds workaround to display Thai composing letters
correctly.

Bug: 6753168
Change-Id: Ibd42ebb40df08b5de32b3500f10003c4a5de4897

java/res/xml/rowkeys_thai2.xml

diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 80e3563..f5fd405 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -27,60 +27,76 @@
         >
             <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
             <Key
-                latin:keyLabel="&#x0E24;" />
+                latin:keyLabel="&#x0E24;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
             <Key
-                latin:keyLabel="&#x0E06;" />
+                latin:keyLabel="&#x0E06;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
             <Key
-                latin:keyLabel="&#x0E0F;" />
+                latin:keyLabel="&#x0E0F;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
             <Key
-                latin:keyLabel="&#x0E0C;" />
+                latin:keyLabel="&#x0E0C;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
             <Key
-                latin:keyLabel="&#x0E29;" />
+                latin:keyLabel="&#x0E29;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
             <Key
-                latin:keyLabel="&#x0E28;" />
+                latin:keyLabel="&#x0E28;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
             <Key
-                latin:keyLabel="&#x0E0B;" />
+                latin:keyLabel="&#x0E0B;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
                  U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
             <Key
                 latin:keyLabel="&#x0E3F;"
-                latin:moreKeys="&#x0E45;" />
+                latin:moreKeys="&#x0E45;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
                  U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
             <Key
                 latin:keyLabel="&#x0E46;"
-                latin:moreKeys="&#x0E2F;" />
+                latin:moreKeys="&#x0E2F;"
+                latin:keyLabelFlags="fontNormal" />
         </case>
         <default>
             <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN
                  U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
             <Key
                 latin:keyLabel="&#x0E1F;"
-                latin:moreKeys="&#x0E1E;" />
+                latin:moreKeys="&#x0E1E;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
             <Key
-                latin:keyLabel="&#x0E2B;" />
+                latin:keyLabel="&#x0E2B;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
             <Key
-                latin:keyLabel="&#x0E01;" />
+                latin:keyLabel="&#x0E01;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
             <Key
-                latin:keyLabel="&#x0E14;" />
+                latin:keyLabel="&#x0E14;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
             <Key
-                latin:keyLabel="&#x0E2A;" />
+                latin:keyLabel="&#x0E2A;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
             <Key
-                latin:keyLabel="&#x0E27;" />
+                latin:keyLabel="&#x0E27;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
             <Key
-                latin:keyLabel="&#x0E07;" />
+                latin:keyLabel="&#x0E07;"
+                latin:keyLabelFlags="fontNormal" />
             <!-- U+0E30: "ะ" THAI CHARACTER SARA A
                  U+0E32: "า" THAI CHARACTER SARA AA
                  U+0E33: " ำ" THAI CHARACTER SARA AM
@@ -91,17 +107,23 @@
                  U+0E42: "โ" THAI CHARACTER SARA O -->
             <Key
                 latin:keyLabel="&#x0E30;"
-                latin:moreKeys="&#x0E32;,&#x0E33;,&#x0E40;,&#x0E41;,&#x0E43;,&#x0E44;,&#x0E42;" />
-            <!-- U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT
+                latin:moreKeys="&#x0E32;,&#x0E33;,&#x0E40;,&#x0E41;,&#x0E43;,&#x0E44;,&#x0E42;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+0020: " " SPACE
+                 U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT
                  U+0E34: " ิ" THAI CHARACTER SARA I
                  U+0E35: " ี" THAI CHARACTER SARA II
                  U+0E36: " ึ" THAI CHARACTER SARA UE
                  U+0E37: " ื" THAI CHARACTER SARA UEE
                  U+0E38: " ุ" THAI CHARACTER SARA U
                  U+0E39: " ู" THAI CHARACTER SARA UU -->
+            <!-- Note: The space character is needed as a preceding letter to draw some Thai
+                 composing characters correctly. -->
             <Key
-                latin:keyLabel="&#x0E31;"
-                latin:moreKeys="&#x0E34;,&#x0E35;,&#x0E36;,&#x0E37;,&#x0E38;,&#x0E39;" />
+                latin:keyLabel="&#x20;&#x0E31;"
+                latin:code="0x0E31"
+                latin:moreKeys="&#x0E34;,&#x0E35;,&#x0E36;,&#x0E37;,&#x0E38;,&#x0E39;"
+                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
         </default>
     </switch>
 </merge>