Added ru(srp), us(srp)

http://bugs.freedesktop.org/show_bug.cgi?id=26409

diff --git a/rules/base.xml.in b/rules/base.xml.in
index f0bb83a..3468c01 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1301,6 +1301,14 @@
             <_description>Group toggle on multiply/divide key</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>srp</name>
+            <_description>Serbian</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>srp</iso639Id> </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3489,6 +3497,14 @@
         </variant>
         <variant>
           <configItem>
+            <name>srp</name>
+            <_description>Serbian</_description>
+            <languageList><iso639Id>rus</iso639Id>
+                          <iso639Id>srp</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>bak</name>
             <_description>Bashkirian</_description>
             <languageList><iso639Id>bak</iso639Id></languageList>

diff --git a/symbols/ru b/symbols/ru
index dee1f71..ed4456f 100644 (file)
--- a/symbols/ru
+++ b/symbols/ru
@@ -484,3 +484,27 @@ xkb_symbols "bak" {
     include "level3(ralt_switch)"
 };
 
+// Serbian charecters added as third level symbols to Russian keyboard layout.
+
+partial default alphanumeric_keys
+xkb_symbols "srp" {
+    include "ru(common)"
+    include "level3(ralt_switch)"
+
+    name[Group1]= "Russia - Serbian";
+
+    key <AE03> { [ 3, numerosign ] };
+    key <AE04> { [ 4, semicolon ] };
+    key <AE05> { [ 5, percent ] };
+    key <AE06> { [ 6, colon ] };
+    key <AE07> { [ 7, question ] };
+    key <AE08> { [ 8, asterisk ] };
+    key <AB10> { [ period, comma ] };
+    key <BKSL> { [ backslash, slash ] };
+    key        <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, U458, U408 ] };
+    key        <AD06> { [ Cyrillic_en, Cyrillic_EN, U45A, U40A ] };
+    key        <AC08> { [ Cyrillic_el, Cyrillic_EL, U459, U409 ] };
+    key        <AC09> { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] };
+    key        <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] };
+    key        <AB02> { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] };
+};

diff --git a/symbols/us b/symbols/us
index c732de6..5221614 100644 (file)
--- a/symbols/us
+++ b/symbols/us
@@ -1051,3 +1051,25 @@ xkb_symbols "chr" {
 
     // End alphanumeric section
 };
+
+// Serbian charecters added as third level symbols to US keyboard layout.
+
+partial alphanumeric_keys
+xkb_symbols "srp" {
+
+  name[Group1]= "USA - Serbian";
+
+  include "us"
+
+  key <TLDE> { [ grave, asciitilde ] };
+  key <AE06> { [ 6, dead_caron, asciicircum, asciicircum ] };
+  key <AC09> { [ l, L, U1C9, U1C8 ] };
+  key <AB06> { [ n, N, U1CC, U1CB ] };
+  key <AB01> { [ z, Z, U1C6, U1C5 ] };
+  key <AD03> { [ e, E, EuroSign, cent ] };
+  key <AC03> { [ d, D, dstroke, Dstroke ] };
+  key <AC11> { [ dead_acute, quotedbl, apostrophe, U315 ] };
+  key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+
+  include "level3(ralt_switch)"
+};