From cbb7a1eab965ff255471d031bb32465b763340ef Mon Sep 17 00:00:00 2001 From: svu Date: Thu, 4 Oct 2007 21:46:56 +0000 Subject: [PATCH] splitting Serbia and Montenegro, b.fd.o#12390 --- ChangeLog | 4 +++ rules/base.o_s.part | 1 + rules/base.xml.in | 67 ++++++++++++++++++++++++++++++++--- rules/compat/layoutRename.lst | 1 + symbols/Makefile.am | 6 ++-- symbols/ba | 10 +++--- symbols/hr | 8 ++--- symbols/me | 53 +++++++++++++++++++++++++++ symbols/{cs => rs} | 42 +++++++++++----------- symbols/si | 10 +++--- 10 files changed, 159 insertions(+), 43 deletions(-) create mode 100644 symbols/me rename symbols/{cs => rs} (93%) diff --git a/ChangeLog b/ChangeLog index c2ff4be..a7245bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2007-10-04 Sergey Udaltsov * symbols/us: s/U.S. English/USA/ + * rules/base.o_s.part, rules/base.xml.in, + rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs, + symbols/me, symbols/rs: splitting Serbia and Montenegro + https://bugs.freedesktop.org/show_bug.cgi?id=12390 2007-10-02 Sergey Udaltsov diff --git a/rules/base.o_s.part b/rules/base.o_s.part index 45ca2d3..79adedc 100644 --- a/rules/base.o_s.part +++ b/rules/base.o_s.part @@ -79,4 +79,5 @@ kpdl:commaoss = +kpdl(commaoss) kpdl:momayyezoss = +kpdl(momayyezoss) kpdl:kposs = +kpdl(kposs) + shift:breaks_caps = +shift(breaks_caps) diff --git a/rules/base.xml.in b/rules/base.xml.in index 28a0be0..5700a4b 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -948,7 +948,7 @@ us <_shortDescription>USA - <_description>U.S. English + <_description>USA @@ -1020,7 +1020,7 @@ olpc2 - <_description>OLPC with mode toggle on multiply/divide key + <_description>Group toggle on multiply/divide key @@ -2431,6 +2431,57 @@ + + + me + <_shortDescription>MNE + <_description>Montenegro + + + + + yz + <_description>Z and ZHE swapped + + + + + latin + <_description>Latin + + + + + latinunicode + <_description>Latin Unicode + + + + + latinyz + <_description>Latin qwerty + + + + + latinunicodeyz + <_description>Latin Unicode qwerty + + + + + alternatequotes + <_description>With guillemets + + + + + latinalternatequotes + <_description>Latin with guillemets + + + + mk @@ -2690,9 +2741,9 @@ - cs - <_shortDescription>SCG - <_description>Serbia and Montenegro + rs + <_shortDescription>SRB + <_description>Serbia @@ -3892,6 +3943,12 @@ <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel. + diff --git a/rules/compat/layoutRename.lst b/rules/compat/layoutRename.lst index 6f9a5db..cecda6d 100644 --- a/rules/compat/layoutRename.lst +++ b/rules/compat/layoutRename.lst @@ -1,6 +1,7 @@ ar ara ben in(ben) bs ba +cs rs cz_qwerty cz(qwerty) dev in(deva) dvorak us(dvorak) diff --git a/symbols/Makefile.am b/symbols/Makefile.am index cec07d7..97c816d 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -8,7 +8,7 @@ be bd \ bg br ba \ bt by braille \ ca cd \ -ch cn cs cz \ +ch cn cz \ de dk \ ee es et epo \ fi fo fr \ @@ -19,11 +19,11 @@ ir is it jp \ kg kh kr kz \ la latam latin \ lk lt lv \ -ma mao mk \ +ma mao me mk \ mm mn mt mv \ ng nl no np \ pc pk pl pt \ -ro ru \ +ro rs ru \ se si sk \ sy th \ tj tr \ diff --git a/symbols/ba b/symbols/ba index c4499e2..68a887a 100644 --- a/symbols/ba +++ b/symbols/ba @@ -6,7 +6,7 @@ xkb_symbols "basic" { name[Group1]="Bosnia and Herzegovina"; - include "cs(latin)" + include "rs(latin)" }; partial alphanumeric_keys @@ -14,7 +14,7 @@ xkb_symbols "us" { name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian letters"; - include "cs(latinyz)" + include "rs(latinyz)" }; @@ -23,7 +23,7 @@ xkb_symbols "alternatequotes" { name[Group1]= "Bosnia and Herzegovina - Use guillemets for quotes"; - include "cs(latinalternatequotes)" + include "rs(latinalternatequotes)" }; partial alphanumeric_keys @@ -31,7 +31,7 @@ xkb_symbols "unicode" { name[Group1]= "Bosnia and Herzegovina - Use Bosnian digraphs"; - include "cs(latinunicode)" + include "rs(latinunicode)" }; partial alphanumeric_keys @@ -39,5 +39,5 @@ xkb_symbols "unicodeus" { name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian digraphs"; - include "cs(latinunicodeyz)" + include "rs(latinunicodeyz)" }; diff --git a/symbols/hr b/symbols/hr index 9509eab..61c6eae 100644 --- a/symbols/hr +++ b/symbols/hr @@ -6,7 +6,7 @@ xkb_symbols "basic" { name[Group1]="Croatia"; - include "cs(latin)" + include "rs(latin)" // Redefine these keys to match XFree86 Croatian layout key { [ 1, exclam, asciitilde, dead_tilde ] }; @@ -56,7 +56,7 @@ xkb_symbols "alternatequotes" { name[Group1]= "Croatia - Use guillemets for quotes"; - include "cs(latinalternatequotes)" + include "rs(latinalternatequotes)" }; partial alphanumeric_keys @@ -64,7 +64,7 @@ xkb_symbols "unicode" { name[Group1]= "Croatia - Use Croatian digraphs"; - include "cs(latinunicode)" + include "rs(latinunicode)" }; partial alphanumeric_keys @@ -72,5 +72,5 @@ xkb_symbols "unicodeus" { name[Group1]= "Croatia - US keyboard with Croatian digraphs"; - include "cs(latinunicodeyz)" + include "rs(latinunicodeyz)" }; diff --git a/symbols/me b/symbols/me new file mode 100644 index 0000000..a528473 --- /dev/null +++ b/symbols/me @@ -0,0 +1,53 @@ +// Montenegro keyboard mapping +// +// Initially, a copy of Serbian variants +// +// $XKeyboardConfig$ + +default partial alphanumeric_keys +xkb_symbols "basic" { + include "rs(basic)" + name[Group1]= "Montenegro"; +}; + + +partial alphanumeric_keys +xkb_symbols "latin" { + include "rs(latin)" + name[Group1]= "Montenegro - Latin"; +}; + + +partial alphanumeric_keys +xkb_symbols "yz" { + include "rs(yz)" + name[Group1]= "Montenegro - Z and ZHE swapped"; +}; + +partial alphanumeric_keys +xkb_symbols "latinunicode" { + include "rs(latinunicode)" + name[Group1]= "Montenegro - Latin Unicode"; +}; + +partial alphanumeric_keys +xkb_symbols "latinyz" { + include "rs(latinyz)" + name[Group1]= "Montenegro - Latin qwerty"; +}; + +partial alphanumeric_keys +xkb_symbols "latinunicodeyz" { + include "rs(latinunicodeyz)" + name[Group1]= "Montenegro - Latin Unicode qwerty"; +}; + +xkb_symbols "alternatequotes" { + include "rs(alternatequotes)" + name[Group1]= "Montenegro - With guillemets"; +}; + +xkb_symbols "latinalternatequotes" { + include "rs(latinalternatequotes)" + name[Group1]= "Montenegro - Latin with guillemets"; +}; diff --git a/symbols/cs b/symbols/rs similarity index 93% rename from symbols/cs rename to symbols/rs index e6c4bcc..673b143 100644 --- a/symbols/cs +++ b/symbols/rs @@ -17,11 +17,11 @@ default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Serbia and Montenegro"; + name[Group1]= "Serbia"; - include "cs(level3)" - include "cs(common)" - include "cs(cyralpha)" + include "rs(level3)" + include "rs(common)" + include "rs(cyralpha)" include "level3(ralt_switch)" }; @@ -29,12 +29,12 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "latin" { - name[Group1]= "Serbia and Montenegro - Latin"; + name[Group1]= "Serbia - Latin"; include "latin(type3)" - include "cs(latalpha)" - include "cs(level3)" - include "cs(common)" + include "rs(latalpha)" + include "rs(level3)" + include "rs(common)" include "level3(ralt_switch)" }; @@ -43,9 +43,9 @@ partial alphanumeric_keys xkb_symbols "yz" { // Cyrillic_zhe and Cyrillic_ze swapped. - name[Group1]= "Serbia and Montenegro - Z and ZHE swapped"; + name[Group1]= "Serbia - Z and ZHE swapped"; - include "cs(basic)" + include "rs(basic)" key { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // y key { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // z @@ -208,19 +208,19 @@ xkb_symbols "latinunicode" { // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj // as single character). You get the title form with AltGr+Shift. - name[Group1]= "Serbia and Montenegro - Latin Unicode"; + name[Group1]= "Serbia - Latin Unicode"; - include "cs(latin)" - include "cs(twoletter)" + include "rs(latin)" + include "rs(twoletter)" }; partial alphanumeric_keys xkb_symbols "latinyz" { // For those who insist on using "english-position" Z and Y. - name[Group1]= "Serbia and Montenegro - Latin qwerty"; + name[Group1]= "Serbia - Latin qwerty"; - include "cs(latin)" + include "rs(latin)" key { [ y, Y, any,any ] }; // y key { [ z, Z, any,any ] }; // z @@ -230,9 +230,9 @@ partial alphanumeric_keys xkb_symbols "latinunicodeyz" { // Unicode, ZHE and Z swapped. - name[Group1]= "Serbia and Montenegro - Latin Unicode qwerty"; + name[Group1]= "Serbia - Latin Unicode qwerty"; - include "cs(latinunicode)" + include "rs(latinunicode)" key { [ zcaron, Zcaron, any,any ] }; // y key { [ z, Z, any,any ] }; // z @@ -241,9 +241,9 @@ xkb_symbols "latinunicodeyz" { xkb_symbols "alternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbia and Montenegro - With guillemets"; + name[Group1]= "Serbia - With guillemets"; - include "cs(basic)" + include "rs(basic)" key { [ any,any, guillemotright, NoSymbol ] }; // s key { [ any,any, guillemotleft, NoSymbol ] }; // d @@ -252,9 +252,9 @@ xkb_symbols "alternatequotes" { xkb_symbols "latinalternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbia and Montenegro - Latin with guillemets"; + name[Group1]= "Serbia - Latin with guillemets"; - include "cs(latin)" + include "rs(latin)" key { [ any,any, guillemotright, NoSymbol ] }; // s key { [ any,any, guillemotleft, NoSymbol ] }; // d diff --git a/symbols/si b/symbols/si index 237685e..8e49cac 100644 --- a/symbols/si +++ b/symbols/si @@ -6,7 +6,7 @@ xkb_symbols "basic" { name[Group1]="Slovenia"; - include "cs(latin)" + include "rs(latin)" }; partial alphanumeric_keys @@ -14,7 +14,7 @@ xkb_symbols "us" { name[Group1]= "Slovenia - US keyboard with Slovenian letters"; - include "cs(latinyz)" + include "rs(latinyz)" }; @@ -23,7 +23,7 @@ xkb_symbols "alternatequotes" { name[Group1]= "Slovenia - Use guillemets for quotes"; - include "cs(latinalternatequotes)" + include "rs(latinalternatequotes)" }; partial alphanumeric_keys @@ -31,7 +31,7 @@ xkb_symbols "unicode" { name[Group1]= "Slovenia - Use Slovenian digraphs"; - include "cs(latinunicode)" + include "rs(latinunicode)" }; partial alphanumeric_keys @@ -39,5 +39,5 @@ xkb_symbols "unicodeus" { name[Group1]= "Slovenia - US keyboard with Slovenian digraphs"; - include "cs(latinunicodeyz)" + include "rs(latinunicodeyz)" }; -- 2.32.0.93.g670b81a890