diff options
-rw-r--r-- | rules/base.extras.xml | 10 | ||||
-rw-r--r-- | rules/base.xml | 12 | ||||
-rw-r--r-- | symbols/fi | 22 | ||||
-rw-r--r-- | symbols/sun_vndr/fi | 46 |
4 files changed, 52 insertions, 38 deletions
diff --git a/rules/base.extras.xml b/rules/base.extras.xml index ae8f127e..9d18b2ff 100644 --- a/rules/base.extras.xml +++ b/rules/base.extras.xml @@ -866,20 +866,20 @@ <variantList> <variant> <configItem> - <name>das</name> - <description>Finnish (DAS)</description> + <name>sun_type6</name> + <description>Finnish (Sun Type 6/7)</description> </configItem> </variant> <variant> <configItem> - <name>sun_type6</name> - <description>Finnish (Sun Type 6/7)</description> + <name>das</name> + <description>Finnish (DAS)</description> </configItem> </variant> <variant> <configItem> <name>fidvorak</name> - <description>Finnish Dvorak</description> + <description>Finnish (Dvorak)</description> </configItem> </variant> </variantList> diff --git a/rules/base.xml b/rules/base.xml index f6397f0a..33efe8d9 100644 --- a/rules/base.xml +++ b/rules/base.xml @@ -3190,20 +3190,20 @@ <variantList> <variant> <configItem> - <name>classic</name> - <description>Finnish (classic)</description> + <name>winkeys</name> + <description>Finnish (Winkeys)</description> </configItem> </variant> <variant> <configItem> - <name>nodeadkeys</name> - <description>Finnish (classic, no dead keys)</description> + <name>classic</name> + <description>Finnish (classic)</description> </configItem> </variant> <variant> <configItem> - <name>winkeys</name> - <description>Finnish (Winkeys)</description> + <name>nodeadkeys</name> + <description>Finnish (classic, no dead keys)</description> </configItem> </variant> <variant> @@ -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)" }; |