From a12cf779e828ec70da714832e1eaa730119fe10c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 30 Sep 2013 08:58:27 +0200 Subject: git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013 xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7 libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5 fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397 mesa commit 868791f0baa0b51f4255c839448d3ca87ab1aa35 --- .../xkeyboard-config/symbols/macintosh_vndr/ch | 25 ++++++++---------- .../xkeyboard-config/symbols/macintosh_vndr/de | 16 +++++------- .../xkeyboard-config/symbols/macintosh_vndr/dk | 30 ++++++++++------------ .../xkeyboard-config/symbols/macintosh_vndr/fi | 6 ----- .../xkeyboard-config/symbols/macintosh_vndr/fr | 2 -- .../xkeyboard-config/symbols/macintosh_vndr/gb | 2 -- .../xkeyboard-config/symbols/macintosh_vndr/it | 3 --- .../xkeyboard-config/symbols/macintosh_vndr/latam | 4 +-- .../xkeyboard-config/symbols/macintosh_vndr/nl | 6 ----- .../xkeyboard-config/symbols/macintosh_vndr/no | 20 +++++++-------- .../xkeyboard-config/symbols/macintosh_vndr/pt | 7 +++-- .../xkeyboard-config/symbols/macintosh_vndr/se | 20 +++++++-------- .../xkeyboard-config/symbols/macintosh_vndr/us | 11 +++----- 13 files changed, 58 insertions(+), 94 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/macintosh_vndr') diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch index 54b61d215..7948ab19d 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch @@ -8,21 +8,19 @@ xkb_symbols "extended" { name[Group1]= "Switzerland - German, Mac"; - // Alphanumeric section - - key { [ 1, plus, plusminus, infinity ] }; - key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; + key { [ 1, plus, plusminus, infinity ] }; + key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; key { [ 3, asterisk, numbersign, leftcaret ] }; // not displayed here key { [ 4, ccedilla, Ccedilla, slash ] }; key { [ 5, percent, bracketleft ] }; key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; + key { [ 7, slash, bar, backslash ] }; key { [ 8, parenleft, braceleft, Ograve ] }; key { [ 9, parenright, braceright, Ocircumflex ] }; key { [ 0, equal, notequal, Uacute ] }; - key { [ apostrophe, question, questiondown, NoSymbol ] }; - key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; + key { [ apostrophe, question, questiondown, NoSymbol ] }; + key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; key { [ q, Q, oe, OE ] }; key { [ w, W, Greek_SIGMA, Aacute ] }; key { [ e, E, EuroSign, Ediaeresis ] }; @@ -33,8 +31,8 @@ xkb_symbols "extended" { key { [ i, I, exclamdown, idotless ] }; key { [ o, O, oslash, Ooblique ] }; key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ udiaeresis, egrave, section, ydiaeresis ] }; - key { [ dead_diaeresis, exclam, grave, apostrophe ] }; + key { [ udiaeresis, egrave, section, ydiaeresis ] }; + key { [ dead_diaeresis, exclam, grave, apostrophe ] }; key { [ a, A, aring, Aring ] }; key { [ s, S, ssharp, NoSymbol ] }; // ligature fl @@ -60,11 +58,11 @@ xkb_symbols "extended" { key { [ comma, semicolon, guillemotleft, guillemotright ] }; key { [ period, colon, ellipsis, division ] }; key { [ minus, underscore, hyphen, emdash ] }; - key { [ section, degree, NoSymbol, NoSymbol ] }; + key { [ section, degree, NoSymbol, NoSymbol ] }; // ligature fi // per mille key { [ space, nobreakspace, nobreakspace ] }; - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; include "kpdl(comma)" include "level3(ralt_switch)" @@ -78,9 +76,6 @@ xkb_symbols "de" { partial alphanumeric_keys xkb_symbols "fr" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - include "macintosh_vndr/ch(extended)" name[Group1]= "Switzerland - French, Mac"; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de index da5bc7772..66da8281e 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de @@ -4,12 +4,11 @@ default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple US/ASCII - // keyboard and a very simple German keybaord + // keyboard and a simple German keyboard. include "latin" name[Group1]= "Germany - Mac"; - // Alphanumeric section key { [ dead_circumflex, degree, notsign ] }; key { [ 1, exclam, exclamdown, at ] }; key { [ 2, quotedbl, twosuperior ] }; @@ -53,7 +52,6 @@ xkb_symbols "basic" { include "kpdl(comma)" include "level3(ralt_switch)" - }; partial alphanumeric_keys @@ -62,14 +60,14 @@ xkb_symbols "Sundeadkeys" { include "macintosh_vndr/de(basic)" name[Group1]= "Germany - Mac, Sun dead keys"; - key { [ SunFA_Circum, degree, notsign ] }; - key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; + key { [ SunFA_Circum, degree, notsign ] }; + key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; - key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; - key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; + key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; + key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; + key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; - key { [ numbersign, acute, SunFA_Grave ] }; + key { [ numbersign, acute, SunFA_Grave ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk index 11e38598c..e464519e0 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk @@ -21,26 +21,24 @@ xkb_symbols "basic" { key { [ 8, parenleft, bracketleft, guillemotleft ]}; key { [ 9, parenright, bracketright, guillemotright ]}; key { [ 0, equal, braceright, degree ]}; + key { [ plus, question, plusminus, questiondown ]}; + key { [ dead_acute, dead_grave, bar, brokenbar ]}; + key { [ c, C, copyright, NoSymbol ]}; key { [ comma, semicolon, dead_cedilla, dead_ogonek ]}; key { [ period, colon, periodcentered, dead_abovedot ]}; - key { [ c, C, copyright, NoSymbol ]}; key { [ minus, underscore, hyphen, macron ]}; - key { [ a, A, ordfeminine, masculine ]}; - key { [ d, D, eth, ETH ]}; - key { [ e, E, EuroSign, cent ]}; - key { [ r, R, registered, NoSymbol ]}; - key { [ t, T, thorn, THORN ]}; - key { [ i, I, NoSymbol, NoSymbol ]}; - key { [ o, O, oe, OE ]}; - key { [ ae, AE ]}; - key { [ plus, question, plusminus, questiondown ]}; + key { [ a, A, ordfeminine, masculine ]}; + key { [ d, D, eth, ETH ]}; + key { [ ae, AE ]}; key { [ oslash, Ooblique ]}; - key { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; + key { [ e, E, EuroSign, cent ]}; + key { [ r, R, registered, NoSymbol ]}; + key { [ t, T, thorn, THORN ]}; + key { [ i, I, NoSymbol, NoSymbol ]}; + key { [ o, O, oe, OE ]}; key { [ aring, Aring ]}; - key { [ dead_acute, dead_grave, bar, brokenbar ]}; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; - - // End alphanumeric section + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; + key { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; include "eurosign(e)" include "level3(ralt_switch)" @@ -52,7 +50,7 @@ xkb_symbols "nodeadkeys" { name[Group1]= "Denmark - Mac, eliminate dead keys"; key { [ acute, grave, bar, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi index 7a865d2bc..842c7b6cf 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi @@ -1,15 +1,9 @@ partial default alphanumeric_keys xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - include "macintosh_vndr/se(basic)" // for consistent naming name[Group1]= "Finland - Mac"; - }; - partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/se(basic)" // for consistent naming diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index 9a8f8de23..b2c9354e0 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr @@ -33,7 +33,6 @@ xkb_symbols "extended" { key { [ Escape ] }; - // Alphanumeric section key { [ at, numbersign, periodcentered, Ydiaeresis ] }; key { [ KP_Enter ] }; key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple @@ -91,7 +90,6 @@ xkb_symbols "extended" { key { [ equal, plus, notequal, plusminus ] }; key { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb index 4e4248561..f85078aaa 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb @@ -12,8 +12,6 @@ xkb_symbols "basic" { key { [ 3, sterling, numbersign ] }; key { [ section, plusminus ] }; key { [ grave, asciitilde ] }; - - // End alphanumeric section include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it index 2438231cd..3784b0e05 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it @@ -2,7 +2,6 @@ xkb_symbols "extended" { name[Group1]= "Italy - Mac"; - // Alphanumeric section key { [ less, greater ] }; key { [ at, numbersign, periodcentered ] }; key { [ ampersand, 1, guillemotleft,guillemotright ] }; @@ -55,8 +54,6 @@ xkb_symbols "extended" { key { [ colon, slash, bar, backslash ] }; key { [ ograve, exclam, exclamdown ] }; - // End alphanumeric section - include "kpdl(dot)" include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam index dcb9db624..485f12720 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple mac_US - // keyboard and a very simple Spanish keybaord + // keyboard and a very simple Spanish keyboard. include "latin" name[Group1]= "Latin American - Mac"; @@ -31,7 +31,5 @@ xkb_symbols "basic" { key { [ semicolon, colon ] }; key { [ apostrophe, quotedbl ] }; - // End alphanumeric section - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl index 5eb66c444..ad0ee4bf2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl @@ -1,15 +1,9 @@ partial default alphanumeric_keys xkb_symbols "basic" { - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - include "latin" name[Group1]= "Netherlands - Mac"; include "level3(ralt_switch)" - -// do just nothing - }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no index fb0cb74a2..53e62cf6d 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord + // keyboard and a very simple Norwegian keyboard. include "latin" @@ -10,28 +10,26 @@ xkb_symbols "basic" { key { [ bar, section ] }; key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, sterling ] }; key { [ 4, currency, dollar, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; key { [ 6, ampersand ] }; key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; key { [ 0, equal ] }; + key { [ plus, question ] }; + key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; key { [ comma, semicolon ] }; key { [ period, colon ] }; key { [ minus, underscore ] }; - key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; - key { [ plus, question ] }; + key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; key { [ ae, AE ] }; key { [ aring, Aring ] }; - key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; key { [ at, asterisk ] }; key { [ less, greater ] }; - // End alphanumeric section - include "eurosign(e)" include "level3(ralt_switch)" }; @@ -45,6 +43,6 @@ xkb_symbols "nodeadkeys" { name[Group1]= "Norway - Mac, eliminate dead keys"; key { [ grave, acute, acute, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, macron ] }; + key { [ diaeresis, asciicircum, asciitilde, macron ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt index 01ac86d85..f5b56a2c2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt @@ -4,7 +4,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord + // keyboard and a very simple Portuguese keyboard. include "latin" @@ -12,8 +12,8 @@ xkb_symbols "basic" { key { [ less, greater, bar, brokenbar ] }; key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, dollar, section, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 4, dollar, section, dollar ] }; key { [ 6, ampersand ] }; key { [ 7, slash ] }; key { [ 8, parenleft, bracketleft, braceleft ] }; @@ -29,7 +29,6 @@ xkb_symbols "basic" { key { [ backslash, bar ] }; key { [ masculine, ordfeminine ] }; key { [ dead_acute, dead_grave ] }; - // End alphanumeric section include "eurosign(e)" include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se index d2d05f248..beb226fa3 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord + // keyboard and a very simple Swedish(Sweden) keyboard. include "latin" @@ -11,25 +11,25 @@ xkb_symbols "basic" { key { [ section, degree ] }; key { [ 1, exclam, copyright, exclamdown ] }; - key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 2, quotedbl, at, oneeighth ] }; key { [ 3, numbersign, sterling, yen ] }; - key { [ 4, currency, dollar, cent ] }; + key { [ 4, currency, dollar, cent ] }; key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; + key { [ 7, slash, bar, backslash ] }; key { [ 8, parenleft, bracketleft, braceleft ] }; key { [ 9, parenright, bracketright, braceright ] }; key { [ comma, semicolon ] }; key { [ 0, equal ] }; + key { [ plus, question ] }; + key { [ acute, grave ] }; key { [ period, colon ] }; key { [ minus, underscore ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; key { [ aring, Aring ] }; - key { [ acute, grave ] }; key { [ diaeresis, asciicircum, asciitilde ] }; - key { [ apostrophe, asterisk, at ] }; - key { [ less, greater, bar, brokenbar ] }; + key { [ apostrophe, asterisk, at ] }; + key { [ less, greater, bar, brokenbar ] }; include "kpdl(comma)" include "eurosign(e)" diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us index d0cf5600b..81e4b77b9 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us @@ -5,7 +5,6 @@ xkb_symbols "extended" { name[Group1]= "USA"; key { [ Escape ] }; - // Alphanumeric section key { [ grave, asciitilde ] }; key { [ 1, exclam ] }; key { [ 2, at ] }; @@ -58,13 +57,11 @@ xkb_symbols "extended" { key { [ slash, question ] }; key { [ space ] }; - // End alphanumeric section - include "eurosign(e)" include "keypad" - key { [ equal ] }; + key { [ equal ] }; }; hidden @@ -104,11 +101,11 @@ xkb_symbols "oldmac" { key { [ Right ] }; // End "Editing" section - key { [ BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; + key { [ BackSpace ] }; + key { [ Tab, ISO_Left_Tab ] }; key { [ Return ] }; key { [ Caps_Lock ] }; - key { [ Num_Lock, Pointer_EnableKeys ] }; + key { [ Num_Lock, Pointer_EnableKeys ] }; // Begin "Modifier" section key { [ Shift_L ] }; -- cgit v1.2.3