Synchronised line endinge with release branch

1 files changed, 90 insertions, 90 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk
index c4fd2ae50..356e060fe 100644
--- a/xorg-server/xkeyboard-config/symbols/lk
+++ b/xorg-server/xkeyboard-config/symbols/lk
@@ -1,90 +1,90 @@
-// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)

-// Maintainer  : Harshula Jayasuriya <harshula@gmail.com>

-// Last Updated: 2011-05-25

-// This is a phonetic static mapping for a standard US-English keyboard

-// (qwerty)

-// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html

-

-// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,

-// respectively. The problem lies with the XKB infrastructure which

-// only allows a one-to-one mapping of keycodes to Unicode codepoints.

-// Unfortunately, the 3 mentioned glyphs actually consists of 3

-// Unicode codepoints each. The result is that the user must

-// manually construct the glyph by typing each of the 3 codepoints.

-// ALT-, represents the 'JOIN' key, it requires

-// two codepoints, hence it also has to be manually constructed.

-// Similarly, ALT-/ representing the 'TOUCH' key requires

-// two codepoints.

-

-// Repaya = rayanna,AL,ZWJ

-// Rakaransaya = AL,ZWJ,rayanna

-// Yansaya = AL,ZWJ,yayanna

-// JOIN = AL,ZWJ

-// TOUCH = ZWJ,AL

-

-// Where,

-// AL = Al Lakuna = ALT-a

-// ZWJ = Zero Width Joiner = ALT-/

-// rayanna = r

-// yayanna = y

-

-partial default alphanumeric_keys

