svn merge ^/branches/released .

1 files changed, 50 insertions, 55 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm
index 43218ead5..de854855e 100644
--- a/xorg-server/xkeyboard-config/symbols/mm
+++ b/xorg-server/xkeyboard-config/symbols/mm
@@ -1,63 +1,58 @@
-// based on a keyboard map from an 'xkb/symbols/mm' file

-

 partial default alphanumeric_keys 

 xkb_symbols "basic" {

-      name[Group1]= "Myanmar";

-

-// Mainly numbers.

-      key <AE01> { [      0x1001041, exclam 	]	};

-      key <AE02> { [      0x1001042 		]	};

-      key <AE03> { [      0x1001043 	 	]	};

-      key <AE04> { [      0x1001044  	 	]	};

-      key <AE05> { [      0x1001045 		]	};

-      key <AE06> { [      0x1001046 	 	]	};

-      key <AE07> { [      0x1001047 		]	};

-      key <AE08> { [      0x1001048  	 	]	};

-      key <AE09> { [      0x1001049, parenleft 	]	};

-      key <AE10> { [      0x1001040, parenright ]	};

-      key <AE11> { [      minus, 0x1001038 	]	};

-      key <AE12> { [      0x1001052, 0x1001056 	]	};

+    name[Group1]= "Myanmar";

 

-// Mainly long vowels

-      key <AD01> { [      0x100102A,  0x100102A ]	};

-      key <AD02> { [      0x1001032,  0x1001032 ]	};

-      key <AD03> { [      0x100102C,  0x1001021 ]	};

-      key <AD04> { [      0x100102E,  0x1001024 ]	};

-      key <AD05> { [      0x1001030,  0x1001026 ]	};

+    // Alphanumeric section

+    key <TLDE> { [      U1050,      U100E,        grave,  asciitilde ] };

+    key <AE01> { [      U1041,      U100D,            1,      exclam ] };

+    key <AE02> { [      U1042,      U1052,            2,          at ] };

+    key <AE03> { [      U1043,      U100B,            3,  numbersign ] };

+    key <AE04> { [      U1044,      U1053,            4,      dollar ] };

+    key <AE05> { [      U1045,      U1054,            5,     percent ] };

+    key <AE06> { [      U1046,      U1055,            6, asciicircum ] };

+    key <AE07> { [      U1047,      U101B,            7,   ampersand ] };

+    key <AE08> { [      U1048,   asterisk,            8,    asterisk ] };

+    key <AE09> { [      U1049,  parenleft,            9,   parenleft ] };

+    key <AE10> { [      U1040, parenright,            0,  parenright ] };

+    key <AE11> { [      minus, underscore,        minus,  underscore ] };

+    key <AE12> { [      equal,       plus,        equal,        plus ] };

 

-// Mainly voiced consonants

-      key <AD06> { [      0x1001017,  0x1001018 ]	};

-      key <AD07> { [      0x100101F,  0x1001004 ]	};

-      key <AD08> { [      0x1001002,  0x1001003 ]	};

-      key <AD09> { [      0x1001012,  0x1001013 ]	};

-      key <AD10> { [      0x1001007,  0x1001008 ]	};

-      key <AD11> { [      0x100100d,  0x100100e	]	};

-      key <AD12> { [      0x100100a,  0x1001009	]	};

+    key <AD01> { [      U1006,      U1008,            q,           Q ] };

+    key <AD02> { [      U1010,      U101D,            w,           W ] };

+    key <AD03> { [      U1014,      U1023,            e,           E ] };

+    key <AD04> { [      U1019,      U104E,            r,           R ] };

+    key <AD05> { [      U1021,      U1024,            t,           T ] };

+    key <AD06> { [      U1015,      U104C,            y,           Y ] };

+    key <AD07> { [      U1000,      U1025,            u,           U ] };

+    key <AD08> { [      U1004,      U104D,            i,           I ] };

+    key <AD09> { [      U101E,      U103F,            o,           O ] };

+    key <AD10> { [      U1005,      U100F,            p,           P ] };

+    key <AD11> { [      U101F,      U1027,  bracketleft,   braceleft ] };

+    key <AD12> { [      U1029,      U102A, bracketright,  braceright ] };

 

-// Mainly short vowels

-      key <AC01> { [      0x1001029,  0x1001029 ]	};

-      key <AC02> { [      0x1001027,  0x1001027 ]	};

-      key <AC03> { [      0x1001039,  0x1001021 ]	};

-      key <AC04> { [      0x100102D,  0x1001023 ]	};

-      key <AC05> { [      0x100102F,  0x1001025 ]	};

+    key <AC01> { [      U1031,      U1017,            a,           A ] };

+    key <AC02> { [      U103B,      U103E,            s,           S ] };

+    key <AC03> { [      U102D,      U102E,            d,           D ] };

+    key <AC04> { [      U103A,      U1039,            f,           F ] };

+    key <AC05> { [      U102B,      U103D,            g,           G ] };

+    key <AC06> { [      U1037,      U1036,            h,           H ] };

+    key <AC07> { [      U103C,      U1032,            j,           J ] };

+    key <AC08> { [      U102F,      U1012,            k,           K ] };

+    key <AC09> { [      U1030,      U1013,            l,           L ] };

+    key <AC10> { [      U1038,      U1002,    semicolon,       colon ] };

+    key <AC11> { [ apostrophe,    quotedbl                           ] };

 

-// Mainly unvoiced consonants

-      key <AC06> { [      0x1001015,  0x1001016 ]	};

-      key <AC07> { [      0x100101B,  0x100101B ]	};

-      key <AC08> { [      0x1001000,  0x1001001 ]	};

-      key <AC09> { [      0x1001010,  0x1001011 ]	};

-      key <AC10> { [      0x1001005,  0x1001006 ]	};

-      key <AC11> { [      0x100100b,  0x100100c ]	};

-      key <BKSL> { [      0x100104E,  0x100104F ]	};

+    key <AB01> { [      U1016,       U1007,           z,           Z ] };

+    key <AB02> { [      U1011,       U100C,           x,           X ] };

+    key <AB03> { [      U1001,       U1003,           c,           C ] };

+    key <AB04> { [      U101C,       U1020,           v,           V ] };

+    key <AB05> { [      U1018,       U101A,           b,           B ] };

+    key <AB06> { [      U100A,       U1009,           n,           N ] };

+    key <AB07> { [      U102C,       U1026,           m,           M ] };

+    key <AB08> { [      comma,        U104A,      comma,        less ] };

+    key <AB09> { [     period,        U104B,     period,     greater ] };

+    key <AB10> { [      slash,    question                           ] };

 

-      key <AB01> { [      0x100104C,  0x100104D ]       };

-      key <AB02> { [      0x1001037,  0x1001036 ]       };

-      key <AB03> { [      0x1001019,  0x100100f ]       };

-      key <AB04> { [      0x1001014,  0x1001014 ]       };

-      key <AB05> { [      0x1001017,  0x1001017 ]       };

-      key <AB06> { [      0x100101C,  0x100101C ]       };

-      key <AB07> { [      0x100101E,  0x1001050 ]       };

-      key <AB08> { [      comma,      0x1001051 ]       };

-      key <AB09> { [      period,     0x100104A ]       };

-      key <AB10> { [      slash,      0x100101A ]       };

+    key <BKSL> { [      U104F,       U1051,   backslash,         bar ] };

+    // End alphanumeric section

 };