From 8b0ca9ef970cb3a35d7546244ad8dbba87312ae5 Mon Sep 17 00:00:00 2001 From: svu Date: Mon, 4 Sep 2006 20:25:10 +0000 Subject: [PATCH] Key types local to the group, b.fd.o#8121 --- ChangeLog | 6 ++++++ symbols/ca | 2 +- symbols/cd | 2 +- symbols/gr | 4 ++-- symbols/il | 2 +- symbols/jp | 16 ++++++++-------- symbols/la | 4 ++-- symbols/lk | 2 +- symbols/ru | 2 +- 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3685e40..6d4df44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-04 Sergey Udaltsov + + symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la, + symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis, + https://bugs.freedesktop.org/show_bug.cgi?id=8121 + 2006-09-04 Sergey Udaltsov symbols/level3: adding level3:ralt_switch_multikey, diff --git a/symbols/ca b/symbols/ca index 744ebfe..c0abbaa 100644 --- a/symbols/ca +++ b/symbols/ca @@ -445,7 +445,7 @@ xkb_symbols "multix" { key { [ eacute, Eacute, dead_acute, NoSymbol, NoSymbol, dead_abovedot ] }; - key { type= "FOUR_LEVEL", [ space, space, nobreakspace, NoSymbol ] }; + key { type[Group1]= "FOUR_LEVEL", [ space, space, nobreakspace, NoSymbol ] }; modifier_map Control{ Control_L }; diff --git a/symbols/cd b/symbols/cd index d51ab1c..a8abaa0 100644 --- a/symbols/cd +++ b/symbols/cd @@ -8,7 +8,7 @@ xkb_symbols "basic" { name[Group1]= "Congo, Democratic Republic of the"; - key.type = "FOUR_LEVEL"; + key.type[Group1] = "FOUR_LEVEL"; // Alphanumeric section // TILDE, COMBINING TILDE diff --git a/symbols/gr b/symbols/gr index 8ac6f86..329a3d1 100644 --- a/symbols/gr +++ b/symbols/gr @@ -88,7 +88,7 @@ xkb_symbols "extended" { name[Group1] = "Greece - Extended"; - key.type = "THREE_LEVEL"; + key.type[Group1] = "THREE_LEVEL"; key { [ 5, percent, EuroSign ] }; @@ -108,7 +108,7 @@ xkb_symbols "polytonic" { name[Group1] = "Greece - Polytonic"; - key.type = "THREE_LEVEL"; + key.type[Group1] = "THREE_LEVEL"; key { [ dead_tilde, dead_diaeresis, dead_macron ] }; key { [ dead_iota, VoidSymbol, dead_breve ] }; diff --git a/symbols/il b/symbols/il index 38e2d4f..2f3abe1 100644 --- a/symbols/il +++ b/symbols/il @@ -48,7 +48,7 @@ xkb_symbols "basic" { key { [ hebrew_taw, greater ] }; key { [ hebrew_finalzade, less ] }; - key.type = "THREE_LEVEL"; + key.type[Group1] = "THREE_LEVEL"; key { [ semicolon, asciitilde,0x10005b0 ]}; // Sheva key { [ period, question, 0x10005c3 ]}; // Sof Pasuq diff --git a/symbols/jp b/symbols/jp index 6614c69..cdb99d1 100644 --- a/symbols/jp +++ b/symbols/jp @@ -10,7 +10,7 @@ default xkb_symbols "jp106" { // Alphanumeric section key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] }; key { [ kana_NU ] }; @@ -69,18 +69,18 @@ default xkb_symbols "jp106" { key { [ Muhenkan ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Henkan, Mode_switch ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Hiragana_Katakana, Romaji ] }; // End alphanumeric section key { - type= "PC_SYSRQ", + type[Group1]= "PC_SYSRQ", symbols[Group1]= [ Print, Execute ] }; }; @@ -92,7 +92,7 @@ xkb_symbols "latin" { include "us" // Alphanumeric section key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] }; @@ -121,16 +121,16 @@ xkb_symbols "latin" { key { [ Muhenkan ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Henkan, Mode_switch ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Hiragana_Katakana, Romaji ] }; key { - type= "PC_SYSRQ", + type[Group1]= "PC_SYSRQ", symbols[Group1]= [ Print, Execute ] }; }; diff --git a/symbols/la b/symbols/la index 1423959..99e9cf9 100644 --- a/symbols/la +++ b/symbols/la @@ -67,11 +67,11 @@ xkb_symbols "basic" { key { [ 0x1000e9d, parenright ]}; override key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", [ Shift_L, ISO_First_Group ] }; override key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", [ Shift_R, ISO_Last_Group ] }; }; diff --git a/symbols/lk b/symbols/lk index eda8bb8..223c1f8 100644 --- a/symbols/lk +++ b/symbols/lk @@ -36,7 +36,7 @@ xkb_symbols "sin_phonetic" { include "us" // it is default - no details in the name name[Group1] = "Sri Lanka"; - key.type = "FOUR_LEVEL"; + key.type[Group1] = "FOUR_LEVEL"; // q - p key { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] }; diff --git a/symbols/ru b/symbols/ru index bc36bfe..4a64ad9 100644 --- a/symbols/ru +++ b/symbols/ru @@ -165,7 +165,7 @@ xkb_symbols "tt" { include "ru(winkeys)" name[Group1]= "Russia - Tatar"; - key.type[group2]="FOUR_LEVEL"; + key.type[group1]="FOUR_LEVEL"; key { [ 0x010004bb, 0x010004ba, Cyrillic_io, Cyrillic_IO ] }; -- 2.32.0.93.g670b81a890