-xkb_symbols "sin_phonetic" {

-

-  include "us"

-  name[Group1] = "Sinhala (phonetic)";

-  key.type[Group1] = "FOUR_LEVEL";

-

-  // q - p

-  key <AD01> { [ Sinh_ri, Sinh_rii, Sinh_ru2, Sinh_ruu2 ] };

-  key <AD02> { [ Sinh_ae, Sinh_aee, Sinh_ae2, Sinh_aee2 ] };

-  key <AD03> { [ Sinh_e, Sinh_ee, Sinh_e2, Sinh_ee2 ] };

-  key <AD04> { [ Sinh_ra, Sinh_al, Sinh_ra, NoSymbol ] };

-  key <AD05> { [ Sinh_tha, Sinh_thha, Sinh_tta, Sinh_ttha ] };

-  key <AD06> { [ Sinh_ya, Sinh_al, NoSymbol, NoSymbol ] };

-  key <AD07> { [ Sinh_u, Sinh_uu, Sinh_u2, Sinh_uu2 ] };

-  key <AD08> { [ Sinh_i, Sinh_ii, Sinh_i2, Sinh_ii2 ] };

-  key <AD09> { [ Sinh_o, Sinh_oo, Sinh_o2, Sinh_oo2 ] };

-  key <AD10> { [ Sinh_pa, Sinh_pha, NoSymbol, NoSymbol ] };

-

-  // a - l

-  key <AC01> { [ Sinh_a, Sinh_aa, Sinh_al, Sinh_aa2 ] };

-  key <AC02> { [ Sinh_sa, Sinh_sha, Sinh_ssha, NoSymbol ] };

-  key <AC03> { [ Sinh_dha, Sinh_dhha, Sinh_dda, Sinh_ddha ] };

-  key <AC04> { [ Sinh_fa, NoSymbol, Sinh_ai2, Sinh_ai ] };

-  key <AC05> { [ Sinh_ga, Sinh_gha, Sinh_nga, NoSymbol ] };

-  key <AC06> { [ Sinh_ha, Sinh_h2, Sinh_au2, Sinh_au ] };

-  key <AC07> { [ Sinh_ja, Sinh_jha, Sinh_nja, NoSymbol ] };

-  key <AC08> { [ Sinh_ka, Sinh_kha, Sinh_lu, Sinh_luu ] };

-  key <AC09> { [ Sinh_la, Sinh_lla, Sinh_lu2, Sinh_luu2 ] };

-

-  // z - ?

-  key <AB01> { [ Sinh_nya, Sinh_jnya, NoSymbol, NoSymbol ] };

-  key <AB02> { [ Sinh_ndha, Sinh_ndda, NoSymbol, NoSymbol ] };

-  key <AB03> { [ Sinh_ca, Sinh_cha, NoSymbol, NoSymbol ] };

-  key <AB04> { [ Sinh_va, NoSymbol, NoSymbol, NoSymbol ] };

-  key <AB05> { [ Sinh_ba, Sinh_bha, NoSymbol, NoSymbol ] };

-  key <AB06> { [ Sinh_na, Sinh_nna, Sinh_ng, Sinh_ng2 ] };

-  key <AB07> { [ Sinh_ma, Sinh_mba, NoSymbol, NoSymbol ] };

-  key <AB08> { [ any, any, Sinh_al, NoSymbol ] };

-  key <AB09> { [ any, any, Sinh_kunddaliya, NoSymbol ] };

-  key <AB10> { [ any, any, 0x100200d, NoSymbol ] };

-

-  // Space

-  include "nbsp(nb2zwnj3s)"

-

-  include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "tam_unicode" {

-    include "in(tam_unicode)"

-    name[Group1]= "Tamil (Sri Lanka, Unicode)";

-};

-

-partial alphanumeric_keys

-xkb_symbols "tam_TAB" {

-    include "in(tam_TAB)"

-    name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";

-};

-

+// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
+// Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
+// Last Updated: 2011-05-25
+// This is a phonetic static mapping for a standard US-English keyboard
+// (qwerty)
+// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
+
+// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,
+// respectively. The problem lies with the XKB infrastructure which
+// only allows a one-to-one mapping of keycodes to Unicode codepoints.
+// Unfortunately, the 3 mentioned glyphs actually consists of 3
+// Unicode codepoints each. The result is that the user must
+// manually construct the glyph by typing each of the 3 codepoints.
+// ALT-, represents the 'JOIN' key, it requires
+// two codepoints, hence it also has to be manually constructed.
+// Similarly, ALT-/ representing the 'TOUCH' key requires
+// two codepoints.
+
+// Repaya = rayanna,AL,ZWJ
+// Rakaransaya = AL,ZWJ,rayanna
+// Yansaya = AL,ZWJ,yayanna
+// JOIN = AL,ZWJ
+// TOUCH = ZWJ,AL
+
+// Where,
+// AL = Al Lakuna = ALT-a
+// ZWJ = Zero Width Joiner = ALT-/
+// rayanna = r
+// yayanna = y
+
+partial default alphanumeric_keys
+xkb_symbols "sin_phonetic" {
+
+  include "us"
+  name[Group1] = "Sinhala (phonetic)";
+  key.type[Group1] = "FOUR_LEVEL";
+
+  // q - p
+  key <AD01> { [ Sinh_ri, Sinh_rii, Sinh_ru2, Sinh_ruu2 ] };
+  key <AD02> { [ Sinh_ae, Sinh_aee, Sinh_ae2, Sinh_aee2 ] };
+  key <AD03> { [ Sinh_e, Sinh_ee, Sinh_e2, Sinh_ee2 ] };
+  key <AD04> { [ Sinh_ra, Sinh_al, Sinh_ra, NoSymbol ] };
+  key <AD05> { [ Sinh_tha, Sinh_thha, Sinh_tta, Sinh_ttha ] };
+  key <AD06> { [ Sinh_ya, Sinh_al, NoSymbol, NoSymbol ] };
+  key <AD07> { [ Sinh_u, Sinh_uu, Sinh_u2, Sinh_uu2 ] };
+  key <AD08> { [ Sinh_i, Sinh_ii, Sinh_i2, Sinh_ii2 ] };
+  key <AD09> { [ Sinh_o, Sinh_oo, Sinh_o2, Sinh_oo2 ] };
+  key <AD10> { [ Sinh_pa, Sinh_pha, NoSymbol, NoSymbol ] };
+
+  // a - l
+  key <AC01> { [ Sinh_a, Sinh_aa, Sinh_al, Sinh_aa2 ] };
+  key <AC02> { [ Sinh_sa, Sinh_sha, Sinh_ssha, NoSymbol ] };
+  key <AC03> { [ Sinh_dha, Sinh_dhha, Sinh_dda, Sinh_ddha ] };
+  key <AC04> { [ Sinh_fa, NoSymbol, Sinh_ai2, Sinh_ai ] };
+  key <AC05> { [ Sinh_ga, Sinh_gha, Sinh_nga, NoSymbol ] };
+  key <AC06> { [ Sinh_ha, Sinh_h2, Sinh_au2, Sinh_au ] };
+  key <AC07> { [ Sinh_ja, Sinh_jha, Sinh_nja, NoSymbol ] };
+  key <AC08> { [ Sinh_ka, Sinh_kha, Sinh_lu, Sinh_luu ] };
+  key <AC09> { [ Sinh_la, Sinh_lla, Sinh_lu2, Sinh_luu2 ] };
+
+  // z - ?
+  key <AB01> { [ Sinh_nya, Sinh_jnya, NoSymbol, NoSymbol ] };
+  key <AB02> { [ Sinh_ndha, Sinh_ndda, NoSymbol, NoSymbol ] };
+  key <AB03> { [ Sinh_ca, Sinh_cha, NoSymbol, NoSymbol ] };
+  key <AB04> { [ Sinh_va, NoSymbol, NoSymbol, NoSymbol ] };
+  key <AB05> { [ Sinh_ba, Sinh_bha, NoSymbol, NoSymbol ] };
+  key <AB06> { [ Sinh_na, Sinh_nna, Sinh_ng, Sinh_ng2 ] };
+  key <AB07> { [ Sinh_ma, Sinh_mba, NoSymbol, NoSymbol ] };
+  key <AB08> { [ any, any, Sinh_al, NoSymbol ] };
+  key <AB09> { [ any, any, Sinh_kunddaliya, NoSymbol ] };
+  key <AB10> { [ any, any, 0x100200d, NoSymbol ] };
+
+  // Space
+  include "nbsp(nb2zwnj3s)"
+
+  include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "tam_unicode" {
+    include "in(tam_unicode)"
+    name[Group1]= "Tamil (Sri Lanka, Unicode)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "tam_TAB" {
+    include "in(tam_TAB)"
+    name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";
+};
+