symbols/??: Putting the name of the layout *after* the main include.

To avoid this name getting overridden by the name in the include, so
that 'xkbcomp -xkb' can report the actual name of the layout used.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

15 files changed, 88 insertions, 140 deletions

diff --git a/symbols/ba b/symbols/ba
index 0829a938..63331b85 100644
--- a/symbols/ba
+++ b/symbols/ba
@@ -1,40 +1,34 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Bosnian";
-
     include "rs(latin)"
+    name[Group1]="Bosnian";
 };
 
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
-
     include "rs(latinyz)"
+    name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Bosnian (with guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
+    name[Group1]= "Bosnian (with guillemets for quotes)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicode" {
 
-    name[Group1]= "Bosnian (with Bosnian digraphs)";
-
     include "rs(latinunicode)"
+    name[Group1]= "Bosnian (with Bosnian digraphs)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicodeus" {
 
-    name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
-
     include "rs(latinunicodeyz)"
+    name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
 };
diff --git a/symbols/ca b/symbols/ca
index abfbbd9f..2ba48b48 100644
--- a/symbols/ca
+++ b/symbols/ca
@@ -122,10 +122,10 @@ xkb_symbols "fr-dvorak" {
 partial
 xkb_symbols "fr-legacy" {
 
-    name[Group1] = "French (Canada, legacy)";
-
     include "ca(fr)"
 
+    name[Group1] = "French (Canada, legacy)";
+
     key <TLDE>	{ [    degree,     degree,       notsign ]	};
     key <AE01>	{ [         1,     exclam,   onesuperior ]	};
 
@@ -168,10 +168,10 @@ xkb_symbols "fr-legacy" {
 partial
 xkb_symbols "multi" {
 
-    name[Group1] = "Canadian Multilingual (first part)";
-
     include "ca(fr)"
 
+    name[Group1] = "Canadian Multilingual (first part)";
+
     key <TLDE>	{ [     slash,  backslash,           bar ]	};
     key <AE01>	{ [         1,     exclam ]	};
     key <AE02>	{ [         2,         at ]	};
@@ -259,7 +259,6 @@ xkb_symbols "multi-2gr" {
     key <AB08>	{ [ Greek_horizbar, multiply ]	};
     key <AB09>	{ [ periodcentered, division ]	};
     key <AB10>	{ [ NoSymbol, dead_abovedot ]	};
-
 };
 
 // based on
@@ -466,8 +465,8 @@ xkb_symbols "olpc" {
 
 partial alphanumeric_keys
 xkb_symbols "eng" {
-    name[Group1] = "English (Canada)";
     include "us(basic)"
+    name[Group1] = "English (Canada)";
 };
 
 // EXTRAS:
diff --git a/symbols/cm b/symbols/cm
index 6404c97a..6b7a5185 100644
--- a/symbols/cm
+++ b/symbols/cm
@@ -96,8 +96,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "french"
 {
-	name[Group1]="French (Cameroon)";
 	include "latin"
+	name[Group1]="French (Cameroon)";
 
 	key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
 	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
@@ -133,13 +133,11 @@ xkb_symbols "french"
 	include "level3(ralt_switch)"
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "azerty"
 {
-	name[Group1] = "Cameroon Multilingual (azerty)";
-	include "level3(ralt_switch)"
 	include "cm(basic)"
+	name[Group1] = "Cameroon Multilingual (azerty)";
 	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
 	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN
@@ -189,14 +187,14 @@ xkb_symbols "azerty"
 	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET
 	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3
 	include "cm(exclamation_switch)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "qwerty"
 {
-	name[Group1] = "Cameroon Multilingual (qwerty)";
-	include "level3(ralt_switch)"
 	include "cm(basic)"
+	name[Group1] = "Cameroon Multilingual (qwerty)";
 	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
 	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
 	key <AB03> { [ c, C, U0327, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, CEDILLA, COPYRIGHT
@@ -242,15 +240,14 @@ xkb_symbols "qwerty"
 	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR
 	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
 	include "cm(semicolon_switch)"
+	include "level3(ralt_switch)"
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "dvorak"
 {
-	name[Group1] = "Cameroon Multilingual (Dvorak)";
-	include "level3(ralt_switch)"
 	include "us(dvorak)"
+	name[Group1] = "Cameroon Multilingual (Dvorak)";
 	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON
 	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
 	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
@@ -299,6 +296,7 @@ xkb_symbols "dvorak"
 	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR
 	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
 	include "cm(semicolon_switch_dvorak)"
+	include "level3(ralt_switch)"
 };
 
 // The following code creates the "Cameroon key" phenomenon.
diff --git a/symbols/de b/symbols/de
index a497d7f4..f5aa8e75 100644
--- a/symbols/de
+++ b/symbols/de
@@ -526,10 +526,8 @@ xkb_symbols "mac_nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "dsb"
 {
-	name[Group1] = "Lower Sorbian";
 	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	name[Group1] = "Lower Sorbian";
 	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };
 	key <AB02> { [              x,              X,         zacute,         Zacute ] };
 	key <AB03> { [              c,              C,         cacute,         Cacute ] };
@@ -544,15 +542,15 @@ xkb_symbols "dsb"
 	key <AD04> { [              r,              R,         racute,         Racute ] };
 	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "dsb_qwertz"
 {
-	name[Group1] = "Lower Sorbian (qwertz)";
 	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	name[Group1] = "Lower Sorbian (qwertz)";
 	key <AB01> { [              y,              Y                                 ] };
 	key <AB02> { [              x,              X                                 ] };
 	key <AB03> { [              c,              C,         cacute,         Cacute ] };
@@ -569,6 +567,8 @@ xkb_symbols "dsb_qwertz"
 	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };
 	key <AD07> { [              u,              U,         zacute,         Zacute ] };
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff --git a/symbols/hr b/symbols/hr
index a1a832d2..61fc3922 100644
--- a/symbols/hr
+++ b/symbols/hr
@@ -1,9 +1,8 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Croatian";
-
     include "rs(latin)"
+    name[Group1]="Croatian";
 
     // Redefine these keys to match XFree86 Croatian layout
     key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };
@@ -16,9 +15,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Croatian (US keyboard with Croatian letters)";
-
     include "us"
+    name[Group1]= "Croatian (US keyboard with Croatian letters)";
 
     key <AD01> { [    any,    any,	backslash	        ] };
     key <AD02> { [    any,    any,	bar      	        ] };
@@ -44,30 +42,25 @@ xkb_symbols "us" {
     key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };
 
     include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Croatian (with guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
+    name[Group1]= "Croatian (with guillemets for quotes)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicode" {
 
-    name[Group1]= "Croatian (with Croatian digraphs)";
-
     include "rs(latinunicode)"
+    name[Group1]= "Croatian (with Croatian digraphs)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicodeus" {
 
-    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
-
     include "rs(latinunicodeyz)"
+    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
 };
diff --git a/symbols/in b/symbols/in
index 590fac34..3aeb10ef 100644
--- a/symbols/in
+++ b/symbols/in
@@ -107,7 +107,7 @@ partial alphanumeric_keys
 xkb_symbols "bolnagri" {
      name[Group1] = "Hindi (Bolnagri)";
      key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
+
     // Roman digits
     key <TLDE>  { [   U0902,	U0901,		apostrophe, 	asciitilde ] }; // apostrophe: anusvara, candrabindu
     key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };
@@ -393,8 +393,6 @@ xkb_symbols "ben_baishakhi" {
 //   modifier_map Shift  { Shift_L };
 //   modifier_map Lock   { Caps_Lock };
 //   modifier_map Control{ Control_L };
-
-
 };
 
 xkb_symbols "ben_inscript" {
@@ -536,8 +534,6 @@ xkb_symbols "ben_gitanjali" {
 //   modifier_map Shift  { Shift_L };
 //   modifier_map Lock   { Caps_Lock };
 //   modifier_map Control{ Control_L };
-
-
 };
 
 
@@ -613,7 +609,6 @@ xkb_symbols "ben_bornona" {
 //   modifier_map Control{ Control_L };
 // third level with right-alt
     include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
@@ -842,7 +837,6 @@ xkb_symbols "mal" {
 
     include "rupeesign(4)"
     include "level3(ralt_switch)"
-
 };
 
 //Name		:	Lalitha
@@ -854,7 +848,7 @@ partial alphanumeric_keys
 xkb_symbols "mal_lalitha" {
      name[Group1] = "Malayalam (Lalitha)";
      key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
+
     // Roman digits
     key <TLDE>  { [   U0D4D,	U0D02,		apostrophe, 	asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
     key <AE01>  { [   1,	exclam,	U0D67,		exclam	   ] };
@@ -1237,7 +1231,6 @@ xkb_symbols "tam_TSCII" {
     key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A
     key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I
 
-};
 
 partial alphanumeric_keys
 xkb_symbols "tam_TAB" {
@@ -1462,7 +1455,7 @@ partial alphanumeric_keys
 xkb_symbols "jhelum" {
       name[Group1] = "Punjabi (Gurmukhi Jhelum)";
           key.type="FOUR_LEVEL";
-     //Top Alphanumeric row
+
      // Roman digits
      key <TLDE>  { [  apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu
      key <AE01>  { [   1,exclam,	U0A67,	exclam	   ] };
@@ -1660,12 +1653,10 @@ xkb_symbols "hin-wx" {
 partial alphanumeric_keys
 xkb_symbols "eng" {
 
-    name[Group1]= "English (India, with Rupee sign)";
-
     include "us(basic)"
+    name[Group1]= "English (India, with Rupee sign)";
 
     include "rupeesign(4)"
-
     include "level3(ralt_switch)"
 };
 
@@ -1744,11 +1735,8 @@ xkb_symbols "mal_enhanced" {
     key <AB09> { [ period , U0d7d ] }; //chillu l
     key <AB10> { [ U0d2f , question ] };
 
-    // hope this includes the rupee sign at alt + 4
-
     include "rupeesign(4)"
     include "level3(ralt_switch)"
-
 };
 
 
@@ -1780,7 +1768,6 @@ xkb_symbols "hin-kagapa" {
      name[Group1] = "Hindi (KaGaPa phonetic)";
      key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0967          ] };
@@ -1824,7 +1811,6 @@ xkb_symbols "hin-kagapa" {
     key <AC10>  { [   semicolon,    colon,     U1CF2,    U1CF3   ] };  // U1CF2/3: ardhavisarga/rotated ardhavisarga
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U091E,   U0919                   ] };  // Z: nya, nga
     key <AB02>  { [   U0937,   U093C,  U0934           ] };  // X: ssa, nukta below, lla-nukta
@@ -1844,17 +1830,15 @@ xkb_symbols "hin-kagapa" {
 // Sanskrit uses Devanagari layout of Hindi
 partial alphanumeric_keys
 xkb_symbols "san-kagapa" {
-  name[Group1] = "Sanskrit (KaGaPa phonetic)";
   include "in(hin-kagapa)"
-
+  name[Group1] = "Sanskrit (KaGaPa phonetic)";
 };
 
 // Marathi uses Devanagari layout of Hindi
 partial alphanumeric_keys
 xkb_symbols "mar-kagapa" {
-  name[Group1] = "Marathi (KaGaPa phonetic)";
   include "in(hin-kagapa)"
-
+  name[Group1] = "Marathi (KaGaPa phonetic)";
 };
 
 
@@ -1875,7 +1859,6 @@ xkb_symbols "kan-kagapa" {
     name[Group1] = "Kannada (KaGaPa phonetic)";
     key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0CE7          ] };
@@ -1919,7 +1902,6 @@ xkb_symbols "kan-kagapa" {
     key <AC10>  { [   semicolon,    colon                        ] };
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U0C9E,   U0C99                   ] };  // Z: nya, nga
     key <AB02>  { [   U0CB7,   U0CBC,  U0CDE           ] };  // X: ssa, nukta below, LLLA
@@ -1954,7 +1936,6 @@ xkb_symbols "tel-kagapa" {
     name[Group1] = "Telugu (KaGaPa phonetic)";
     key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0C67          ] };
@@ -1998,7 +1979,6 @@ xkb_symbols "tel-kagapa" {
     key <AC10>  { [   semicolon,    colon                        ] };
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U0C1E,   U0C19                   ] };  // Z: nya, nga
     key <AB02>  { [   U0C37                            ] };  // X: ssa
@@ -2026,7 +2006,6 @@ xkb_symbols "eeyek" {
 
     name[Group1]= "Manipuri (Eeyek)";
 
-    // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
     key <AE01> {	[	  Uabf1,	exclam 		]	};
     key <AE02> {	[	  Uabf2,	at		]	};
@@ -2078,7 +2057,6 @@ xkb_symbols "eeyek" {
     key <AB10> {	[     slash,	question	]	};
 
     key <BKSL> {	[ backslash,         bar	]	};
-    // End alphanumeric section
     
     include "level3(ralt_switch)"
 };
diff --git a/symbols/is b/symbols/is
index 34d6bed3..93af3f80 100644
--- a/symbols/is
+++ b/symbols/is
@@ -193,11 +193,12 @@ xkb_symbols "mac" {
 // Icelandic Dvorak
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    name[Group1]= "Icelandic (Dvorak)";
 
     include "us(dvorak)"
     include "eurosign(4)"
 
+    name[Group1]= "Icelandic (Dvorak)";
+
     key <AD11> { [      slash,  question,    U201e,   U201c   ] };
     key <AC06> { [       d,     D,           eth,     ETH     ] };
     key <AC10> { [       s,     S,           ae,      AE      ] };
diff --git a/symbols/jp b/symbols/jp
index 52f57462..f0b2c4d7 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -243,8 +243,8 @@ xkb_symbols "nicola_f_bs" {
 // Copied from macintosh_vndr/jp
 partial alphanumeric_keys
 xkb_symbols "mac" {
-    name[Group1]= "Japanese (Macintosh)";
     include "jp(kana)"
+    name[Group1]= "Japanese (Macintosh)";
 
     replace key <CAPS> { [ Caps_Lock ] };
 };
@@ -256,8 +256,8 @@ xkb_symbols "hztg_escape" {
 
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    name[Group1]= "Japanese (Dvorak)";
     include "jp(OADG109A)"
+    name[Group1]= "Japanese (Dvorak)";
 
     key <AE11> { [ at, grave		] };
 
diff --git a/symbols/ma b/symbols/ma
index 2d128837..db7b5bb3 100644
--- a/symbols/ma
+++ b/symbols/ma
@@ -82,9 +82,9 @@ xkb_symbols "tifinagh" {
 
 partial alphanumeric_keys
 xkb_symbols "tifinagh-phonetic" {
+    include "ma(tifinagh)"
 
     name[Group1]="Berber (Morocco, Tifinagh phonetic)";
-    include "ma(tifinagh)"
 
     key <LatA>	{ [ 0x1002d30 ]	};
     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
diff --git a/symbols/rs b/symbols/rs
index 86b54632..06025e17 100644
--- a/symbols/rs
+++ b/symbols/rs
@@ -40,12 +40,10 @@ xkb_symbols "latin" {
 
 partial alphanumeric_keys
 xkb_symbols "yz" {
-  // Cyrillic_zhe and Cyrillic_ze swapped.
-
-  name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)";
+
   key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
   key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
 };
@@ -247,9 +245,10 @@ 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.
 
+  include "rs(latin)"
+
   name[Group1]= "Serbian (Latin Unicode)";
 
-  include "rs(latin)"
   include "rs(twoletter)"
 };
 
@@ -257,10 +256,10 @@ partial alphanumeric_keys
 xkb_symbols "latinyz" {
   // For those who insist on using "english-position" Z and Y.
 
-  name[Group1]= "Serbian (Latin qwerty)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin qwerty)";
+
   key <AD06> {   [ y,                   Y,             any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -269,10 +268,10 @@ partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   // Unicode, ZHE and Z swapped.
 
-  name[Group1]= "Serbian (Latin Unicode qwerty)";
-
   include "rs(latinunicode)"
 
+  name[Group1]= "Serbian (Latin Unicode qwerty)";
+
   key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -280,10 +279,10 @@ xkb_symbols "latinunicodeyz" {
 xkb_symbols "alternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Cyrillic with guillemets)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -291,10 +290,10 @@ xkb_symbols "alternatequotes" {
 xkb_symbols "latinalternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Latin with guillemets)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -306,10 +305,10 @@ xkb_symbols "rue" {
   //   Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
   //   Mihajlo Hornjak <smeceiotpad@gmail.com>
 
-  name[Group1]= "Pannonian Rusyn";
-
   include "rs(basic)"
 
+  name[Group1]= "Pannonian Rusyn";
+
   key <TLDE> {   [ Cyrillic_softsign,         Cyrillic_SOFTSIGN         ]   }; // `
 
   key <AD01> {   [ Cyrillic_ya,               Cyrillic_YA               ]   }; // q
@@ -330,10 +329,10 @@ xkb_symbols "combiningkeys" {
   // Raw combining characters instead of dead keys,
   // especially good for post-accenting texts.
 
-  name[Group1]= "Serbian (combining accents instead of dead keys)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (combining accents instead of dead keys)";
+
   key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
   key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT
   key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
diff --git a/symbols/se b/symbols/se
index 7c37d2a1..320a1861 100644
--- a/symbols/se
+++ b/symbols/se
@@ -48,10 +48,10 @@ xkb_symbols "nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
-    name[Group1]="Swedish (Dvorak)";
-
     include "se(basic)"
 
+    name[Group1]="Swedish (Dvorak)";
+
     key <AD01> { [     aring,      Aring,    backslash		     ]	};
     key <AD02> { [  adiaeresis,	Adiaeresis,  braceleft,  bracketleft ]	};
     key <AD03> { [ odiaeresis, Odiaeresis,  braceright, bracketright ]	};
@@ -202,10 +202,10 @@ xkb_symbols "mac" {
 partial alphanumeric_keys
 xkb_symbols "svdvorak" {
 
-   name[Group1]="Swedish (Svdvorak)";
-
    include "se(basic)"
 
+   name[Group1]="Swedish (Svdvorak)";
+
    key <AD01> { [ aring, Aring, braceleft ] };
    key <AD02> { [ comma, semicolon, bracketleft ] };
    key <AD03> { [ period, colon, bracketright ] };
diff --git a/symbols/si b/symbols/si
index 041828c8..7e214fba 100644
--- a/symbols/si
+++ b/symbols/si
@@ -1,30 +1,29 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Slovenian";
-
     include "rs(latin)"
 
+    name[Group1]="Slovenian";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Slovenian (US keyboard with Slovenian letters)";
-
     include "rs(latinyz)"
 
+    name[Group1]= "Slovenian (US keyboard with Slovenian letters)";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Slovenian (with guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
 
+    name[Group1]= "Slovenian (with guillemets for quotes)";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
diff --git a/symbols/tm b/symbols/tm
index e861b35c..6c71f48b 100644
--- a/symbols/tm
+++ b/symbols/tm
@@ -3,9 +3,10 @@
 // Default layout (based on Vista Turkmen layout)
 default  partial
 xkb_symbols "basic" {
-    name[Group1]="Turkmen";
 
     include "us"
+    name[Group1]="Turkmen";
+
     key <TLDE> {	[    zcaron, 	Zcaron,		grave,	asciitilde	]	};
 
     key <AD01> {	[ adiaeresis, 	Adiaeresis,	q,	Q 	]	};
@@ -25,9 +26,9 @@ xkb_symbols "basic" {
 // This layout provides turkmen letter via the AltGr key
 partial
 xkb_symbols "alt" {
-    name[Group1]="Turkmen (Alt-Q)";
 
     include "us"
+    name[Group1]="Turkmen (Alt-Q)";
 
     key <AD06> {	[	  y,	Y,	yacute,		Yacute		]	};
     key <AD07> {	[	  u,	U,	udiaeresis,	Udiaeresis	]	};
@@ -41,5 +42,4 @@ xkb_symbols "alt" {
     key <AB06> {	[	  n,	N,	ncaron,		Ncaron		]	};
 
     include "level3(ralt_switch)"
-
 };
diff --git a/symbols/tw b/symbols/tw
index 8ea31dda..3a228722 100644
--- a/symbols/tw
+++ b/symbols/tw
@@ -1,10 +1,10 @@
 default  partial alphanumeric_keys
 xkb_symbols "tw" {
 
-    name[Group1]= "Taiwanese";
-
     include "us(basic)"
 
+    name[Group1]= "Taiwanese";
+
     key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };
     key <AE01> { [	   1,     exclam,         U030D,       exclamdown ] };
     key <AE02> { [	   2,         at,         U0358,      twosuperior ] };
@@ -49,10 +49,10 @@ xkb_symbols "tw" {
 partial alphanumeric_keys
 xkb_symbols "indigenous" {
 
-    name[Group1]= "Taiwanese (indigenous)";
-
     include "tw(tw)"
 
+    name[Group1]= "Taiwanese (indigenous)";
+
     key <AC11> { [     U02BC,   quotedbl,    apostrophe, dead_doubleacute ] };
 
     include "level3(ralt_switch)"
@@ -61,10 +61,10 @@ xkb_symbols "indigenous" {
 partial alphanumeric_keys
 xkb_symbols "saisiyat" {
 
-    name[Group1]= "Saisiyat (Taiwan)";
-
     include "tw(indigenous)"
 
+    name[Group1]= "Saisiyat (Taiwan)";
+
     key <AC10> { [     U02D0,      colon,     semicolon,   dead_diaeresis ] };
 
     include "level3(ralt_switch)"
diff --git a/symbols/us b/symbols/us
index 4948a634..d5a6c18e 100644
--- a/symbols/us
+++ b/symbols/us
@@ -59,9 +59,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "euro" {
 
-    name[Group1]= "English (US, with euro on 5)";
-
     include "us(basic)"
+    name[Group1]= "English (US, with euro on 5)";
 
     include "eurosign(5)"
 
@@ -72,9 +71,8 @@ xkb_symbols "euro" {
 partial alphanumeric_keys
 xkb_symbols "intl" {
 
-    name[Group1]= "English (US, international with dead keys)";
-
     include "us(basic)"
+    name[Group1]= "English (US, international with dead keys)";
 
     key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
     key <AE01> { [	   1,     exclam,    exclamdown,      onesuperior ] };
@@ -163,9 +161,8 @@ xkb_symbols "intl" {
 partial alphanumeric_keys
 xkb_symbols "alt-intl" {
 
-  name[Group1]= "English (US, alternative international)";
-
   include "us"
+  name[Group1]= "English (US, alternative international)";
 
   key <TLDE> { [ dead_grave, dead_tilde,    grave,	      asciitilde    ] };
   key <AE05> { [          5, percent,	    EuroSign			    ] };
@@ -257,9 +254,8 @@ xkb_symbols "dvorak" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-intl" {
 
-    name[Group1]= "English (Dvorak, international with dead keys)";
-
     include "us(dvorak)"
+    name[Group1]= "English (Dvorak, international with dead keys)";
 
     key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
 
@@ -336,9 +332,8 @@ xkb_symbols "dvorak-intl" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-alt-intl" {
 
-    name[Group1]= "English (Dvorak alternative international no dead keys)";
-
     include "us(dvorak)"
+    name[Group1]= "English (Dvorak alternative international no dead keys)";
 
     key <AE04> { [         4,  dollar,    EuroSign ] };
 
@@ -548,8 +543,8 @@ xkb_symbols "dvorak-classic" {
 // symbols that usually follows, accented characters are possible for I18N.
 partial alphanumeric_keys
 xkb_symbols "dvp" {
-    include "us(dvorak)"
 
+    include "us(dvorak)"
     name[Group1] = "English (programmer Dvorak)";
 
     //             Unmodified       Shift           AltGr            Shift+AltGr
@@ -619,9 +614,8 @@ xkb_symbols "dvp" {
 partial alphanumeric_keys
 xkb_symbols "rus" {
 
-    name[Group1]= "Russian (US, phonetic)";
-
     include "us(basic)"
+    name[Group1]= "Russian (US, phonetic)";
 
 key.type[group1]="FOUR_LEVEL_ALPHABETIC";
 
@@ -732,6 +726,7 @@ xkb_symbols "mac" {
 
 partial alphanumeric_keys
 xkb_symbols "colemak" {
+
     include "us"
     name[Group1]= "English (Colemak)";
 
@@ -812,9 +807,8 @@ xkb_symbols "colemak" {
 partial alphanumeric_keys
 xkb_symbols "altgr-intl" {
 
-   name[Group1]= "English (international AltGr dead keys)";
-
    include "us(intl)"
+   name[Group1]= "English (international AltGr dead keys)";
 
 // five dead keys moved into level3:
 
@@ -1175,9 +1169,8 @@ xkb_symbols "chr" {
 partial alphanumeric_keys
 xkb_symbols "hbs" {
 
-  name[Group1]= "Serbo-Croatian (US)";
-
   include "us"
+  name[Group1]= "Serbo-Croatian (US)";
 
   key <TLDE> { [ grave, asciitilde ] };
   key <AE06> { [ 6, dead_caron, asciicircum, asciicircum ] };
@@ -1247,9 +1240,8 @@ xkb_symbols "htcdream" {
 partial alphanumeric_keys
 xkb_symbols "workman" {
 
-    name[Group1]= "English (Workman)";
-
     include "us(basic)"
+    name[Group1]= "English (Workman)";
 
     key <AD01> {  [   q,  Q   ] };
     key <AD02> {  [   d,  D   ] };
@@ -1289,9 +1281,8 @@ xkb_symbols "workman" {
 partial alphanumeric_keys
 xkb_symbols "workman-intl" {
 
-    name[Group1]= "English (Workman, international with dead keys)";
-
     include "us(intl)"
+    name[Group1]= "English (Workman, international with dead keys)";
 
     key <AD01> { [     q,          Q,    adiaeresis,       Adiaeresis ] };
     key <AD02> { [     d,          D,           eth,              ETH ] };
@@ -1337,11 +1328,9 @@ xkb_symbols "workman-intl" {
 partial alphanumeric_keys
 xkb_symbols "norman" {
 
-    name[Group1]= "English (Norman)";
-
     include "us(basic)"
+    name[Group1]= "English (Norman)";
 
-    // Alphanumeric section
     key <AD01> { [ q, Q ] };
     key <AD02> { [ w, W ] };
     key <AD03> { [ d, D ] };
@@ -1371,7 +1360,6 @@ xkb_symbols "norman" {
     key <AB05> { [ b, B ] };
     key <AB06> { [ p, P ] };
     key <AB07> { [ m, M ] };
-    // End alphanumeric section
 
     key <CAPS> { [ BackSpace ] };
 
@@ -1383,6 +1371,7 @@ xkb_symbols "norman" {
 // Czech, Slovak and German charecters added as third level symbols to US keyboard layout.
 partial alphanumeric_keys
 xkb_symbols "cz_sk_de" {
+
     include "us"
     name[Group1]="Czech Slovak and German (US)";
 
@@ -1518,7 +1507,6 @@ partial alphanumeric_keys
 xkb_symbols "ats" {
 
     include "us"
-
     name[Group1]= "Atsina";
 
     //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
@@ -1548,7 +1536,6 @@ partial alphanumeric_keys
 xkb_symbols "crd" {
 
   include "us"
-
   name[Group1]= "Coeur d'Alene Salish";
 
   key <AD02> { [         w,           W, U02B7, U02B7 ] };