svn merge ^/branches/released .

6 files changed, 96 insertions, 47 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index f72e4cf95..188855ab4 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -23,7 +23,7 @@
         <variant>

           <configItem>

             <name>ave</name>

-            <_description>Iran Avestan</_description>

+            <_description>Iran - Avestan</_description>

             <languageList><iso639Id>ave</iso639Id></languageList>

           </configItem>

         </variant>

@@ -31,6 +31,22 @@
     </layout>

     <layout>

       <configItem>

+        <name>lt</name>

+        <_shortDescription>Ltu</_shortDescription>

+        <_description>Lithuania</_description>

+        <languageList><iso639Id>lit</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>dvorak</name>

+            <_description>Lithuania - Dvorak</_description>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

         <name>us</name>

         <_shortDescription>USA</_shortDescription>

         <_description>USA</_description>

@@ -40,26 +56,26 @@
         <variant>

           <configItem>

             <name>intl-unicode</name>

-            <_description>USA International (AltGr Unicode combining)</_description>

+            <_description>USA - International (AltGr Unicode combining)</_description>

           </configItem>

         </variant>

         <variant>

           <configItem>

             <name>alt-intl-unicode</name>

-            <_description>USA International (AltGr Unicode combining, alternative)</_description>

+            <_description>USA - International (AltGr Unicode combining, alternative)</_description>

           </configItem>

         </variant>

         <variant>

           <configItem>

             <name>ats</name>

-            <_description>USA Atsina</_description>

+            <_description>USA - Atsina</_description>

             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->

           </configItem>

         </variant>

         <variant>

           <configItem>

             <name>crd</name>

-            <_description>USA Couer D'alene Salish</_description>

+            <_description>USA - Couer D'alene Salish</_description>

             <languageList><iso639Id>crd</iso639Id></languageList>

           </configItem>

         </variant>

@@ -76,7 +92,7 @@
         <variant>

           <configItem>

             <name>ergonomic</name>

-            <_description>Ergonomic Touchtype</_description>

+            <_description>Romania - Ergonomic Touchtype</_description>

           </configItem>

         </variant>

       </variantList>

@@ -84,7 +100,7 @@
     <layout>

       <configItem>

         <name>rs</name>

-        <_shortDescription>SRB</_shortDescription>

+        <_shortDescription>Srb</_shortDescription>

         <_description>Serbia</_description>

         <languageList><iso639Id>srp</iso639Id></languageList>

       </configItem>

@@ -92,7 +108,7 @@
         <variant>

           <configItem>

             <name>combiningkeys</name>

-            <_description>Serbia Combining accents instead of dead keys</_description>

+            <_description>Serbia - Combining accents instead of dead keys</_description>

           </configItem>

         </variant>

       </variantList>

@@ -107,7 +123,7 @@
         <variant>

           <configItem>

             <name>chu</name>

-            <description>Russia Church Slavonic</description>

+            <description>Russia - Church Slavonic</description>

             <languageList><iso639Id>chu</iso639Id></languageList>

           </configItem>

         </variant>

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 1a3d528d1..e4c79fe77 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1778,7 +1778,7 @@
         <variant>

           <configItem>

              <name>mal_enhanced</name>

-             <_description>India - Malayalam enhanced INSCRIPT with Rupee Sign</_description>

+             <_description>India - Malayalam enhanced Inscript with Rupee Sign</_description>

              <languageList><iso639Id>mal</iso639Id></languageList>

           </configItem>

          </variant>

@@ -3925,7 +3925,7 @@
     <layout>

       <configItem>

         <name>rs</name>

-        <_shortDescription>SRB</_shortDescription>

+        <_shortDescription>Srb</_shortDescription>

         <_description>Serbia</_description>

         <languageList>

           <iso639Id>srp</iso639Id>

diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index 10683855b..c46a05373 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -1351,7 +1351,7 @@ xkb_symbols "eng" {
 partial alphanumeric_keys 

 xkb_symbols "mal_enhanced" {

 

-    name[Group1] = "India - Malayalam Modified Inscript with Rupee Sign";

+    name[Group1] = "India - Malayalam enhanced Inscript with Rupee Sign";

 

    //From grave to backslash (\)

     

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

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

-// Last Updated: 2007-06-29

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

+// Last Updated: 2011-03-20

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

 // (qwerty)

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

 

@@ -37,42 +37,42 @@ xkb_symbols "sin_phonetic" {
   key.type[Group1] = "FOUR_LEVEL";

 

   // q - p

-  key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };

-  key <AD02> { [ 0x01000d87, 0x01000d88, 0x01000dd0, 0x01000dd1 ] };

-  key <AD03> { [ 0x01000d91, 0x01000d92, 0x01000dd9, 0x01000dda ] };

-  key <AD04> { [ 0x01000dbb, 0x01000dca, 0x01000dbb, NoSymbol ] };

-  key <AD05> { [ 0x01000dad, 0x01000dae, 0x01000da7, 0x01000da8 ] };

-  key <AD06> { [ 0x01000dba, 0x01000dca, NoSymbol, NoSymbol ] };

-  key <AD07> { [ 0x01000d8b, 0x01000d8c, 0x01000dd4, 0x01000dd6 ] };

-  key <AD08> { [ 0x01000d89, 0x01000d8a, 0x01000dd2, 0x01000dd3 ] };

-  key <AD09> { [ 0x01000d94, 0x01000d95, 0x01000ddc, 0x01000ddd ] };

-  key <AD10> { [ 0x01000db4, 0x01000db5, NoSymbol, NoSymbol ] };

+  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> { [ 0x01000d85, 0x01000d86, 0x01000dca, 0x01000dcf ] };

-  key <AC02> { [ 0x01000dc3, 0x01000dc1, 0x01000dc2, NoSymbol ] };

-  key <AC03> { [ 0x01000daf, 0x01000db0, 0x01000da9, 0x01000daa ] };

-  key <AC04> { [ 0x01000dc6, NoSymbol, 0x01000ddb, 0x01000d93 ] };

-  key <AC05> { [ 0x01000d9c, 0x01000d9d, 0x01000d9f, NoSymbol ] };

-  key <AC06> { [ 0x01000dc4, 0x01000d83, 0x01000dde, 0x01000d96 ] };

-  key <AC07> { [ 0x01000da2, 0x01000da3, 0x01000da6, NoSymbol ] };

-  key <AC08> { [ 0x01000d9a, 0x01000d9b, 0x01000d8f, 0x01000d90 ] };

-  key <AC09> { [ 0x01000dbd, 0x01000dc5, 0x01000ddf, 0x01000df3 ] };

+  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> { [ 0x01000da4, 0x01000da5, NoSymbol, NoSymbol ] };

-  key <AB02> { [ 0x01000db3, 0x01000dac, NoSymbol, NoSymbol ] };

-  key <AB03> { [ 0x01000da0, 0x01000da1, NoSymbol, NoSymbol ] };

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

-  key <AB05> { [ 0x01000db6, 0x01000db7, NoSymbol, NoSymbol ] };

-  key <AB06> { [ 0x01000db1, 0x01000dab, 0x01000d82, 0x01000d9e ] };

-  key <AB07> { [ 0x01000db8, 0x01000db9, NoSymbol, NoSymbol ] };

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

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

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

+  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(zwnj2nb3s)"

+  include "nbsp(nb2zwnj3s)"

 

   include "level3(ralt_switch)"

 };

@@ -88,3 +88,4 @@ xkb_symbols "tam_TAB" {
     include "in(tam_TAB)"

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

 };

+

diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 5a19dc265..eaff3c3cc 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -294,3 +294,25 @@ xkb_symbols "lekpa" {
     key <AB09> {[      aogonek,             Aogonek,       greater ]};

     key <AB10> {[            h,                   H                ]};

 };

+

+partial alphanumeric_keys modifier_keys

+xkb_symbols "dvorak" {

+

+    include "us(dvorak)"

+

+    name[Group1]="Lithuania - Dvorak";

+

+    key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ] };

+    key <AE02>	{ [    ccaron,       Ccaron,        2,          at ] };

+    key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ] };

+    key <AE04>	{ [ eabovedot,    Eabovedot,        4,      dollar ] };

+    key <AE05>	{ [   iogonek,      Iogonek,        5,     percent ] };

+    key <AE06>	{ [    scaron,       Scaron,        6, asciicircum ] };

+    key <AE07>	{ [   uogonek,      Uogonek,        7,   ampersand ] };

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

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

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

+    key <AD12>	{ [    zcaron,       Zcaron,    equal,        plus ] };

+

+    include "level3(ralt_switch)"

+};

diff --git a/xorg-server/xkeyboard-config/symbols/nbsp b/xorg-server/xkeyboard-config/symbols/nbsp
index 220dae460..f6139ed90 100644
--- a/xorg-server/xkeyboard-config/symbols/nbsp
+++ b/xorg-server/xkeyboard-config/symbols/nbsp
@@ -145,9 +145,7 @@ xkb_symbols "zwnj2nb3" {
 

 

 // ZWNJ on level 2

-// ZWJ on level 3

-// NBSP on level 4

-// Used by lk(sin_phonetic)

+// NBSP on level 3

 partial

 xkb_symbols "zwnj2nb3s" {

   key <SPCE> {

@@ -192,3 +190,15 @@ xkb_symbols "zwnj3zwj4" {
     symbols[Group1]= [ space, space, 0x100200c, 0x100200d ]

   };

 };

+

+

+// NBSP on level 2

+// ZWNJ on level 3

+// Used by lk(sin_phonetic)

+partial

+xkb_symbols "nb2zwnj3s" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, nobreakspace, 0x100200c, NoSymbol ]

+  };

+};