aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/symbols/de1
-rw-r--r--xorg-server/xkeyboard-config/symbols/latam61
-rw-r--r--xorg-server/xkeyboard-config/symbols/typo107
4 files changed, 127 insertions, 48 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 803de50ac..a75f02942 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3833,6 +3833,12 @@
<_description>Spanish (Latin American, Sun dead keys)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>dvorak</name>
+ <_description>Spanish (Latin American, Dvorak)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index fa3c7ec97..1687bc810 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -43,6 +43,7 @@ xkb_symbols "basic" {
key <AB08> { [ comma, semicolon, periodcentered, multiply ] };
key <AB09> { [ period, colon, U2026, division ] };
key <AB10> { [ minus, underscore, endash, emdash ] };
+ key <LSGT> { [ less, greater, bar, NoSymbol ] };
include "kpdl(comma)"
diff --git a/xorg-server/xkeyboard-config/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam
index 47c8976e7..f6717a415 100644
--- a/xorg-server/xkeyboard-config/symbols/latam
+++ b/xorg-server/xkeyboard-config/symbols/latam
@@ -66,3 +66,64 @@ xkb_symbols "deadtilde" {
key <AD12> { [ plus, asterisk, dead_tilde, dead_macron ] };
};
+
+// Latin American Spanish Dvorak mapping (note R-H exchange)
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+ name[Group1]="Spanish (Latin American, Dvorak)";
+
+ key <TLDE> {[ bar, degree, notsign, notsign ]};
+ key <AE01> {[ 1, exclam, bar, exclamdown ]};
+ key <AE02> {[ 2, quotedbl, at, oneeighth ]};
+ key <AE03> {[ 3, numbersign, periodcentered, sterling ]};
+ key <AE04> {[ 4, dollar, asciitilde, dollar ]};
+ key <AE05> {[ 5, percent, onehalf, threeeighths ]};
+ key <AE06> {[ 6, ampersand, notsign, fiveeighths ]};
+ key <AE07> {[ 7, slash, braceleft, seveneighths ]};
+ key <AE08> {[ 8, parenleft, bracketleft, trademark ]};
+ key <AE09> {[ 9, parenright, bracketright, plusminus ]};
+ key <AE10> {[ 0, equal, braceright, degree ]};
+ key <AE11> {[ apostrophe, question, backslash, questiondown ]};
+ key <AE12> {[ questiondown, exclamdown, dead_cedilla, dead_ogonek ]};
+
+ key <AD01> {[ period, colon, at ]};
+ key <AD02> {[ comma, semicolon ]};
+ key <AD03> {[ ntilde, Ntilde, lstroke, Lstroke ]};
+ key <AD04> {[ p, P, paragraph ]};
+ key <AD05> {[ y, Y, yen ]};
+ key <AD06> {[ f, F, tslash, Tslash ]};
+ key <AD07> {[ g, G, dstroke, Dstroke ]};
+ key <AD08> {[ c, C, cent, copyright ]};
+ key <AD09> {[ h, H, hstroke, Hstroke ]};
+ key <AD10> {[ l, L, sterling ]};
+ key <AD11> {[ dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]};
+ key <AD12> {[ plus, asterisk, asciitilde, dead_macron ]};
+
+ key <AC01> {[ a, A, ae, AE ]};
+ key <AC02> {[ o, O, oslash, Oslash ]};
+ key <AC03> {[ e, E, EuroSign ]};
+ key <AC04> {[ u, U, aring, Aring ]};
+ key <AC05> {[ i, I, oe, OE ]};
+ key <AC06> {[ d, D, eth, ETH ]};
+ key <AC07> {[ r, R, registered, trademark ]};
+ key <AC08> {[ t, T, thorn, THORN ]};
+ key <AC09> {[ n, N, eng, ENG ]};
+ key <AC10> {[ s, S, ssharp, section ]};
+ key <AC11> {[ braceleft, bracketleft, dead_circumflex, braceleft ]};
+ key <BKSL> {[ braceright, bracketright, dead_grave, braceright ]};
+
+ key <LSGT> {[ less, greater, guillemotleft, guillemotright ]};
+ key <AB01> {[ minus, underscore, hyphen, macron ]};
+ key <AB02> {[ q, Q, currency ]};
+ key <AB03> {[ j, J ]};
+ key <AB04> {[ k, K, kra ]};
+ key <AB05> {[ x, X, multiply, division ]};
+ key <AB06> {[ b, B ]};
+ key <AB07> {[ m, M, mu ]};
+ key <AB08> {[ w, W ]};
+ key <AB09> {[ v, V ]};
+ key <AB10> {[ z, Z ]};
+
+ include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index 3b555f8c3..cce79f7ef 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -1,56 +1,67 @@
-// typographic keyboard
+// Typographic Keyboard
// Sergei Stolyarov <sergei@regolit.com>
-//
+
// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
// Additional contribution and code cleanup by Artur Dryomov <artur.dryomov@gmail.com>
-//
-// Mainly based on the layout proposed by Ilya Birman,
+
+// Mainly based on the layout proposed by Ilya Birman
// http://ilyabirman.ru/projects/typography-layout/
-// default layout
default partial
xkb_symbols "base" {
-// 1st keyboard row
- key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
- key <AE01> { [NoSymbol, NoSymbol, onesuperior, exclamdown] }; // "1"
- key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] }; // "2"
- key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] }; // "3"
- key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] }; // "4"
- key <AE05> { [NoSymbol, NoSymbol, permille] }; // "5"
- key <AE06> { [NoSymbol, NoSymbol, uparrow] }; // "6"
- key <AE07> { [NoSymbol, NoSymbol, ampersand, questiondown] }; // "7"
- key <AE08> { [NoSymbol, NoSymbol, infinity, oneeighth] }; // "8"
- key <AE09> { [NoSymbol, NoSymbol, leftarrow] }; // "9"
- key <AE10> { [NoSymbol, NoSymbol, rightarrow] }; // "0"
- key <AE11> { [NoSymbol, NoSymbol, emdash, endash] }; // "-"
- key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] }; // "="
-
-// 2nd keyboard row
- key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
- key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
- key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
- key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
- key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
- key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
- key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
-
-// 3rd keyboard row
- key <AC01> { [NoSymbol, NoSymbol, U0301] }; // "a"
- key <AC02> { [NoSymbol, NoSymbol, section] }; // "s"
- key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
- key <AC04> { [NoSymbol, NoSymbol, sterling] }; // "f"
- key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
- key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
- key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
- key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
- key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
-
-// 4th keyboard row
- key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
- key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
- key <AB04> { [NoSymbol, NoSymbol, downarrow, U25CA] }; // "v"
- key <AB07> { [NoSymbol, NoSymbol, U2212, enfilledcircbullet] }; // "m"
- key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
- key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
- key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+
+ // 1st keyboard row
+ key <TLDE> { [ NoSymbol, NoSymbol, NoSymbol, approxeq ] }; // "~"
+ key <AE01> { [ NoSymbol, NoSymbol, onesuperior, exclamdown ] }; // "1"
+ key <AE02> { [ NoSymbol, NoSymbol, twosuperior, onehalf ] }; // "2"
+ key <AE03> { [ NoSymbol, NoSymbol, threesuperior, onethird ] }; // "3"
+ key <AE04> { [ NoSymbol, NoSymbol, dollar, onequarter ] }; // "4"
+ key <AE05> { [ NoSymbol, NoSymbol, U2030, NoSymbol ] }; // "5"
+ key <AE06> { [ NoSymbol, NoSymbol, uparrow, NoSymbol ] }; // "6"
+ key <AE07> { [ NoSymbol, NoSymbol, ampersand, questiondown ] }; // "7"
+ key <AE08> { [ NoSymbol, NoSymbol, infinity, oneeighth ] }; // "8"
+ key <AE09> { [ NoSymbol, NoSymbol, leftarrow, NoSymbol ] }; // "9"
+ key <AE10> { [ NoSymbol, NoSymbol, rightarrow, NoSymbol ] }; // "0"
+ key <AE11> { [ NoSymbol, NoSymbol, emdash, endash ] }; // "-"
+ key <AE12> { [ NoSymbol, NoSymbol, notequal, plusminus ] }; // "="
+
+ // 2nd keyboard row
+ key <AD03> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // "e"
+ key <AD04> { [ NoSymbol, NoSymbol, registered, NoSymbol ] }; // "r"
+ key <AD05> { [ NoSymbol, NoSymbol, trademark, NoSymbol ] }; // "t"
+ key <AD06> { [ NoSymbol, NoSymbol, yen, NoSymbol ] }; // "y"
+ key <AD10> { [ NoSymbol, NoSymbol, acute, doubleacute ] }; // "p"
+ key <AD11> { [ NoSymbol, NoSymbol, bracketleft, braceleft ] }; // "["
+ key <AD12> { [ NoSymbol, NoSymbol, bracketright, braceright ] }; // "]"
+
+ // 3rd keyboard row
+ key <AC01> { [ NoSymbol, NoSymbol, U0301, NoSymbol ] }; // "a"
+ key <AC02> { [ NoSymbol, NoSymbol, section, NoSymbol ] }; // "s"
+ key <AC03> { [ NoSymbol, NoSymbol, degree, division ] }; // "d"
+ key <AC04> { [ NoSymbol, NoSymbol, sterling, NoSymbol ] }; // "f"
+ key <AC07> { [ NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark ] }; // "j"
+ key <AC08> { [ NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark ] }; // "k"
+ key <AC09> { [ NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark ] }; // "l"
+ key <AC10> { [ NoSymbol, NoSymbol, leftsinglequotemark, minutes ] }; // ";"
+ key <AC11> { [ NoSymbol, NoSymbol, rightsinglequotemark, seconds ] }; // "'"
+
+ // 4th keyboard row
+ key <AB02> { [ NoSymbol, NoSymbol, multiply, U22C5 ] }; // "x"
+ key <AB03> { [ NoSymbol, NoSymbol, copyright, cent ] }; // "c"
+ key <AB04> { [ NoSymbol, NoSymbol, downarrow, U25CA ] }; // "v"
+ key <AB07> { [ NoSymbol, NoSymbol, U2212, enfilledcircbullet ] }; // "m"
+ key <AB08> { [ NoSymbol, NoSymbol, guillemotleft, less ] }; // ","
+ key <AB09> { [ NoSymbol, NoSymbol, guillemotright, greater ] }; // "."
+ key <AB10> { [ NoSymbol, NoSymbol, ellipsis, NoSymbol ] }; // "/"
+
+ // 5th keyboard row
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; // " "
+
+ // Reference
+ // U+2030 PER MILLE SIGN
+ // U+0301 COMBINING ACUTE ACCENT
+ // U+22C5 DOT OPERATOR
+ // U+25CA LOZENGE
+ // U+2212 MINUS SIGN
+
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:39:57 +0000