separating group(olpc), b.fd.o#14225

diff --git a/ChangeLog b/ChangeLog
index 81a6db4..2665326 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24  Sergey Udaltsov
+
+       * symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in,
+       symbols/kz, symbols/np, symbols/pk, symbols/ru, symbols/th,
+       symbols/us: separating group(olpc), closing
+       http://bugs.freedesktop.org/show_bug.cgi?id=14225
+
 2008-01-21  Sergey Udaltsov
 
        * symbols/gr: Polytonic Greek: Use new keysyms for dead psili and

diff --git a/symbols/af b/symbols/af
index 3cc2c4a..430bbba 100644 (file)
--- a/symbols/af
+++ b/symbols/af
@@ -269,8 +269,7 @@ xkb_symbols "olpc-ps" {
    key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U
    key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
 
-   //language key
-   key <I219> {  [ISO_Next_Group  ,  ISO_Prev_Group      ]     };
+   include "group(olpc)"
 };
 
 partial alphanumeric_keys 
@@ -331,8 +330,7 @@ xkb_symbols "olpc-da" {
    key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u
    key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
 
-   //language key
-   key <I219> { [ ISO_Next_Group,  ISO_Prev_Group ] };
+   include "group(olpc)"
 };
 
 partial alphanumeric_keys 
@@ -393,6 +391,5 @@ xkb_symbols "olpc-uz" {
    key <AB09> { [ period, less ] };
    key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below
 
-   //language key
-   key <I219> { [ ISO_Next_Group,  ISO_Prev_Group ] };
+   include "group(olpc)"
 };

diff --git a/symbols/ara b/symbols/ara
index ac2a767..a42fc69 100644 (file)
--- a/symbols/ara
+++ b/symbols/ara
@@ -271,6 +271,6 @@ xkb_symbols "olpc" {
     key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };
     key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    
     key <AB05> {  [     Arabic_thal,      asciicircum ] };
-    // Language key
-    key <I219> {  [  ISO_Next_Group,   ISO_Prev_Group ] };
+
+    include "group(olpc)"
 };

diff --git a/symbols/et b/symbols/et
index 4f8289b..e6d1ba7 100644 (file)
--- a/symbols/et
+++ b/symbols/et
@@ -69,7 +69,7 @@ xkb_symbols "olpc" {
     key <AB09> { [        0x01001364,  VoidSymbol ]    }; // >
     key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
 
-
     key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
 
+    include "group(olpc)"
 };

diff --git a/symbols/group b/symbols/group
index 4efa318..a52473e 100644 (file)
--- a/symbols/group
+++ b/symbols/group
@@ -320,3 +320,8 @@ xkb_symbols "alt_caps_toggle" {
     };
 };
 
+partial hidden modifier_keys
+xkb_symbols "olpc" {
+  key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
+

diff --git a/symbols/in b/symbols/in
index be3a7fa..1ecabc1 100644 (file)
--- a/symbols/in
+++ b/symbols/in
@@ -1100,6 +1100,6 @@ xkb_symbols "olpc" {
   key <AB10> { [       0x100092F,      0x100095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
 
   key <SPCE> { [       0x100200C,      0x100200D ] }; // ZERO-WIDTH-NON-JOINER (ZWNJ); ZERO-WIDTH-JOINER (ZWJ)
-  // language key
-  key <I219> {  [ISO_Next_Group  ,  ISO_Prev_Group      ]     };
+
+  include "group(olpc)"
 };

diff --git a/symbols/kz b/symbols/kz
index 7fb9596..55bbb1f 100644 (file)
--- a/symbols/kz
+++ b/symbols/kz
@@ -213,5 +213,6 @@ xkb_symbols "olpc" {
 
    key <TLDE> { [ parenleft,               parenright ] };
    key <BKSL> { [ Cyrillic_io,             Cyrillic_IO ] };
-   key <I219> { [ ISO_Next_Group,          ISO_Prev_Group ] };
+
+   include "group(olpc)"
 };

diff --git a/symbols/np b/symbols/np
index 2f56257..26085c0 100644 (file)
--- a/symbols/np
+++ b/symbols/np
@@ -120,5 +120,5 @@ xkb_symbols "olpc" {
       key <AB08> { [      comma,  0x1000935            ]       }; // VA
       key <AB09> { [      0x1000964,  0x1000965                ]       }; // PURNA VIRAM, DIRGHA VIRAM
 
-      key <I219> { [ ISO_Next_Group, ISO_Prev_Group    ]       };  //language key
+      include "group(olpc)"
 };

diff --git a/symbols/pk b/symbols/pk
index 7e83585..43ee862 100644 (file)
--- a/symbols/pk
+++ b/symbols/pk
@@ -216,6 +216,5 @@ xkb_symbols "olpc" {
    key <AB09> {  [ 0x10006D4, 0x1000656 ] };
    key <AB10> {  [ slash,     0x100061F ] };
 
-   //language key
-   key <I219> {  [ISO_Next_Group  ,  ISO_Prev_Group      ]     };
+   include "group(olpc)"
 };

diff --git a/symbols/ru b/symbols/ru
index 6a2cc5f..9c7f379 100644 (file)
--- a/symbols/ru
+++ b/symbols/ru
@@ -83,8 +83,9 @@ xkb_symbols "olpc" {
     key <AE09> {        [               9,          parenleft, acute    ]       };
     key        <AC12> {        [       backslash,          bar, slash          ]       };
     key <AB10> {        [          period,          comma               ]       };
-    key <I219> {        [  ISO_Next_Group,          ISO_Prev_Group      ]       };
     key <BKSL> {        [       backslash,          slash               ]       };
+
+    include "group(olpc)"
 };
 
 partial alphanumeric_keys

diff --git a/symbols/th b/symbols/th
index 952ed43..050fb52 100644 (file)
--- a/symbols/th
+++ b/symbols/th
@@ -245,5 +245,5 @@ xkb_symbols "olpc" {
     key <AB09> { [ 0x1000E43,  0x1000E2C ] };
     key <AB10> { [ 0x1000E1D,  0x1000E26 ] };
 
-    key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+    include "group(olpc)"
 };

diff --git a/symbols/us b/symbols/us
index 53074b5..e6e2ad0 100644 (file)
--- a/symbols/us
+++ b/symbols/us
@@ -880,5 +880,5 @@ partial alphanumeric_keys
 xkb_symbols "olpc2" {
    include "us(olpc)"
    name[Group1]= "USA - Group toggle on multiply/divide key";
-   key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
+   include "group(olpc)"
 };