Bogus SunFA keys removed

https://bugs.freedesktop.org/show_bug.cgi?id=26468

diff --git a/symbols/be b/symbols/be
index b3c4e53..89b98d1 100644 (file)
--- a/symbols/be
+++ b/symbols/be
@@ -145,17 +145,17 @@ xkb_symbols "oss_Sundeadkeys" {
     include "be(oss)"
 
     // First row
-    key <AE04> { [       apostrophe,                4,        SunFA_Cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+    key <AE04> { [       apostrophe,                4,        dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
 
     // Second row
-    key <AD11> { [     SunFA_Circum,  SunFA_Diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
+    key <AD11> { [     dead_circumflex,  dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
 
     //Third row
-    key <AC11> { [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL> { [              mu,          sterling,          SunFA_Grave,           dead_macron ] }; // µ £ ` ̄
+    key <AC11> { [           ugrave,          percent,          dead_acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL> { [              mu,          sterling,          dead_grave,           dead_macron ] }; // µ £ ` ̄
 
     // Fourth row
-    key <AB10>  { [            equal,             plus,          SunFA_Tilde,             0x1002212 ] }; // = + ~ −
+    key <AB10>  { [            equal,             plus,          dead_tilde,             0x1002212 ] }; // = + ~ −
 };
 
 partial alphanumeric_keys
@@ -188,11 +188,11 @@ xkb_symbols "sundeadkeys" {
     include "be(basic)"
     name[Group1]="Belgium - Sun dead keys";
 
-    key <AD11> { [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
-    key <AC11> { [    ugrave,    percent,  SunFA_Acute,  SunFA_Acute ] };
-    key <BKSL> { [        mu,   sterling,  SunFA_Grave,  SunFA_Grave ] };
-    key <AB07> { [     comma,  question, SunFA_Cedilla, SunFA_Cedilla] };
-    key <AB10> { [     equal,       plus,  SunFA_Tilde,  SunFA_Tilde ] };
+    key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, bracketleft] };
+    key <AC11> { [    ugrave,    percent,  dead_acute,  dead_acute ]   };
+    key <BKSL> { [        mu,   sterling,  dead_grave,  dead_grave ]   };
+    key <AB07> { [     comma,  question, dead_cedilla, dead_cedilla]   };
+    key <AB10> { [     equal,       plus,  dead_tilde,  dead_tilde ]   };
 };
 
 partial alphanumeric_keys

diff --git a/symbols/ch b/symbols/ch
index a0a2621..7f53cb9 100644 (file)
--- a/symbols/ch
+++ b/symbols/ch
@@ -58,9 +58,9 @@ partial alphanumeric_keys
 xkb_symbols "de_Sundeadkeys" {
     // modify the basic Swiss German layout to use Sun dead keys
     include "ch(basic)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
+    key <AE11> { [      apostrophe,    question,  dead_acute   ] };
+    key <AE12> { [    dead_circumflex, dead_grave,  dead_tilde   ] };
+    key <AD12> { [ dead_diaeresis,      exclam, bracketright   ] };
 };
 
 partial alphanumeric_keys 
@@ -103,9 +103,9 @@ partial alphanumeric_keys
 xkb_symbols "fr_Sundeadkeys" {
     // modify the basic Swiss French layout to use Sun dead keys
     include "ch(fr)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
+    key <AE11> { [      apostrophe,    question,  dead_acute   ] };
+    key <AE12> { [    dead_circumflex, dead_grave,  dead_tilde   ] };
+    key <AD12> { [ dead_diaeresis,      exclam, bracketright   ] };
 };
 
 partial alphanumeric_keys

diff --git a/symbols/es b/symbols/es
index 42b0e8c..8c88b43 100644 (file)
--- a/symbols/es
+++ b/symbols/es
@@ -36,8 +36,8 @@ xkb_symbols "Sundeadkeys" {
 
     include "es(basic)"
 
-    key <AC11> { [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ] };
-    key <AD11> { [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
+    key <AC11> { [dead_acute, dead_diaeresis, braceleft, braceleft ]   };
+    key <AD11> { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
 };
 
 partial alphanumeric_keys

diff --git a/symbols/fr b/symbols/fr
index 0d621a8..e0850d2 100644 (file)
--- a/symbols/fr
+++ b/symbols/fr
@@ -52,8 +52,8 @@ xkb_symbols "Sundeadkeys" {
 
     include "fr(basic)"
 
-    key <AD11> { [SunFA_Circum, SunFA_Diaeresis ]      };
-    key <AB07> { [comma,   question,  SunFA_Acute, dead_doubleacute ]  };
+    key <AD11> { [dead_circumflex, dead_diaeresis ]    };
+    key <AB07> { [comma,   question,  dead_acute, dead_doubleacute ]   };
 };
 
 partial alphanumeric_keys
@@ -222,14 +222,14 @@ xkb_symbols "oss_Sundeadkeys" {
     include "fr(oss)"
 
     // First row
-    key <TLDE> { [      twosuperior,    threesuperior,          onesuperior,         SunFA_Cedilla ] }; // ¹ ² ³ ¸ 
+    key <TLDE> { [      twosuperior,    threesuperior,          onesuperior,         dead_cedilla ] }; // ¹ ² ³ ¸ 
 
     // Second row
-    key <AD11> { [     SunFA_Circum,  SunFA_Diaeresis,          SunFA_Tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
+    key <AD11> { [     dead_circumflex,  dead_diaeresis,          dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
 
     //Third row
-    key <AC11> { [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL> { [         asterisk,               mu,          SunFA_Grave,           dead_macron ] }; // * µ ` ̄
+    key <AC11> { [           ugrave,          percent,          dead_acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL> { [         asterisk,               mu,          dead_grave,           dead_macron ] }; // * µ ` ̄
 };
 
 partial alphanumeric_keys
@@ -400,9 +400,9 @@ xkb_symbols "latin9_Sundeadkeys" {
 
     include "fr(latin9)"
 
-    key <AE01> { [       ampersand,               1,         SunFA_Acute,       periodcentered ] };
-    key <AE07> { [          egrave,               7,         SunFA_Grave,               Egrave ] };
-    key <AD11> { [    SunFA_Circum, SunFA_Diaeresis,         SunFA_Tilde,           quoteright ] };
+    key <AE01> { [       ampersand,               1,         dead_acute,       periodcentered ] };
+    key <AE07> { [          egrave,               7,         dead_grave,               Egrave ] };
+    key <AD11> { [    dead_circumflex, dead_diaeresis,         dead_tilde,           quoteright ] };
 
 };
 

diff --git a/symbols/is b/symbols/is
index fcf199b..8878019 100644 (file)
--- a/symbols/is
+++ b/symbols/is
@@ -40,13 +40,13 @@ xkb_symbols "Sundeadkeys" {
 
     name[Group1]="Iceland - Sun dead keys";
 
-    key <TLDE> { [SunFA_Circum,     degree,      notsign,    notsign ] };
-    key <AE12> { [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
-    key <AD11> { [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] };
-    key <AD12> { [      plus,   asterisk,  SunFA_Tilde,  dead_macron ] };
-    key <AC10> { [odiaeresis, Odiaeresis,  SunFA_Acute,  SunFA_Acute ] };
-    key <AC11> { [adiaeresis, Adiaeresis, SunFA_Circum, SunFA_Circum ] };
-    key <BKSL> { [numbersign,      acute,  SunFA_Grave,  SunFA_Grave ] };
+    key <TLDE> { [dead_circumflex,     degree,      notsign,    notsign ]      };
+    key <AE12> { [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] };
+    key <AD11> { [udiaeresis, Udiaeresis, dead_diaeresis, dead_diaeresis ] };
+    key <AD12> { [      plus,   asterisk,  dead_tilde,  dead_macron ]  };
+    key <AC10> { [odiaeresis, Odiaeresis,  dead_acute,  dead_acute ]   };
+    key <AC11> { [adiaeresis, Adiaeresis, dead_circumflex, dead_circumflex ]   };
+    key <BKSL> { [numbersign,      acute,  dead_grave,  dead_grave ]   };
 };
 
 partial alphanumeric_keys

diff --git a/symbols/latam b/symbols/latam
index 29ec743..fd748ab 100644 (file)
--- a/symbols/latam
+++ b/symbols/latam
@@ -35,8 +35,8 @@ partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
     include "latam(basic)"
 
-    key <AC11> { [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ] };
-    key <AD11> { [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
+    key <AC11> { [dead_acute, dead_diaeresis, braceleft, braceleft ]   };
+    key <AD11> { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
 };
 
 partial alphanumeric_keys

diff --git a/symbols/pt b/symbols/pt
index ba141b3..4fdaa83 100644 (file)
--- a/symbols/pt
+++ b/symbols/pt
@@ -34,9 +34,9 @@ xkb_symbols "Sundeadkeys" {
 
     include "pt(basic)" // for consistent naming
 
-    key <AD11> { [plus,   asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] };
-    key <BKSL> { [SunFA_Tilde, SunFA_Circum ]  };
-    key <AD12> { [SunFA_Acute, SunFA_Grave ]   };
+    key <AD11> { [plus,   asterisk, dead_diaeresis, dead_diaeresis ]   };
+    key <BKSL> { [dead_tilde, dead_circumflex ]        };
+    key <AD12> { [dead_acute, dead_grave ]     };
 };
 
 partial alphanumeric_keys
@@ -88,9 +88,9 @@ xkb_symbols "mac_sundeadkeys" {
     include "pt(mac)"
     name[Group1]= "Portugal - Macintosh, Sun dead keys";
     
-    key <AE12> {       [            plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]    };
-    key <AC11> {       [     SunFA_Tilde,    SunFA_Circum      ]       };
-    key <AD12> {       [     SunFA_Acute,     SunFA_Grave      ]       };
+    key <AE12> {       [            plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]      };
+    key <AC11> {       [     dead_tilde,    dead_circumflex    ]       };
+    key <AD12> {       [     dead_acute,     dead_grave        ]       };
 };
 
 partial alphanumeric_keys 

diff --git a/symbols/sun_vndr/nl b/symbols/sun_vndr/nl
index a895beb..42a5afb 100644 (file)
--- a/symbols/sun_vndr/nl
+++ b/symbols/sun_vndr/nl
@@ -117,7 +117,7 @@ xkb_symbols "type4" {
     key <AE09> { [ 9, parenright, braceright  ]       };
     key <AE10> { [ 0, quoteright, quoteleft   ]       };
     key <AE11> { [ slash, question, backslash  ]        };
-    key <AE12> { [ degree, SunFA_Tilde, SunFA_Cedilla]      };
+    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
     key <AD03> { [ e, E, EuroSign, Eacute    ]};
     key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
     key <AD12> { [ asterisk, bar, asciitilde  ]       };