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.

1 files changed, 28 insertions, 18 deletions

diff --git a/symbols/sun_vndr/fi b/symbols/sun_vndr/fi
index c1ac117..943d1d9 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)"
 };