From 7d9b2c75c88700c8c1af74c3dff095d528839049 Mon Sep 17 00:00:00 2001 From: David Paleino Date: Sun, 3 Dec 2017 12:57:50 +0100 Subject: [PATCH] Added it(intl), it(scn) and us(scn) --- rules/base.extras.xml.in | 11 ++++++++++ rules/base.xml.in | 26 ++++++++++++++++++++++++ symbols/it | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ symbols/us | 18 +++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in index e3af738..894d476 100644 --- a/rules/base.extras.xml.in +++ b/rules/base.extras.xml.in @@ -435,6 +435,17 @@ <_description>English (Carpalx, full optimization, intl., with AltGr dead keys) + + + scn + <_description>Sicilian (US keyboard) + + eng + ita + scn + + + diff --git a/rules/base.xml.in b/rules/base.xml.in index 5e67937..8a4ada0 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -3777,6 +3777,32 @@ <_description>Italian (IBM 142) + + + intl + <_description>Italian (intl., with dead keys) + + ger + fra + ita + slo + srd + nap + scn + fur + + + + + + scn + <_description>Sicilian + + ita + scn + + + diff --git a/symbols/it b/symbols/it index 11ee0aa..680093c 100644 --- a/symbols/it +++ b/symbols/it @@ -1,5 +1,7 @@ // based on a keyboard map from an 'xkb/symbols/it' file // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it) +// 03 December 2017 - Added it(intl) and it(scn), please refer to +// Cadèmia Siciliana default partial alphanumeric_keys xkb_symbols "basic" { @@ -367,3 +369,53 @@ partial alphanumeric_keys key { [ c, C, cacute, Cacute ] }; }; + +partial alphanumeric_keys + xkb_symbols "intl" { + include "it(basic)" + name[Group1] = "Italian (intl., with dead keys)"; + + key { [ iacute, asciicircum, asciitilde, dead_circumflex ] }; + + key { [ e, E, EuroSign, U0259 ] }; + + key { [ agrave, degree, numbersign, U1D58 ] }; + key { [ h, H, U1E25, U1E24 ] }; + key { [ f, F, U0111, U0110 ] }; + key { [ d, D, U1E0D, U1E0C ] }; + + key { [ x, X, U03C7, U03A7 ] }; + key { [ z, Z ] }; + + key { [ uacute, section, dead_grave, dead_breve ] }; +}; + +partial alphanumeric_keys + xkb_symbols "scn" { + include "it(basic)" + name[Group1] = "Sicilian"; + + key { [ iacute, asciicircum, asciitilde, dead_circumflex ] }; + + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ i, I, icircumflex, Icircumflex ] }; + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { [ r, R, ediaeresis, Ediaeresis ] }; + key { [ e, E, EuroSign, ecircumflex ] }; + + key { [ agrave, degree, numbersign, U1D58 ] }; + key { [ f, F, U0111, U0110 ] }; + key { [ d, D, U1E0D, U1E0C ] }; + key { [ s, S, scaron, Scaron ] }; + key { [ a, A, acircumflex, Acircumflex ] }; + + // In our Windows layout, there is no ©, but Ç. Since this character + // is available via CapsLock, I decided to keep © in place, as the + // Italian layout. + key { [ c, C, ccedilla, copyright ] }; + key { [ x, X, U03C7, U03A7 ] }; + + // Replaced dead_grave by ugrave, since it's common to write mixed + // Sicilian - Italian (where we replaced ugrave with uacute) + key { [ uacute, section, ugrave, dead_breve ] }; +}; diff --git a/symbols/us b/symbols/us index f488a8e..d0bf606 100644 --- a/symbols/us +++ b/symbols/us @@ -1642,6 +1642,24 @@ xkb_symbols "cz_sk_de" { include "level3(ralt_switch)" }; +// 03 December 2017 - Added us(scn), please refer to +// Cadèmia Siciliana +partial alphanumeric_keys +xkb_symbols "scn" { + + include "us(intl)" + name[Group1]="Sicilian (US keyboard)"; + + key { [ e, E, U0259, U018F ] }; + key { [ d, D, U1E0D, U1E0C ] }; + key { [ f, F, U0111, U0110 ] }; + key { [ h, H, U1E25, U1E24 ] }; + key { [ x, X, U03C7, U03A7 ] }; + key { [ period, greater, U1D58, dead_caron ] }; + + include "level3(ralt_switch)" +}; + // XCompose is out! Unicode combining is in! For those of us who live // on the edge: A keymap using Unicode combining characters instead of // deadkeys. This variation does not deviate from the lame MS-style -- 2.15.0