diff options
| author | Benno Schulenberg <bensberg@justemail.net> | 2014-02-02 15:12:52 +0100 |
|---|---|---|
| committer | Sergey Udaltsov <sergey.udaltsov@gmail.com> | 2014-02-02 20:40:29 +0000 |
| commit | f0cf10e982b134fd6cdaab005f3708f74dbbac3b (patch) | |
| tree | 7cb3e8a8c0bce78f446942e91cd8c43804abfd4a /symbols/ca | |
| parent | 200373080d95643b7c433762a49167ef0a417765 (diff) | |
| download | xkeyboard-config-f0cf10e982b134fd6cdaab005f3708f74dbbac3b.tar.gz | |
symbols/??: Putting the name of the layout *after* the main include.
To avoid this name getting overridden by the name in the include, so
that 'xkbcomp -xkb' can report the actual name of the layout used.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'symbols/ca')
| -rw-r--r-- | symbols/ca | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -122,10 +122,10 @@ xkb_symbols "fr-dvorak" { partial xkb_symbols "fr-legacy" { - name[Group1] = "French (Canada, legacy)"; - include "ca(fr)" + name[Group1] = "French (Canada, legacy)"; + key <TLDE> { [ degree, degree, notsign ] }; key <AE01> { [ 1, exclam, onesuperior ] }; @@ -168,10 +168,10 @@ xkb_symbols "fr-legacy" { partial xkb_symbols "multi" { - name[Group1] = "Canadian Multilingual (first part)"; - include "ca(fr)" + name[Group1] = "Canadian Multilingual (first part)"; + key <TLDE> { [ slash, backslash, bar ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; @@ -259,7 +259,6 @@ xkb_symbols "multi-2gr" { key <AB08> { [ Greek_horizbar, multiply ] }; key <AB09> { [ periodcentered, division ] }; key <AB10> { [ NoSymbol, dead_abovedot ] }; - }; // based on @@ -466,8 +465,8 @@ xkb_symbols "olpc" { partial alphanumeric_keys xkb_symbols "eng" { - name[Group1] = "English (Canada)"; include "us(basic)" + name[Group1] = "English (Canada)"; }; // EXTRAS: |