From: Sergey V. Udaltsov Date: Thu, 11 Feb 2010 19:00:06 +0000 (+0000) Subject: Bogus SunFA keys removed X-Git-Tag: v_1_9~65 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc6ff550de2a4d202a93e199cbf6a81933d95f0;p=platform%2Fupstream%2Fxkeyboard-config.git 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 --- a/symbols/be +++ b/symbols/be @@ -145,17 +145,17 @@ xkb_symbols "oss_Sundeadkeys" { include "be(oss)" // First row - key { [ apostrophe, 4, SunFA_Cedilla, 0x1002014 ] }; // ' 4 ¸ — (tiret cadratin) + key { [ apostrophe, 4, dead_cedilla, 0x1002014 ] }; // ' 4 ¸ — (tiret cadratin) // Second row - key { [ SunFA_Circum, SunFA_Diaeresis, bracketleft, dead_abovering ] }; // ^ ̈ [ ˚ + key { [ dead_circumflex, dead_diaeresis, bracketleft, dead_abovering ] }; // ^ ̈ [ ˚ //Third row - key { [ ugrave, percent, SunFA_Acute, Ugrave ] }; // ù % ' Ù - key { [ mu, sterling, SunFA_Grave, dead_macron ] }; // µ £ ` ̄ + key { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù + key { [ mu, sterling, dead_grave, dead_macron ] }; // µ £ ` ̄ // Fourth row - key { [ equal, plus, SunFA_Tilde, 0x1002212 ] }; // = + ~ − + key { [ 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 { [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] }; - key { [ ugrave, percent, SunFA_Acute, SunFA_Acute ] }; - key { [ mu, sterling, SunFA_Grave, SunFA_Grave ] }; - key { [ comma, question, SunFA_Cedilla, SunFA_Cedilla] }; - key { [ equal, plus, SunFA_Tilde, SunFA_Tilde ] }; + key { [dead_circumflex, dead_diaeresis, bracketleft, bracketleft] }; + key { [ ugrave, percent, dead_acute, dead_acute ] }; + key { [ mu, sterling, dead_grave, dead_grave ] }; + key { [ comma, question, dead_cedilla, dead_cedilla] }; + key { [ equal, plus, dead_tilde, dead_tilde ] }; }; partial alphanumeric_keys diff --git a/symbols/ch b/symbols/ch index a0a2621..7f53cb9 100644 --- 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 { [ apostrophe, question, SunFA_Acute ] }; - key { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] }; - key { [ SunFA_Diaeresis, exclam, bracketright ] }; + key { [ apostrophe, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + key { [ 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 { [ apostrophe, question, SunFA_Acute ] }; - key { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] }; - key { [ SunFA_Diaeresis, exclam, bracketright ] }; + key { [ apostrophe, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + key { [ dead_diaeresis, exclam, bracketright ] }; }; partial alphanumeric_keys diff --git a/symbols/es b/symbols/es index 42b0e8c..8c88b43 100644 --- a/symbols/es +++ b/symbols/es @@ -36,8 +36,8 @@ xkb_symbols "Sundeadkeys" { include "es(basic)" - key { [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ] }; - key { [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] }; + key { [dead_acute, dead_diaeresis, braceleft, braceleft ] }; + key { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] }; }; partial alphanumeric_keys diff --git a/symbols/fr b/symbols/fr index 0d621a8..e0850d2 100644 --- a/symbols/fr +++ b/symbols/fr @@ -52,8 +52,8 @@ xkb_symbols "Sundeadkeys" { include "fr(basic)" - key { [SunFA_Circum, SunFA_Diaeresis ] }; - key { [comma, question, SunFA_Acute, dead_doubleacute ] }; + key { [dead_circumflex, dead_diaeresis ] }; + key { [comma, question, dead_acute, dead_doubleacute ] }; }; partial alphanumeric_keys @@ -222,14 +222,14 @@ xkb_symbols "oss_Sundeadkeys" { include "fr(oss)" // First row - key { [ twosuperior, threesuperior, onesuperior, SunFA_Cedilla ] }; // ¹ ² ³ ¸ + key { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ¹ ² ³ ¸ // Second row - key { [ SunFA_Circum, SunFA_Diaeresis, SunFA_Tilde, dead_abovering ] }; // ^ ̈ ̃ ˚ + key { [ dead_circumflex, dead_diaeresis, dead_tilde, dead_abovering ] }; // ^ ̈ ̃ ˚ //Third row - key { [ ugrave, percent, SunFA_Acute, Ugrave ] }; // ù % ' Ù - key { [ asterisk, mu, SunFA_Grave, dead_macron ] }; // * µ ` ̄ + key { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù + key { [ asterisk, mu, dead_grave, dead_macron ] }; // * µ ` ̄ }; partial alphanumeric_keys @@ -400,9 +400,9 @@ xkb_symbols "latin9_Sundeadkeys" { include "fr(latin9)" - key { [ ampersand, 1, SunFA_Acute, periodcentered ] }; - key { [ egrave, 7, SunFA_Grave, Egrave ] }; - key { [ SunFA_Circum, SunFA_Diaeresis, SunFA_Tilde, quoteright ] }; + key { [ ampersand, 1, dead_acute, periodcentered ] }; + key { [ egrave, 7, dead_grave, Egrave ] }; + key { [ dead_circumflex, dead_diaeresis, dead_tilde, quoteright ] }; }; diff --git a/symbols/is b/symbols/is index fcf199b..8878019 100644 --- a/symbols/is +++ b/symbols/is @@ -40,13 +40,13 @@ xkb_symbols "Sundeadkeys" { name[Group1]="Iceland - Sun dead keys"; - key { [SunFA_Circum, degree, notsign, notsign ] }; - key { [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] }; - key { [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key { [odiaeresis, Odiaeresis, SunFA_Acute, SunFA_Acute ] }; - key { [adiaeresis, Adiaeresis, SunFA_Circum, SunFA_Circum ] }; - key { [numbersign, acute, SunFA_Grave, SunFA_Grave ] }; + key { [dead_circumflex, degree, notsign, notsign ] }; + key { [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] }; + key { [udiaeresis, Udiaeresis, dead_diaeresis, dead_diaeresis ] }; + key { [ plus, asterisk, dead_tilde, dead_macron ] }; + key { [odiaeresis, Odiaeresis, dead_acute, dead_acute ] }; + key { [adiaeresis, Adiaeresis, dead_circumflex, dead_circumflex ] }; + key { [numbersign, acute, dead_grave, dead_grave ] }; }; partial alphanumeric_keys diff --git a/symbols/latam b/symbols/latam index 29ec743..fd748ab 100644 --- a/symbols/latam +++ b/symbols/latam @@ -35,8 +35,8 @@ partial alphanumeric_keys xkb_symbols "Sundeadkeys" { include "latam(basic)" - key { [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ] }; - key { [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] }; + key { [dead_acute, dead_diaeresis, braceleft, braceleft ] }; + key { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] }; }; partial alphanumeric_keys diff --git a/symbols/pt b/symbols/pt index ba141b3..4fdaa83 100644 --- a/symbols/pt +++ b/symbols/pt @@ -34,9 +34,9 @@ xkb_symbols "Sundeadkeys" { include "pt(basic)" // for consistent naming - key { [plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [SunFA_Tilde, SunFA_Circum ] }; - key { [SunFA_Acute, SunFA_Grave ] }; + key { [plus, asterisk, dead_diaeresis, dead_diaeresis ] }; + key { [dead_tilde, dead_circumflex ] }; + key { [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 { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [ SunFA_Tilde, SunFA_Circum ] }; - key { [ SunFA_Acute, SunFA_Grave ] }; + key { [ plus, asterisk, dead_diaeresis, dead_diaeresis ] }; + key { [ dead_tilde, dead_circumflex ] }; + key { [ dead_acute, dead_grave ] }; }; partial alphanumeric_keys diff --git a/symbols/sun_vndr/nl b/symbols/sun_vndr/nl index a895beb..42a5afb 100644 --- a/symbols/sun_vndr/nl +++ b/symbols/sun_vndr/nl @@ -117,7 +117,7 @@ xkb_symbols "type4" { key { [ 9, parenright, braceright ] }; key { [ 0, quoteright, quoteleft ] }; key { [ slash, question, backslash ] }; - key { [ degree, SunFA_Tilde, SunFA_Cedilla] }; + key { [ degree, dead_tilde, dead_cedilla] }; key { [ e, E, EuroSign, Eacute ]}; key { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]}; key { [ asterisk, bar, asciitilde ] };