diff options
author | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-25 11:35:19 +0200 |
---|---|---|
committer | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-25 11:47:42 +0200 |
commit | 43a420f0036e3d1a7d819a06313719ec8c130265 (patch) | |
tree | 2421b6541889df3f794455c0c2c114226338317e | |
parent | c729b5099e8832e1dd61e97bad37a20bba2617bc (diff) | |
download | xkeyboard-config-43a420f0036e3d1a7d819a06313719ec8c130265.tar.gz |
symbols/ca: condense whitespace, use Unnnn codes, improve alignment
Also reshuffle three keys into order, and drop an unneeded redefinition.
-rw-r--r-- | symbols/ca | 417 |
1 files changed, 208 insertions, 209 deletions
@@ -4,59 +4,59 @@ default partial xkb_symbols "fr" { name[Group1] = "French (Canada)"; - key <TLDE> { [ numbersign, bar, backslash ] }; - key <AE01> { [ 1, exclam, plusminus ] }; - key <AE02> { [ 2, quotedbl, at ] }; - key <AE03> { [ 3, slash, sterling ] }; - key <AE04> { [ 4, dollar, cent ] }; - key <AE05> { [ 5, percent, currency ] }; - key <AE06> { [ 6, question, notsign ] }; - key <AE07> { [ 7, ampersand, brokenbar ] }; - key <AE08> { [ 8, asterisk, twosuperior ] }; - key <AE09> { [ 9, parenleft, threesuperior ] }; - key <AE10> { [ 0, parenright, onequarter ] }; - key <AE11> { [ minus, underscore, onehalf ] }; - key <AE12> { [ equal, plus, threequarters ] }; - - key <AD01> { [ q, Q ] }; - key <AD02> { [ w, W ] }; - key <AD03> { [ e, E, EuroSign ] }; - key <AD04> { [ r, R ] }; - key <AD05> { [ t, T ] }; - key <AD06> { [ y, Y, yen ] }; - key <AD07> { [ u, U ] }; - key <AD08> { [ i, I ] }; - key <AD09> { [ o, O, section ] }; - key <AD10> { [ p, P, paragraph ] }; - key <AD11> { [dead_circumflex, dead_circumflex, bracketleft ] }; - key <AD12> { [ dead_cedilla, dead_diaeresis, bracketright ] }; - - key <AC01> { [ a, A ] }; - key <AC02> { [ s, S ] }; - key <AC03> { [ d, D ] }; - key <AC04> { [ f, F ] }; - key <AC05> { [ g, G ] }; - key <AC06> { [ h, H ] }; - key <AC07> { [ j, J ] }; - key <AC08> { [ k, K ] }; - key <AC09> { [ l, L ] }; - key <AC10> { [ semicolon, colon, asciitilde ] }; - key <AC11> { [dead_grave, dead_grave, braceleft ] }; - key <BKSL> { [ less, greater, braceright ] }; - - key <LSGT> { [guillemotleft, guillemotright, degree] }; - key <AB01> { [ z, Z ] }; - key <AB02> { [ x, X ] }; - key <AB03> { [ c, C ] }; - key <AB04> { [ v, V ] }; - key <AB05> { [ b, B ] }; - key <AB06> { [ n, N ] }; - key <AB07> { [ m, M, mu ] }; - key <AB08> { [ comma, apostrophe, macron ] }; - key <AB09> { [ period, period, hyphen ] }; - key <AB10> { [ eacute, Eacute, dead_acute ] }; - - key <SPCE> { [ space, space, nobreakspace ] }; + key <TLDE> {[ numbersign, bar, backslash ]}; + key <AE01> {[ 1, exclam, plusminus ]}; + key <AE02> {[ 2, quotedbl, at ]}; + key <AE03> {[ 3, slash, sterling ]}; + key <AE04> {[ 4, dollar, cent ]}; + key <AE05> {[ 5, percent, currency ]}; + key <AE06> {[ 6, question, notsign ]}; + key <AE07> {[ 7, ampersand, brokenbar ]}; + key <AE08> {[ 8, asterisk, twosuperior ]}; + key <AE09> {[ 9, parenleft, threesuperior ]}; + key <AE10> {[ 0, parenright, onequarter ]}; + key <AE11> {[ minus, underscore, onehalf ]}; + key <AE12> {[ equal, plus, threequarters ]}; + + key <AD01> {[ q, Q ]}; + key <AD02> {[ w, W ]}; + key <AD03> {[ e, E, EuroSign ]}; + key <AD04> {[ r, R ]}; + key <AD05> {[ t, T ]}; + key <AD06> {[ y, Y, yen ]}; + key <AD07> {[ u, U ]}; + key <AD08> {[ i, I ]}; + key <AD09> {[ o, O, section ]}; + key <AD10> {[ p, P, paragraph ]}; + key <AD11> {[dead_circumflex, dead_circumflex, bracketleft ]}; + key <AD12> {[ dead_cedilla, dead_diaeresis, bracketright ]}; + + key <AC01> {[ a, A ]}; + key <AC02> {[ s, S ]}; + key <AC03> {[ d, D ]}; + key <AC04> {[ f, F ]}; + key <AC05> {[ g, G ]}; + key <AC06> {[ h, H ]}; + key <AC07> {[ j, J ]}; + key <AC08> {[ k, K ]}; + key <AC09> {[ l, L ]}; + key <AC10> {[ semicolon, colon, asciitilde ]}; + key <AC11> {[dead_grave, dead_grave, braceleft ]}; + key <BKSL> {[ less, greater, braceright ]}; + + key <LSGT> {[guillemotleft, guillemotright, degree]}; + key <AB01> {[ z, Z ]}; + key <AB02> {[ x, X ]}; + key <AB03> {[ c, C ]}; + key <AB04> {[ v, V ]}; + key <AB05> {[ b, B ]}; + key <AB06> {[ n, N ]}; + key <AB07> {[ m, M, mu ]}; + key <AB08> {[ comma, apostrophe, macron ]}; + key <AB09> {[ period, period, hyphen ]}; + key <AB10> {[ eacute, Eacute, dead_acute ]}; + + key <SPCE> {[ space, space, nobreakspace ]}; include "level3(ralt_switch)" }; @@ -64,59 +64,59 @@ xkb_symbols "fr" { xkb_symbols "fr-dvorak" { name[Group1] = "French (Canada, Dvorak)"; - key <TLDE> { [ numbersign, bar, backslash ] }; - key <AE01> { [ 1, exclam, plusminus ] }; - key <AE02> { [ 2, quotedbl, at ] }; - key <AE03> { [ 3, slash, sterling ] }; - key <AE04> { [ 4, dollar, cent ] }; - key <AE05> { [ 5, percent, currency ] }; - key <AE06> { [ 6, question, notsign ] }; - key <AE07> { [ 7, ampersand, brokenbar ] }; - key <AE08> { [ 8, asterisk, twosuperior ] }; - key <AE09> { [ 9, parenleft, threesuperior ] }; - key <AE10> { [ 0, parenright, onequarter ] }; - key <AE11> { [dead_circumflex, dead_circumflex, bracketleft ] }; - key <AE12> { [ dead_cedilla, dead_diaeresis, bracketright ] }; - - key <AD01> { [dead_grave, dead_grave, braceleft ] }; - key <AD02> { [ comma, apostrophe, macron ] }; - key <AD03> { [ period, period, hyphen ] }; - key <AD04> { [ p, P, paragraph ] }; - key <AD05> { [ y, Y ] }; - key <AD06> { [ f, F ] }; - key <AD07> { [ g, G ] }; - key <AD08> { [ c, C ] }; - key <AD09> { [ r, R ] }; - key <AD10> { [ l, L ] }; - key <AD11> { [ eacute, Eacute, dead_acute ] }; - key <AD12> { [ equal, plus, threequarters ] }; - - key <AC01> { [ a, A ] }; - key <AC02> { [ o, O, section ] }; - key <AC03> { [ e, E ] }; - key <AC04> { [ u, U ] }; - key <AC05> { [ i, I ] }; - key <AC06> { [ d, D ] }; - key <AC07> { [ h, H ] }; - key <AC08> { [ t, T ] }; - key <AC09> { [ n, N ] }; - key <AC10> { [ s, S ] }; - key <AC11> { [ minus, underscore, onehalf ] }; - key <BKSL> { [ less, greater, braceright ] }; - - key <LSGT> { [guillemotleft, guillemotright, degree] }; - key <AB01> { [ semicolon, colon, asciitilde ] }; - key <AB02> { [ q, Q ] }; - key <AB03> { [ j, J ] }; - key <AB04> { [ k, K ] }; - key <AB05> { [ x, X ] }; - key <AB06> { [ b, B ] }; - key <AB07> { [ m, M, mu ] }; - key <AB08> { [ w, W ] }; - key <AB09> { [ v, V ] }; - key <AB10> { [ z, Z ] }; - - key <SPCE> { [ space, space, nobreakspace ] }; + key <TLDE> {[ numbersign, bar, backslash ]}; + key <AE01> {[ 1, exclam, plusminus ]}; + key <AE02> {[ 2, quotedbl, at ]}; + key <AE03> {[ 3, slash, sterling ]}; + key <AE04> {[ 4, dollar, cent ]}; + key <AE05> {[ 5, percent, currency ]}; + key <AE06> {[ 6, question, notsign ]}; + key <AE07> {[ 7, ampersand, brokenbar ]}; + key <AE08> {[ 8, asterisk, twosuperior ]}; + key <AE09> {[ 9, parenleft, threesuperior ]}; + key <AE10> {[ 0, parenright, onequarter ]}; + key <AE11> {[dead_circumflex, dead_circumflex, bracketleft ]}; + key <AE12> {[ dead_cedilla, dead_diaeresis, bracketright ]}; + + key <AD01> {[dead_grave, dead_grave, braceleft ]}; + key <AD02> {[ comma, apostrophe, macron ]}; + key <AD03> {[ period, period, hyphen ]}; + key <AD04> {[ p, P, paragraph ]}; + key <AD05> {[ y, Y ]}; + key <AD06> {[ f, F ]}; + key <AD07> {[ g, G ]}; + key <AD08> {[ c, C ]}; + key <AD09> {[ r, R ]}; + key <AD10> {[ l, L ]}; + key <AD11> {[ eacute, Eacute, dead_acute ]}; + key <AD12> {[ equal, plus, threequarters ]}; + + key <AC01> {[ a, A ]}; + key <AC02> {[ o, O, section ]}; + key <AC03> {[ e, E ]}; + key <AC04> {[ u, U ]}; + key <AC05> {[ i, I ]}; + key <AC06> {[ d, D ]}; + key <AC07> {[ h, H ]}; + key <AC08> {[ t, T ]}; + key <AC09> {[ n, N ]}; + key <AC10> {[ s, S ]}; + key <AC11> {[ minus, underscore, onehalf ]}; + key <BKSL> {[ less, greater, braceright ]}; + + key <LSGT> {[guillemotleft, guillemotright, degree]}; + key <AB01> {[ semicolon, colon, asciitilde ]}; + key <AB02> {[ q, Q ]}; + key <AB03> {[ j, J ]}; + key <AB04> {[ k, K ]}; + key <AB05> {[ x, X ]}; + key <AB06> {[ b, B ]}; + key <AB07> {[ m, M, mu ]}; + key <AB08> {[ w, W ]}; + key <AB09> {[ v, V ]}; + key <AB10> {[ z, Z ]}; + + key <SPCE> {[ space, space, nobreakspace ]}; include "level3(ralt_switch)" }; @@ -128,43 +128,43 @@ xkb_symbols "fr-legacy" { name[Group1] = "French (Canada, legacy)"; - key <TLDE> { [ degree, degree, notsign ] }; - key <AE01> { [ 1, exclam, onesuperior ] }; - - key <AE03> { [ 3, numbersign, threesuperior ] }; - key <AE04> { [ 4, dollar, onequarter ] }; - key <AE05> { [ 5, percent, onehalf ] }; - key <AE06> { [ 6, question, threequarters ] }; - key <AE07> { [ 7, ampersand, braceleft ] }; - key <AE08> { [ 8, asterisk, bracketleft ] }; - key <AE09> { [ 9, parenleft, bracketright, plusminus ] }; - key <AE10> { [ 0, parenright, braceright ] }; - key <AE11> { [ minus, underscore, bar, questiondown] }; - key <AE12> { [ equal, plus, dead_cedilla ] }; - - key <AD04> { [ r, R, paragraph, registered ] }; - key <AD06> { [ y, Y, yen ] }; - key <AD09> { [ o, O, oslash, Oslash ] }; - key <AD10> { [ p, P, thorn, THORN ] }; - key <AD11> { [dead_circumflex, dead_circumflex, degree ] }; - key <AD12> { [ ccedilla, Ccedilla, dead_tilde, dead_diaeresis ] }; - - key <AC01> { [ a, A, ae, AE ] }; - key <AC02> { [ s, S, ssharp, section ] }; - key <AC03> { [ d, D, eth, ETH ] }; - key <AC04> { [ f, F, ordfeminine ] }; - key <AC10> { [ semicolon, colon, dead_acute, dead_acute ] }; - key <AC11> { [ egrave, Egrave ] }; - key <BKSL> { [ agrave, Agrave, dead_grave ] }; - - key <LSGT> { [ ugrave, Ugrave, backslash, bar ] }; - key <AB01> { [ z, Z, guillemotleft ] }; - key <AB02> { [ x, X, guillemotright ] }; - key <AB03> { [ c, C, cent, copyright ] }; - key <AB07> { [ m, M, mu, masculine ] }; - key <AB08> { [ comma, apostrophe, less ] }; - key <AB09> { [ period, period, greater ] }; - key <AB10> { [ eacute, Eacute, slash ] }; + key <TLDE> {[ degree, degree, notsign ]}; + key <AE01> {[ 1, exclam, onesuperior ]}; + + key <AE03> {[ 3, numbersign, threesuperior ]}; + key <AE04> {[ 4, dollar, onequarter ]}; + key <AE05> {[ 5, percent, onehalf ]}; + key <AE06> {[ 6, question, threequarters ]}; + key <AE07> {[ 7, ampersand, braceleft ]}; + key <AE08> {[ 8, asterisk, bracketleft ]}; + key <AE09> {[ 9, parenleft, bracketright, plusminus ]}; + key <AE10> {[ 0, parenright, braceright ]}; + key <AE11> {[ minus, underscore, bar, questiondown]}; + key <AE12> {[ equal, plus, dead_cedilla ]}; + + key <AD04> {[ r, R, paragraph, registered ]}; + key <AD06> {[ y, Y, yen ]}; + key <AD09> {[ o, O, oslash, Oslash ]}; + key <AD10> {[ p, P, thorn, THORN ]}; + key <AD11> {[dead_circumflex, dead_circumflex, degree ]}; + key <AD12> {[ ccedilla, Ccedilla, dead_tilde, dead_diaeresis ]}; + + key <AC01> {[ a, A, ae, AE ]}; + key <AC02> {[ s, S, ssharp, section ]}; + key <AC03> {[ d, D, eth, ETH ]}; + key <AC04> {[ f, F, ordfeminine ]}; + key <AC10> {[ semicolon, colon, dead_acute, dead_acute ]}; + key <AC11> {[ egrave, Egrave ]}; + key <BKSL> {[ agrave, Agrave, dead_grave ]}; + + key <LSGT> {[ ugrave, Ugrave, backslash, bar ]}; + key <AB01> {[ z, Z, guillemotleft ]}; + key <AB02> {[ x, X, guillemotright]}; + key <AB03> {[ c, C, cent, copyright ]}; + key <AB07> {[ m, M, mu, masculine ]}; + key <AB08> {[ comma, apostrophe, less ]}; + key <AB09> {[ period, period, greater ]}; + key <AB10> {[ eacute, Eacute, slash ]}; }; // Inuktitut keyboard layout, by Pablo Saratxaga <pablo@mandrakesoft.com>. @@ -173,58 +173,57 @@ xkb_symbols "ike" { name[Group1]= "Inuktitut"; - key <AE01> { [ 0x01001595, 1 ] }; - key <AE02> { [ 0x01001449, 2 ] }; - key <AE03> { [ 0x01001550, 3 ] }; - key <AE04> { [ 0x01001483, 4 ] }; - key <AE05> { [ 0x01001466, 5 ] }; - key <AE06> { [ 0x01001585, 6 ] }; - key <AE07> { [ 0x010014bb, 7 ] }; - key <AE08> { [ 0x010014d0, 8 ] }; - key <AE09> { [ 0x010014ea, 9 ] }; - key <AE10> { [ 0x0100153e, 0 ] }; - key <AE11> { [ minus, underscore ] }; - key <AE12> { [ 0x0100155d, equal ] }; - - key <AD01> { [ 0x0100158f, 0x0100148b ] }; - key <AD02> { [ 0x01001403, 0x01001431 ] }; - key <AD03> { [ 0x0100157f, 0x01001546 ] }; - key <AD04> { [ 0x0100146d, 0x01001596 ] }; - key <AD05> { [ 0x0100144e, 0x01001671 ] }; - key <AD06> { [ 0x010014ef, 0x01001673 ] }; - key <AD07> { [ 0x010014a5, 0x01001675 ] }; - key <AD08> { [ 0x010014c2, 0x010015a4 ] }; - key <AD09> { [ 0x010014d5, 0x010015a0 ] }; - key <AD10> { [ 0x01001528, 0x010015a6 ] }; - key <AD11> { [ 0x010014a1, 0x01001505 ] }; - key <AD12> { [ dead_abovedot, 0x0100141e] }; - - key <AC01> { [ 0x01001591, 0x0100148d ] }; - key <AC02> { [ 0x01001405, 0x01001433 ] }; - key <AC03> { [ 0x01001581, 0x01001548 ] }; - key <AC04> { [ 0x0100146f, 0x01001555 ] }; - key <AC05> { [ 0x01001450, parenleft ] }; - key <AC06> { [ 0x010014f1, parenright ] }; - key <AC07> { [ 0x010014a7, 0x0100152a ] }; - key <AC08> { [ 0x010014c4, 0x01001557 ] }; - key <AC09> { [ 0x010014d7, 0x010015a2 ] }; - key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ apostrophe, quotedbl ] }; - - key <AB01> { [ 0x01001593, 0x01001490 ] }; - key <AB02> { [ 0x0100140a, 0x01001438 ] }; - key <AB03> { [ 0x01001583, 0x0100154b ] }; - key <AB04> { [ 0x01001472, question ] }; - key <AB05> { [ 0x01001455, 0x0100157c ] }; - key <AB06> { [ 0x010014f4, 0x010014c7 ] }; - key <AB07> { [ 0x010014aa, 0x010014da ] }; - key <AB08> { [ comma, less ] }; - key <AB09> { [ period, greater ] }; - key <AB10> { [ 0x0100152d, 0x01001559 ] }; - - key <TLDE> { [ 0x0100157b, 0x01001575 ] }; - key <LSGT> { [ 0x01001579, 0x01001577 ] }; - key <BKSL> { [ backslash, bar ] }; + key <TLDE> {[ U157b, U1575 ]}; + key <AE01> {[ U1595, 1 ]}; + key <AE02> {[ U1449, 2 ]}; + key <AE03> {[ U1550, 3 ]}; + key <AE04> {[ U1483, 4 ]}; + key <AE05> {[ U1466, 5 ]}; + key <AE06> {[ U1585, 6 ]}; + key <AE07> {[ U14bb, 7 ]}; + key <AE08> {[ U14d0, 8 ]}; + key <AE09> {[ U14ea, 9 ]}; + key <AE10> {[ U153e, 0 ]}; + key <AE11> {[ minus, underscore]}; + key <AE12> {[ U155d, equal ]}; + + key <AD01> {[ U158f, U148b ]}; + key <AD02> {[ U1403, U1431 ]}; + key <AD03> {[ U157f, U1546 ]}; + key <AD04> {[ U146d, U1596 ]}; + key <AD05> {[ U144e, U1671 ]}; + key <AD06> {[ U14ef, U1673 ]}; + key <AD07> {[ U14a5, U1675 ]}; + key <AD08> {[ U14c2, U15a4 ]}; + key <AD09> {[ U14d5, U15a0 ]}; + key <AD10> {[ U1528, U15a6 ]}; + key <AD11> {[ U14a1, U1505 ]}; + key <AD12> {[dead_abovedot,U141e]}; + + key <AC01> {[ U1591, U148d ]}; + key <AC02> {[ U1405, U1433 ]}; + key <AC03> {[ U1581, U1548 ]}; + key <AC04> {[ U146f, U1555 ]}; + key <AC05> {[ U1450, parenleft]}; + key <AC06> {[ U14f1, parenright]}; + key <AC07> {[ U14a7, U152a ]}; + key <AC08> {[ U14c4, U1557 ]}; + key <AC09> {[ U14d7, U15a2 ]}; + key <AC10> {[ semicolon, colon ]}; + key <AC11> {[apostrophe,quotedbl]}; + key <BKSL> {[ backslash, bar ]}; + + key <LSGT> {[ U1579, U1577 ]}; + key <AB01> {[ U1593, U1490 ]}; + key <AB02> {[ U140a, U1438 ]}; + key <AB03> {[ U1583, U154b ]}; + key <AB04> {[ U1472, question ]}; + key <AB05> {[ U1455, U157c ]}; + key <AB06> {[ U14f4, U14c7 ]}; + key <AB07> {[ U14aa, U14da ]}; + key <AB08> {[ comma, less ]}; + key <AB09> {[ period, greater ]}; + key <AB10> {[ U152d, U1559 ]}; }; partial @@ -309,14 +308,12 @@ xkb_symbols "olpc" { include "ca(fr)" - key <AE02> { [ 2, quotedbl, ograve, Ograve ] }; - key <AE03> { [ 3, slash, at, VoidSymbol ] }; + key <AE02> {[ 2, quotedbl, ograve, Ograve ]}; + key <AE03> {[ 3, slash, at, none ]}; - key <AD03> { [ e, E, EuroSign, VoidSymbol] }; + key <AD03> {[ e, E, EuroSign, none ]}; - key <AB09> { [ period, period, 0x1002010 ] }; - - key <I219> { [ guillemotleft, guillemotright, degree, VoidSymbol ] }; + key <I219> {[ guillemotleft, guillemotright, degree, none ]}; }; partial alphanumeric_keys @@ -324,15 +321,17 @@ xkb_symbols "eng" { include "us(basic)" name[Group1] = "English (Canada)"; - key <LSGT> { [ backslash, bar, VoidSymbol, VoidSymbol ] }; + key <LSGT> {[ backslash, bar, none, none ]}; }; + // EXTRAS: partial alphanumeric_keys xkb_symbols "kut" { - // Ejective U0313 and acute accents are taken from shs layout. + // Ejective U+0313 and acute accents are taken from shs layout. + include "ca(shs)" name[Group1]= "Kutenai"; @@ -360,12 +359,12 @@ xkb_symbols "shs" { // for ejectives on q, l, t, s, m, g, k, p, w, y, r. // The Compose key is used for the other acutes and grave. - key <AB08> { [ comma, less, U0313 ] }; - key <AC01> { [ a, A, aacute, Aacute ] }; - key <AD03> { [ e, E, eacute, Eacute ] }; - key <AD07> { [ u, U, uacute, Uacute ] }; - key <AD08> { [ i, I, iacute, Iacute ] }; - key <AD09> { [ o, O, oacute, Oacute ] }; + key <AB08> {[ comma, less, U0313 ]}; + key <AC01> {[ a, A, aacute, Aacute ]}; + key <AD03> {[ e, E, eacute, Eacute ]}; + key <AD07> {[ u, U, uacute, Uacute ]}; + key <AD08> {[ i, I, iacute, Iacute ]}; + key <AD09> {[ o, O, oacute, Oacute ]}; include "level3(ralt_switch)" include "compose(rctrl)" |