diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch index 815c333..7034746 100644 --- a/symbols/macintosh_vndr/ch +++ b/symbols/macintosh_vndr/ch @@ -11,110 +11,61 @@ xkb_symbols "extended" { // Alphanumeric section - key { [ 1, plus ], - [ plusminus, infinity ] }; - key { [ 2, quotedbl ], - [leftdoublequotemark, rightdoublequotemark ] }; - key { [ 3, asterisk ], - [ numbersign, leftcaret ] }; + 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 { [ 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 { [ q, Q ], - [ oe, OE ] }; - key { [ w, W ], - [ Greek_SIGMA, Aacute ] }; - key { [ e, E ], - [ EuroSign, Ediaeresis ] }; - key { [ r, R ], - [ registered, Egrave ] }; - key { [ t, T ], - [ dagger, Icircumflex ] }; - key { [ z, Z ], - [ Greek_OMEGA, Iacute ] }; - key { [ u, U ], - [ degree, Ugrave ] }; - 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 { [ a, A ], - [ aring, Aring ] }; - key { [ s, S ], - [ ssharp, NoSymbol ] }; + key { [ 4, ccedilla, Ccedilla, slash ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + 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 { [ q, Q, oe, OE ] }; + key { [ w, W, Greek_SIGMA, Aacute ] }; + key { [ e, E, EuroSign, Ediaeresis ] }; + key { [ r, R, registered, Egrave ] }; + key { [ t, T, dagger, Icircumflex ] }; + key { [ z, Z, Greek_OMEGA, Iacute ] }; + key { [ u, U, degree, Ugrave ] }; + 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 { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, NoSymbol ] }; // ligature fl - key { [ d, D ], - [ Greek_sigma, NoSymbol ] }; + key { [ d, D, Greek_sigma, NoSymbol ] }; // partialderivative is not available here att - key { [ f, F ], - [ function, doubledagger ] }; - key { [ g, G ], - [ at, comma ] }; - key { [ h, H ], - [ ordfeminine, periodcentered ] }; - key { [ j, J ], - [ masculine, eth ] }; - key { [ k, K ], - [ Greek_DELTA, macron ] }; - key { [ l, L ], - [ notsign, caret ] }; - key { [ odiaeresis, eacute ], - [ cent, breve ] }; - key { [ adiaeresis, agrave ], - [ ae, AE ] }; - key { [ y, Y ], - [ yen, Ydiaeresis ] }; - key { [ x, X ], - [ similarequal, trademark ] }; - key { [ c, C ], - [ copyright, NoSymbol ] }; - key { [ v, V ], - [ radical, diamond ] }; - key { [ b, B ], - [ integral, NoSymbol ] }; - key { [ n, N ], - [ dead_tilde, enopencircbullet ] }; + key { [ f, F, function, doubledagger ] }; + key { [ g, G, at, comma ] }; + key { [ h, H, ordfeminine, periodcentered ] }; + key { [ j, J, masculine, eth ] }; + key { [ k, K, Greek_DELTA, macron ] }; + key { [ l, L, notsign, caret ] }; + key { [ odiaeresis, eacute, cent, breve ] }; + key { [ adiaeresis, agrave, ae, AE ] }; + key { [ y, Y, yen, Ydiaeresis ] }; + key { [ x, X, similarequal, trademark ] }; + key { [ c, C, copyright, NoSymbol ] }; + key { [ v, V, radical, diamond ] }; + key { [ b, B, integral, NoSymbol ] }; + key { [ n, N, dead_tilde, enopencircbullet ] }; // to be fixed att - key { [ m, M ], - [ mu, dead_abovering ] }; + key { [ m, M, mu, dead_abovering ] }; // not sure att - key { [ comma, semicolon ], - [ guillemotleft, guillemotright ] }; - key { [ period, colon ], - [ ellipsis, division ] }; - key { [ minus, underscore ], - [ hyphen, emdash ] }; - key { [ section, degree ], - [ NoSymbol, NoSymbol ] }; + key { [ comma, semicolon, guillemotleft, guillemotright ] }; + key { [ period, colon, ellipsis, division ] }; + key { [ minus, underscore, hyphen, emdash ] }; + key { [ section, degree, NoSymbol, NoSymbol ] }; // ligature fi // per mille - key { [ space ], - [ nobreakspace, nobreakspace ] }; - key { [ less, greater ], - [ lessthanequal, greaterthanequal ] }; - key { [ dollar, sterling ], - [ paragraph, enfilledcircbullet ] }; + key { [ space, nobreakspace, nobreakspace ] }; + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; include "keypad(comma)" }; @@ -134,15 +85,13 @@ xkb_symbols "fr" { name[Group1]= "Swiss French"; override key { - [ egrave, udiaeresis ], - [ bracketleft ] + [ egrave, udiaeresis, bracketleft ] }; override key { [ eacute, odiaeresis ] }; override key { - [ agrave, adiaeresis ], - [ braceleft ] + [ agrave, adiaeresis, braceleft ] }; }; diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de index b29ba94..a44f8bf 100644 --- a/symbols/macintosh_vndr/de +++ b/symbols/macintosh_vndr/de @@ -11,79 +11,46 @@ xkb_symbols "basic" { // Alphanumeric section name[Group1]= "German"; - key { [ dead_circumflex, degree ], - [ notsign ] }; - key { [ 1, exclam ], - [ exclamdown, at ] }; - key { [ 2, quotedbl ], - [ twosuperior ] }; - key { [ 3, section ], - [ threesuperior,sterling ] }; - key { [ 4, dollar ], - [ onequarter, currency ] }; - key { [ 5, percent ], - [ bracketleft ] }; - key { [ 6, ampersand ], - [ bracketright ] }; - key { [ 7, slash ], - [ bar, backslash ] }; - key { [ 8, parenleft ], - [ braceleft, asciitilde ] }; - key { [ 9, parenright ], - [braceright ] }; - key { [ 0, equal ], - [ braceright, degree ] }; - key { [ ssharp, question ], - [ backslash, questiondown ] }; - key { [ dead_acute, dead_grave ], - [ dead_cedilla ] }; + key { [ dead_circumflex, degree, notsign ] }; + key { [ 1, exclam, exclamdown, at ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior,sterling ] }; + key { [ 4, dollar, onequarter, currency ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, braceleft, asciitilde ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ ssharp, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla ] }; - key { [ q, Q ], - [guillemotleft,guillemotright ] }; - key { [ e, E ], - [ EuroSign ] }; - key { [ r, R ], - [ registered ] }; + key { [ q, Q, guillemotleft,guillemotright ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; key { [ t, T ] }; key { [ z, Z ] }; - key { [ u, U ], - [diaeresis, Aacute ] }; - key { [ i, I ], - [ slash, Ucircumflex ] }; - key { [ o, O ], - [ oslash, Ooblique ] }; - key { [ udiaeresis, Udiaeresis ], - [ periodcentered, degree ] }; - key { [ plus, asterisk ], - [ asciitilde ] }; - key { [ a, A ], - [ aring, Aring ] }; + key { [ u, U, diaeresis, Aacute ] }; + key { [ i, I, slash, Ucircumflex ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ a, A, aring, Aring ] }; key { [ f, F ] }; - key { [ g, G ], - [ copyright ] }; - key { [ h, H ], - [ ordfeminine ] }; - key { [ l, L ], - [ at ] }; - key { [ odiaeresis, Odiaeresis ], - [ dead_acute ] }; - key { [ adiaeresis, Adiaeresis ], - [ dead_circumflex ] }; + key { [ g, G, copyright ] }; + key { [ h, H, ordfeminine ] }; + key { [ l, L, at ] }; + key { [ odiaeresis, Odiaeresis, dead_acute ] }; + key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; - key { [ less, greater ], - [ bar ] }; - key { [ y, Y ], - [ guillemotleft,less ] }; - key { [ n, N ], - [asciitilde ] }; - key { [ m, M ], - [ mu ] }; + key { [ less, greater, bar ] }; + key { [ y, Y, guillemotleft,less ] }; + key { [ n, N, asciitilde ] }; + key { [ m, M, mu ] }; key { [ comma, semicolon ] }; - key { [ period, colon ], - [ periodcentered, division ] }; + key { [ period, colon, periodcentered, division ] }; key { [ minus, underscore ] }; - key { [ numbersign, apostrophe ], - [ dead_grave ] }; + key { [ numbersign, apostrophe, dead_grave ] }; include "keypad(comma)" @@ -98,21 +65,14 @@ partial alphanumeric_keys xkb_symbols "Sundeadkeys" { // modify the default German layout to use Sun dead keys include "macintosh_vndr/de(basic)" - 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 { [ 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 { [ numbersign, acute ], - [ SunFA_Grave ] }; + key { [ numbersign, acute, SunFA_Grave ] }; }; partial alphanumeric_keys @@ -124,19 +84,12 @@ partial alphanumeric_keys xkb_symbols "nodeadkeys" { // modify the default German layout to not have any dead keys include "macintosh_vndr/de(basic)" - key { [ asciicircum, degree ], - [ notsign ] }; - key { [ acute, grave ], - [ cedilla ] }; - key { [ udiaeresis, Udiaeresis ], - [ diaeresis ] }; - key { [ plus, asterisk ], - [ asciitilde, macron ] }; - key { [ odiaeresis, Odiaeresis ], - [ acute ] }; - key { [ adiaeresis, Adiaeresis ], - [ asciicircum ] }; + key { [ asciicircum, degree, notsign ] }; + key { [ acute, grave, cedilla ] }; + key { [ udiaeresis, Udiaeresis, diaeresis ] }; + key { [ plus, asterisk, asciitilde, macron ] }; + key { [ odiaeresis, Odiaeresis, acute ] }; + key { [ adiaeresis, Adiaeresis, asciicircum ] }; - key { [ numbersign, apostrophe ], - [ grave ] }; + key { [ numbersign, apostrophe, grave ] }; }; diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk index 97ef6d6..364453f 100644 --- a/symbols/macintosh_vndr/dk +++ b/symbols/macintosh_vndr/dk @@ -9,65 +9,37 @@ xkb_symbols "basic" { name[Group1]= "Danish"; - key { [ onehalf, section ], - [ threequarters, paragraph ]}; - key { [ less, greater ], - [ backslash, notsign ]}; - key { [ space, space ], - [ nobreakspace, nobreakspace ]}; - key { [ 1, exclam ], - [ exclamdown, onesuperior ]}; - key { [ 2, quotedbl ], - [ at, twosuperior ]}; - key { [ 3, numbersign ], - [ sterling, threesuperior ]}; - key { [ 4, currency ], - [ dollar, onequarter ]}; - key { [ 5, percent ], - [ NoSymbol, cent ]}; - key { [ 6, ampersand ], - [ yen, NoSymbol ]}; - key { [ 7, slash ], - [ braceleft, division ]}; - key { [ 8, parenleft ], - [ bracketleft, guillemotleft ]}; - key { [ 9, parenright ], - [ bracketright, guillemotright ]}; - key { [ 0, equal ], - [ braceright, degree ]}; - 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 ], - [ NoSymbol, 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 { [ oslash, Ooblique ]}; - key { [ apostrophe, asterisk ], - [dead_doubleacute, multiply ]}; - key { [ aring, Aring ]}; - key { [ dead_acute, dead_grave ], - [ bar, brokenbar ]}; - key { [ dead_diaeresis, dead_circumflex ], - [ dead_tilde, dead_caron ]}; + key { [ onehalf, section, threequarters, paragraph ]}; + key { [ less, greater, backslash, notsign ]}; + key { [ space, space, nobreakspace, nobreakspace ]}; + key { [ 1, exclam, exclamdown, onesuperior ]}; + key { [ 2, quotedbl, at, twosuperior ]}; + key { [ 3, numbersign, sterling, threesuperior ]}; + key { [ 4, currency, dollar, onequarter ]}; + key { [ 5, percent, NoSymbol, cent ]}; + key { [ 6, ampersand, yen, NoSymbol ]}; + key { [ 7, slash, braceleft, division ]}; + key { [ 8, parenleft, bracketleft, guillemotleft ]}; + key { [ 9, parenright, bracketright, guillemotright ]}; + key { [ 0, equal, braceright, degree ]}; + 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, NoSymbol, 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 { [ oslash, Ooblique ]}; + key { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; + key { [ aring, Aring ]}; + key { [ dead_acute, dead_grave, bar, brokenbar ]}; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; // End alphanumeric section @@ -85,8 +57,6 @@ xkb_symbols "full" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/dk(basic)" - key { [ acute, grave ], - [ bar, ogonek ] }; - key { [ diaeresis, asciicircum ], - [ asciitilde, dead_macron ] }; + key { [ acute, grave, bar, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; }; diff --git a/symbols/macintosh_vndr/es b/symbols/macintosh_vndr/es index 4d9f288..ce789cd 100644 --- a/symbols/macintosh_vndr/es +++ b/symbols/macintosh_vndr/es @@ -7,39 +7,27 @@ xkb_symbols "basic" { name[Group1]= "Spanish"; - key { [ bracketleft, bracketright ], - [ braceleft, braceright ] }; - key { [ less, greater ], - [ bracketleft, braceleft ] }; - key { [ 1, exclam ] }; - key { [ 2, exclamdown ], - [ at, oneeighth ] }; - key { [ 3, numbersign ], - [ guillemotleft, guillemotright ] }; - key { [ 4, dollar ], - [ yen, Icircumflex ] }; - key { [ 5, percent ] }; - key { [ 6, slash ], - [ backslash, Idiaeresis ] }; - key { [ 7, ampersand ], - [ bar, Iacute ] }; - key { [ 8, asterisk ], - [ degree ] }; - key { [ 9, parenleft ], - [ sterling, Ocircumflex ] }; + key { [ bracketleft, bracketright, braceleft, braceright ] }; + key { [ less, greater, bracketleft, braceleft ] }; + key { [ 1, exclam ] }; + key { [ 2, exclamdown, at, oneeighth ] }; + key { [ 3, numbersign, guillemotleft, guillemotright ] }; + key { [ 4, dollar, yen, Icircumflex ] }; + key { [ 5, percent ] }; + key { [ 6, slash, backslash, Idiaeresis ] }; + key { [ 7, ampersand, bar, Iacute ] }; + key { [ 8, asterisk, degree ] }; + key { [ 9, parenleft, sterling, Ocircumflex ] }; key { [ 0, parenright ] }; key { [ minus, underscore ] }; - key { [ equal, plus ], - [ plusminus ] }; + key { [ equal, plus, plusminus ] }; key { [ dead_grave, degree ] }; - key { [ dead_acute, dead_diaeresis ], - [ bar ] }; + key { [ dead_acute, dead_diaeresis, bar ] }; key { [ comma, questiondown ] }; key { [ period, question ] }; key { [ ccedilla, Ccedilla ] }; - key { [ ntilde, Ntilde ], - [ asciitilde,dead_doubleacute ] }; + key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; key { [ semicolon, colon ] }; key { [ apostrophe, quotedbl ] }; diff --git a/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr index d23cd86..88c9089 100644 --- a/symbols/macintosh_vndr/fr +++ b/symbols/macintosh_vndr/fr @@ -26,114 +26,65 @@ xkb_symbols "extended" { key { [ Escape ] }; // Alphanumeric section - key { [ at, numbersign ], - [periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 + key { [ at, numbersign, periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 key { [ KP_Enter ] }; - key { [ ampersand, 1 ], - [ VoidSymbol, dead_acute ] }; // MISSING: Apple - key { [ eacute, 2 ], - [ ediaeresis, Eacute ] }; - key { [ quotedbl, 3 ], - [ VoidSymbol, VoidSymbol ] }; // CHECK all quotemarks - key { [ apostrophe, 4 ], - [ VoidSymbol, VoidSymbol ] }; - key { [ parenleft, 5 ], - [ braceleft, bracketleft ] }; - key { [ section, 6 ], // CHECK section - [ paragraph, aring ] }; - key { [ egrave, 7 ], - [guillemotleft, guillemotright] }; - key { [ exclam, 8 ], - [ exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9 ], - [ Ccedilla, Aacute ] }; - key { [ agrave, 0 ], - [ oslash, VoidSymbol ] }; // MISSING: Oslash - key { [ parenright, degree ], - [ braceright, bracketright ] }; - key { [ minus, underscore ], - [ emdash, endash ] }; // CHECK dashes - key { [ BackSpace, VoidSymbol ], - [ Delete, VoidSymbol ] }; + key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple + key { [ eacute, 2, ediaeresis, Eacute ] }; + key { [ quotedbl, 3, VoidSymbol, VoidSymbol ] }; // CHECK all quotemarks + key { [ apostrophe, 4, VoidSymbol, VoidSymbol ] }; + key { [ parenleft, 5, braceleft, bracketleft ] }; + // CHECK section + key { [ section, 6, paragraph, aring ] }; + key { [ egrave, 7, guillemotleft, guillemotright ] }; + key { [ exclam, 8, exclamdown, Ucircumflex ] }; + key { [ ccedilla, 9, Ccedilla, Aacute ] }; + key { [ agrave, 0, oslash, VoidSymbol ] }; // MISSING: Oslash + key { [ parenright, degree, braceright, bracketright ] }; + key { [ minus, underscore, emdash, endash ] }; // CHECK dashes + key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; key { [ Tab, ISO_Left_Tab ] }; - key { [ a, A ], - [ ae, AE ] }; - key { [ z, Z ], - [ Acircumflex, Aring ] }; - key { [ e, E ], - [ ecircumflex, Ecircumflex ] }; - key { [ r, R ], - [ registered, currency ] }; - key { [ t, T ], - [ VoidSymbol, VoidSymbol ] }; - key { [ y, Y ], - [ Uacute, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 - key { [ u, U ], - [ VoidSymbol, ordfeminine ] }; // MISSING: ordmasculine? - key { [ i, I ], - [ icircumflex, idiaeresis ] }; - key { [ o, O ], - [ oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 - key { [ p, P ], - [ VoidSymbol, VoidSymbol ] }; - key { [dead_circumflex,dead_diaeresis ], - [ ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk ], - [ EuroSign, yen ] }; // eherlent : EuroSign in Latin9 + key { [ a, A, ae, AE ] }; + key { [ z, Z, Acircumflex, Aring ] }; + key { [ e, E, ecircumflex, Ecircumflex ] }; + key { [ r, R, registered, currency ] }; + key { [ t, T, VoidSymbol, VoidSymbol ] }; + key { [ y, Y, Uacute, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 + key { [ u, U, VoidSymbol, ordfeminine ] }; // MISSING: ordmasculine? + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O, oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 + key { [ p, P, VoidSymbol, VoidSymbol ] }; + key { [dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex ] }; + key { [ dollar, asterisk, EuroSign, yen ] }; // eherlent : EuroSign in Latin9 key { [ Caps_Lock ] }; - key { [ q, Q ], - [acircumflex, Agrave ] }; - key { [ s, S ], - [ Ograve, VoidSymbol ] }; - key { [ d, D ], - [VoidSymbol, VoidSymbol ] }; - key { [ f, F ], - [VoidSymbol, periodcentered ] }; // MISSING: oblong script f?? - key { [ g, G ], - [VoidSymbol, VoidSymbol ] }; // MISSING: kerned fi, fl - key { [ h, H ], - [ Igrave, Icircumflex ] }; - key { [ j, J ], - [Idiaeresis, Iacute ] }; - key { [ k, K ], - [ Egrave, Ediaeresis ] }; - key { [ l, L ], - [ notsign, bar ] }; - key { [ m, M ], - [ mu, Oacute ] }; - key { [ ugrave, percent ], - [ Ugrave, ucircumflex ] }; // MISSING: per-mille - key { [ dead_grave, sterling ], - [ at, numbersign ] }; + key { [ q, Q, acircumflex, Agrave ] }; + key { [ s, S, Ograve, VoidSymbol ] }; + key { [ d, D, VoidSymbol, VoidSymbol ] }; + key { [ f, F, VoidSymbol, periodcentered ] }; // MISSING: oblong script f?? + key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: kerned fi, fl + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, notsign, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave,percent, Ugrave, ucircumflex ] }; // MISSING: per-mille + key { [ dead_grave, sterling, at, numbersign ] }; key { [ Return ] }; - key { [ less, greater ], - [VoidSymbol, VoidSymbol ] }; - key { [ w, W ], - [VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) - key { [ x, X ], - [VoidSymbol, VoidSymbol ] }; // CHECK similarequal; MISSING: extra-slanted slash - key { [ c, C ], - [ copyright, cent ] }; - key { [ v, V ], - [ diamond, leftradical ] }; // CHECK diamond, leftradical - key { [ b, B ], - [ ssharp, VoidSymbol ] }; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s - key { [ n, N ], - [ dead_tilde, asciitilde ] }; - key { [ comma, question ], - [VoidSymbol, questiondown ] }; - key { [ semicolon, period ], - [VoidSymbol, periodcentered ] }; - key { [ colon, slash ], - [ division, backslash ] }; - key { [ equal, plus ], - [VoidSymbol, plusminus ] }; - - key { [ space, space ], - [nobreakspace, nobreakspace ] }; + key { [ less, greater, VoidSymbol, VoidSymbol ] }; + key { [ w, W, VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) + key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK similarequal; MISSING: extra-slanted slash + key { [ c, C, copyright, cent ] }; + key { [ v, V, diamond, leftradical ] }; // CHECK diamond, leftradical + key { [ b, B, ssharp, VoidSymbol ] }; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s + key { [ n, N, dead_tilde, asciitilde ] }; + key { [ comma, question, VoidSymbol, questiondown ] }; + key { [ semicolon, period, VoidSymbol, periodcentered ] }; + key { [ colon, slash, division, backslash ] }; + key { [ equal, plus, VoidSymbol, plusminus ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; // End alphanumeric section // Begin modifier mappings diff --git a/symbols/macintosh_vndr/gb b/symbols/macintosh_vndr/gb index 29a27f8..faa12d2 100644 --- a/symbols/macintosh_vndr/gb +++ b/symbols/macintosh_vndr/gb @@ -9,8 +9,7 @@ xkb_symbols "basic" { name[Group1]= "Great Britain"; - key { [ 3, sterling ], - [ numbersign ] }; + key { [ 3, sterling, numbersign ] }; // End alphanumeric section diff --git a/symbols/macintosh_vndr/is b/symbols/macintosh_vndr/is index 7186565..e4e8548 100644 --- a/symbols/macintosh_vndr/is +++ b/symbols/macintosh_vndr/is @@ -60,111 +60,63 @@ xkb_symbols "basic" { name[Group1]= "Icelandic"; //-- Row 5 (E) --// - key { [ sterling, section ], - [ UF8FF, apostrophe ] }; - key { [ 1, exclam ], - [ exclamdown, VoidSymbol ] }; - key { [ 2, quotedbl ], - [ at, VoidSymbol ] }; - key { [ 3, numbersign ], - [ U2122, sterling ] }; - key { [ 4, dollar ], - [ U00A2, EuroSign ] }; - key { [ 5, percent ], - [ U2030, infinity ] }; - key { [ 6, ampersand ], - [ asciicircum, U2044 ] }; - key { [ 7, slash ], - [ backslash, U00F7 ] }; - key { [ 8, parenleft ], - [ bracketleft, braceleft ] }; - key { [ 9, parenright ], - [ bracketright, braceright ] }; - key { [ 0, equal ], - [ U2260, U2248 ] }; - key { [ odiaeresis, Odiaeresis ], - [ oslash, Ooblique ] }; - key { [ minus, underscore ], - [ endash, emdash ] }; + key { [ sterling, section, UF8FF, apostrophe ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, U2122, sterling ] }; + key { [ 4, dollar, U00A2, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, backslash, U00F7 ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, U2260, U2248 ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ minus, underscore, endash, emdash ] }; //-- Row 4 (D) --// - key { [ q, Q ], - [ paragraph, VoidSymbol ] }; - key { [ w, W ], - [ U2211, VoidSymbol ] }; - key { [ e, E ], - [ dead_grave, VoidSymbol ] }; - key { [ r, R ], - [ registered, VoidSymbol ] }; - key { [ t, T ], - [ degree, VoidSymbol ] }; - key { [ y, Y ], - [ yen, VoidSymbol ] }; - key { [ u, U ], - [ dead_diaeresis, VoidSymbol ] }; - key { [ i, I ], - [ U0131, U00AA ] }; - key { [ o, O ], - [ dead_circumflex,U00BA ] }; - key { [ p, P ], - [ Greek_pi, Greek_PI ] }; - key { [ eth, Eth ], - [ U201e, U201c ] }; - key { [ apostrophe, question ], - [ questiondown, U00B7 ] }; + key { [ q, Q, paragraph, VoidSymbol ] }; + key { [ w, W, U2211, VoidSymbol ] }; + key { [ e, E, dead_grave, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, VoidSymbol ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, U0131, U00AA ] }; + key { [ o, O, dead_circumflex,U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, U201e, U201c ] }; + key { [ apostrophe, question, questiondown, U00B7 ] }; //-- Row 3 (C) --// - key { [ a, A ], - [ aring, Aring ] }; - key { [ s, S ], - [ ssharp, abovedot ] }; - key { [ d, D ], - [ U2202, U2DA ] }; - key { [ f, F ], - [ U192, macron ] }; - key { [ g, G ], - [ copyright, breve ] }; - key { [ h, H ], - [ bar, VoidSymbol ] }; - key { [ j, J ], - [ U2206, U2dd ] }; - key { [ k, K ], - [ U00AC, VoidSymbol ] }; - key { [ l, L ], - [ U2026, caron ] }; - key { [ ae, AE ], - [ oe, OE ] }; - key { [ dead_acute, dead_diaeresis ], - [ U201A, U2018 ] }; - key { [ plus, asterisk ], - [ U2022, plusminus ] }; + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, U2202, U2DA ] }; + key { [ f, F, U192, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, VoidSymbol ] }; + key { [ j, J, U2206, U2dd ] }; + key { [ k, K, U00AC, VoidSymbol ] }; + key { [ l, L, U2026, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; + key { [ plus, asterisk, U2022, plusminus ] }; //-- Row 2 (B) --// - key { [ less, greater ], - [ section, UF8FF ] }; - key { [ z, Z ], - [ U3A9, VoidSymbol ] }; - key { [ x, X ], - [ asciitilde, VoidSymbol ] }; - key { [ c, C ], - [ ccedilla, Ccedilla ] }; - key { [ v, V ], - [ U221A, U25CA ] }; - key { [ b, B ], - [ U222B, VoidSymbol ] }; - key { [ n, N ], - [ dead_tilde, VoidSymbol ] }; - key { [ m, M ], - [ U00B5, VoidSymbol ] }; - key { [ comma, semicolon ], - [ lessthanequal, guillemotleft ] }; - key { [ period, colon ], - [ greaterthanequal,guillemotright ] }; - key { [ thorn, Thorn ], - [ U2019, U201d ] }; + key { [ less, greater, section, UF8FF ] }; + key { [ z, Z, U3A9, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, U221A, U25CA ] }; + key { [ b, B, U222B, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, U00B5, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal,guillemotright ] }; + key { [ thorn, Thorn, U2019, U201d ] }; // Special keys and modifiers key { [ Alt_L, Meta_L ] }; diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it index 1e861ea..d7e6ba2 100644 --- a/symbols/macintosh_vndr/it +++ b/symbols/macintosh_vndr/it @@ -4,84 +4,57 @@ xkb_symbols "extended" { name[Group1]= "italian"; // Alphanumeric section - key { [ less, greater ] }; - key { [ at, numbersign ], - [ periodcentered ] }; - key { [ ampersand, 1 ], - [guillemotleft,guillemotright ] }; - key { [ quotedbl, 2 ] }; - key { [ apostrophe, 3 ] }; - key { [ parenleft, 4 ], - [ braceleft, bracketleft ] }; - key { [ ccedilla, 5 ], - [ Ccedilla, Iacute ] }; - key { [ egrave, 6 ], - [ paragraph, periodcentered] }; - key { [ parenright, 7 ], - [ braceright, bracketright ] }; - key { [ sterling, 8 ], - [ infinity ] }; - key { [ agrave, 9 ], - [ acute, Ocircumflex ] }; - key { [ eacute, 0 ], - [ grave, Oacute ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ], - [ notequal, plusminus ] }; + key { [ less, greater ] }; + key { [ at, numbersign, periodcentered ] }; + key { [ ampersand, 1, guillemotleft,guillemotright ] }; + key { [ quotedbl, 2 ] }; + key { [ apostrophe, 3 ] }; + key { [ parenleft, 4, braceleft, bracketleft ] }; + key { [ ccedilla, 5, Ccedilla, Iacute ] }; + key { [ egrave, 6, paragraph, periodcentered] }; + key { [ parenright, 7, braceright, bracketright ] }; + key { [ sterling, 8, infinity ] }; + key { [ agrave, 9, acute, Ocircumflex ] }; + key { [ eacute, 0, grave, Oacute ] }; + key { [ minus, underscore ] }; + key { [ equal, plus, notequal, plusminus ] }; - key { [ q, Q ] }; - key { [ z, Z ] }; - key { [ e, E ] }; - key { [ r, R ], - [ registered ] }; - key { [ t, T ] }; - key { [ y, Y ], - [ Uacute, ydiaeresis ] }; - key { [ u, U ] }; - key { [ i, I ], - [ icircumflex, idiaeresis ] }; - key { [ o, O ] }; - key { [ p, P ] }; + key { [ q, Q ] }; + key { [ z, Z ] }; + key { [ e, E ] }; + key { [ r, R, registered ] }; + key { [ t, T ] }; + key { [ y, Y, Uacute, ydiaeresis ] }; + key { [ u, U ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O ] }; + key { [ p, P ] }; key { [ igrave, asciicircum ] }; key { [ dollar, asterisk ] }; - key { [ section, degree ], - [ at, numbersign ] }; + key { [ section, degree, at, numbersign ] }; - key { [ a, A ] , - [ aring, Aring ] }; - key { [ s, S ], - [ ssharp ] }; + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp ] }; key { [ d, D ] }; key { [ f, F ] }; key { [ g, G ] }; - key { [ h, H ], - [ Igrave, Icircumflex ] }; - key { [ j, J ], - [ Idiaeresis, Iacute ] }; - key { [ k, K ], - [ Egrave, Ediaeresis ] }; - key { [ l, L ], - [ ssharp, bar ] }; - key { [ m, M ], - [ mu, Oacute ] }; - key { [ ugrave, percent ], - [ ae, AE ] }; + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, ssharp, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, ae, AE ] }; key { [ w, W ] }; key { [ x, X ] }; - key { [ c, C ], - [ copyright, copyright ] }; + key { [ c, C, copyright, copyright ] }; key { [ v, V ] }; key { [ b, B ] }; - key { [ n, N ], - [ dead_tilde ] }; - key { [ comma, question ], - [ questiondown ] }; + key { [ n, N, dead_tilde ] }; + key { [ comma, question, questiondown ] }; key { [ semicolon, period ] }; - key { [ colon, slash ], - [ bar, backslash ] }; - key { [ ograve, exclam ], - [ exclamdown ] }; + key { [ colon, slash, bar, backslash ] }; + key { [ ograve, exclam, exclamdown ] }; // End alphanumeric section diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no index 4fc2e8b..85e5f69 100644 --- a/symbols/macintosh_vndr/no +++ b/symbols/macintosh_vndr/no @@ -9,33 +9,24 @@ xkb_symbols "basic" { name[Group1]= "Norwegian"; key { [ bar, section ] }; - key { [ 2, quotedbl ], - [ at, oneeighth ] }; - key { [ 4, currency ], - [ dollar, dollar ] }; - key { [ 3, numbersign ], - [ sterling, sterling ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + 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 { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; key { [ 0, equal ] }; key { [ comma, semicolon ] }; key { [ period, colon ] }; key { [ minus, underscore ] }; - key { [ oslash, Ooblique ], - [ odiaeresis, Odiaeresis ] }; + key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; key { [ plus, question ] }; key { [ ae, AE ] }; key { [ aring, Aring ] }; - key { [ dead_grave, dead_acute ], - [ acute, dead_ogonek ] }; - key { [ diaeresis, asciicircum ], - [ asciitilde, dead_macron ] }; + key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; key { [ at, asterisk ] }; key { [ less, greater ] }; @@ -50,9 +41,7 @@ xkb_symbols "nodeadkeys" { // Modifies the basic Norwegian layout to eliminate dead keys include "macintosh_vndr/no(basic)" - key { [ grave, acute ], - [ acute, ogonek ] }; - key { [ diaeresis, asciicircum ], - [ asciitilde, macron ] }; + key { [ grave, acute, acute, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, macron ] }; }; diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt index f0019d0..6c4553a 100644 --- a/symbols/macintosh_vndr/pt +++ b/symbols/macintosh_vndr/pt @@ -10,24 +10,17 @@ xkb_symbols "basic" { name[Group1]= "Portuguese"; - key { [ less, greater ], - [ bar, brokenbar ] }; - key { [ 2, quotedbl ], - [ at, oneeighth ] }; - key { [ 4, dollar ], - [ section, dollar ] }; - key { [ 3, numbersign ], - [ sterling, sterling ] }; + key { [ less, greater, bar, brokenbar ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 4, dollar, section, dollar ] }; + key { [ 3, numbersign, sterling, sterling ] }; key { [ 6, ampersand ] }; key { [ 7, slash ] }; - key { [ 8, parenleft ], - [ bracketleft, braceleft ] }; - key { [ 9, parenright ], - [ bracketright, braceright ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; key { [ 0, equal ] }; key { [ apostrophe, question ] }; - key { [ plus, asterisk ], - [ dead_diaeresis ] }; + key { [ plus, asterisk, dead_diaeresis ] }; key { [ comma, semicolon ] }; key { [ period, colon ] }; key { [ minus, underscore ] }; @@ -44,8 +37,7 @@ partial alphanumeric_keys xkb_symbols "Sundeadkeys" { include "macintosh_vndr/pt(basic)" // for consistent naming - key { [ plus, asterisk ], - [ SunFA_Diaeresis, SunFA_Diaeresis ] }; + key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; key { [ SunFA_Tilde, SunFA_Circum ] }; key { [ SunFA_Acute, SunFA_Grave ] }; }; @@ -59,8 +51,7 @@ partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/pt(basic)" // for consistent naming - key { [ plus, asterisk ], - [ quotedbl, quotedbl ] }; + key { [ plus, asterisk, quotedbl, quotedbl ] }; key { [ asciitilde, asciicircum ] }; key { [ acute, grave ] }; }; diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se index 897f0dd..37d1fc8 100644 --- a/symbols/macintosh_vndr/se +++ b/symbols/macintosh_vndr/se @@ -10,38 +10,26 @@ xkb_symbols "basic" { key { [ section, degree ] }; - key { [ 1, exclam ], - [ copyright, exclamdown ] }; - key { [ 2, quotedbl ], - [ at, oneeighth ] }; - key { [ 3, numbersign ], - [ sterling, yen ] }; - key { [ 4, currency ], - [ dollar, cent ] }; + key { [ 1, exclam, copyright, exclamdown ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, yen ] }; + key { [ 4, currency, dollar, cent ] }; key { [ 6, ampersand ] }; - key { [ 7, slash ], - [ bar, backslash ] }; - key { [ 8, parenleft ], - [ bracketleft, braceleft ] }; - key { [ 9, parenright ], - [ bracketright, braceright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; key { [ comma, semicolon ] }; key { [ 0, equal ] }; key { [ period, colon ] }; key { [ minus, underscore ] }; - key { [ odiaeresis, Odiaeresis ], - [ oslash, Ooblique ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; key { [ plus, question ] }; - key { [ adiaeresis, Adiaeresis ], - [ ae, AE ] }; + 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 { [ diaeresis, asciicircum, asciitilde ] }; + key { [ apostrophe, asterisk, at ] }; + key { [ less, greater, bar, brokenbar ] }; include "keypad(comma)" };