diff options
author | Marko Myllynen <myllynen@redhat.com> | 2020-01-23 19:26:54 +0200 |
---|---|---|
committer | Marko Myllynen <myllynen@redhat.com> | 2020-01-23 19:26:54 +0200 |
commit | fee662d4a03b390d489a3a8191706626bff6c5f8 (patch) | |
tree | f75653769ad37dab9a4c8a7798558aa15ab3d80a /symbols | |
parent | 77e49674e2344e2c6ffc4b76ec4d33f97a40a73e (diff) |
Sort Finnish keymaps consistently
Since Finnish(Winkeys) is based on the default Kotoistus variant,
list it after it. Sort other variants consistently across XML
and symbols files. Minor whitespace tweaks while at it.
Diffstat (limited to 'symbols')
-rw-r--r-- | symbols/fi | 22 | ||||
-rw-r--r-- | symbols/sun_vndr/fi | 46 |
2 files changed, 41 insertions, 27 deletions
@@ -85,16 +85,10 @@ partial alphanumeric_keys xkb_symbols "winkeys" { include "fi(kotoistus)" - name[Group1]="Finnish (Winkeys)"; - include "eurosign(5)" -}; - -partial alphanumeric_keys -xkb_symbols "classic" { - include "fi(fi)" + name[Group1]="Finnish (Winkeys)"; - name[Group1]="Finnish (classic)"; + include "eurosign(5)" }; hidden partial alphanumeric_keys @@ -160,6 +154,14 @@ xkb_symbols "fi" { }; partial alphanumeric_keys +xkb_symbols "classic" { + + include "fi(fi)" + + name[Group1]="Finnish (classic)"; +}; + +partial alphanumeric_keys xkb_symbols "nodeadkeys" { // Classic Finnish keyboard layout without dead keys @@ -208,6 +210,8 @@ xkb_symbols "sun_type6" { // Sun Type 6/7 keyboard for Finland include "sun_vndr/fi(sun_type6)" + + name[Group1]="Finnish (Sun Type 6/7)"; }; partial @@ -289,7 +293,7 @@ xkb_symbols "fidvorak" { // Less and greater than symbols moved behind 3rd level modifiers on comma and period. // Includes an assortment of dead keys but is not made with them in mind. - name[Group1]= "Finnish Dvorak"; + name[Group1]="Finnish (Dvorak)"; key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; key <AE01> { [ 1, exclam, NoSymbol, exclamdown ] }; diff --git a/symbols/sun_vndr/fi b/symbols/sun_vndr/fi index c1ac1176..943d1d9a 100644 --- a/symbols/sun_vndr/fi +++ b/symbols/sun_vndr/fi @@ -30,9 +30,9 @@ partial default alphanumeric_keys xkb_symbols "sun_type6" { - name[Group1]="Finnish (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" - include "sun_vndr/us(sun_type6)" + name[Group1]="Finnish (Sun Type 6/7)"; key <TLDE> { [ section, onehalf ] }; key <AE01> { [ 1, exclam ] }; @@ -58,41 +58,51 @@ xkb_symbols "sun_type6" { key <AB09> { [ period, colon ] }; key <AB10> { [ minus, underscore ] }; - include "level3(ralt_switch)" - include "kpdl(comma)" + include "level3(ralt_switch)" + include "kpdl(comma)" +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fi(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "kotoistus" { + include "fi(kotoistus)" }; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/fi(sun_type6)" + xkb_symbols "winkeys" { + include "fi(winkeys)" }; partial alphanumeric_keys - xkb_symbols "kotoistus" { - include "fi(kotoistus)" + xkb_symbols "classic" { + include "fi(fi)" }; partial alphanumeric_keys - xkb_symbols "classic" { - include "fi(classic)" + xkb_symbols "nodeadkeys" { + include "fi(nodeadkeys)" }; partial alphanumeric_keys - xkb_symbols "fi" { - include "fi(fi)" + xkb_symbols "smi" { + include "fi(smi)" }; partial alphanumeric_keys - xkb_symbols "nodeadkeys" { - include "fi(nodeadkeys)" + xkb_symbols "mac" { + include "fi(mac)" }; partial alphanumeric_keys - xkb_symbols "smi" { - include "fi(smi)" + xkb_symbols "das" { + include "fi(das)" }; partial alphanumeric_keys - xkb_symbols "mac" { - include "fi(mac)" + xkb_symbols "fidvorak" { + include "fi(fidvorak)" }; |