symbols: delete redundant variants with a capitalized "Sun" in the name

These variants are not referenced from rules/base.xml, and are always
the same layout as the one with a lowercase "sun".  The capitalized
variants are referenced only from the symbols/sun_vndr/* files, so...
simply adjust the references there and delete the capitalized layouts.

1 files changed, 6 insertions, 26 deletions

diff --git a/symbols/fr b/symbols/fr
index c6cefeb..360239b 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -60,24 +60,18 @@ xkb_symbols "olpc" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
+xkb_symbols "sundeadkeys" {
 
     // Modifies the basic French layout to use the Sun dead keys
 
     include "fr(basic)"
+    name[Group1]="French (Sun dead keys)";
 
     key <AD11>	{ [dead_circumflex, dead_diaeresis ]	};
     key <AB07>	{ [comma,   question,  dead_acute, dead_doubleacute ]	};
 };
 
 partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr(Sundeadkeys)"
-
-    name[Group1]="French (Sun dead keys)";
-};
-
-partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
     // Modifies the basic French layout to eliminate all dead keys
@@ -229,11 +223,12 @@ xkb_symbols "oss_latin9" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "oss_Sundeadkeys" {
+xkb_symbols "oss_sundeadkeys" {
 
     // Modifies the basic fr(oss) layout to use the Sun dead keys
 
     include "fr(oss)"
+    name[Group1]="French (alt., Sun dead keys)";
 
     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ¹ ² ³ ¸
 
@@ -244,14 +239,6 @@ xkb_symbols "oss_Sundeadkeys" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "oss_sundeadkeys" {
-
-    include "fr(oss_Sundeadkeys)"
-
-    name[Group1]="French (alt., Sun dead keys)";
-};
-
-partial alphanumeric_keys
 xkb_symbols "oss_nodeadkeys" {
 
     // Modifies the basic fr(oss) layout to eliminate all dead keys
@@ -403,11 +390,12 @@ xkb_symbols "latin9" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "latin9_Sundeadkeys" {
+xkb_symbols "latin9_sundeadkeys" {
 
     // Modifies the basic fr-latin9 layout to use the Sun dead keys
 
     include "fr(latin9)"
+    name[Group1]="French (legacy, alt., Sun dead keys)";
 
     key <AE01>	{ [       ampersand,               1,         dead_acute,       periodcentered ] };
     key <AE07>	{ [          egrave,               7,         dead_grave,               Egrave ] };
@@ -415,14 +403,6 @@ xkb_symbols "latin9_Sundeadkeys" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "latin9_sundeadkeys" {
-
-    include "fr(latin9_Sundeadkeys)"
-
-    name[Group1]="French (legacy, alt., Sun dead keys)";
-};
-
-partial alphanumeric_keys
 xkb_symbols "latin9_nodeadkeys" {
 
     // Modifies the basic fr-latin9 layout to eliminate all dead keys