From 4ba9be2882d9f1567809edb0a31fcdf11320d41f Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 20 Apr 2015 21:25:25 +0200 Subject: randrproto xkeyboard-config fontconfig libX11 libXdmcp libXmu pixman xkbcomp xserver mesa git update 20 Apr 2015 xserver commit b1029716e41e252f149b82124a149da180607c96 xkeyboard-config commit 7d00bcc2d9c3944bbdfcbe472ee3299729dc7687 libX11 commit 748d47e69f5c12d8557d56a8a8ec166588da7b93 libXdmcp commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6 xkbcomp commit 1ae525b3d236b59e6437b2b5433d460e18370973 pixman commit 58e21d3e45c5227c2ca9ac00cf044f22a7975180 randrproto commit 98da0d6e48b7d124d6788ea568e9f9e3dc204322 libXmu commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62 fontconfig commit 07be485a0a84995ce69bf60e3b1bb22cb35f6b0e mesa commit c1485f4b7d044724b3dbc1011f3c3a8a53132010 --- xorg-server/xkeyboard-config/symbols/de | 1 + xorg-server/xkeyboard-config/symbols/latam | 61 ++++++++++++++++ xorg-server/xkeyboard-config/symbols/typo | 107 ++++++++++++++++------------- 3 files changed, 121 insertions(+), 48 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') 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 { [ comma, semicolon, periodcentered, multiply ] }; key { [ period, colon, U2026, division ] }; key { [ minus, underscore, endash, emdash ] }; + key { [ 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 { [ 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 {[ bar, degree, notsign, notsign ]}; + key {[ 1, exclam, bar, exclamdown ]}; + key {[ 2, quotedbl, at, oneeighth ]}; + key {[ 3, numbersign, periodcentered, sterling ]}; + key {[ 4, dollar, asciitilde, dollar ]}; + key {[ 5, percent, onehalf, threeeighths ]}; + key {[ 6, ampersand, notsign, fiveeighths ]}; + key {[ 7, slash, braceleft, seveneighths ]}; + key {[ 8, parenleft, bracketleft, trademark ]}; + key {[ 9, parenright, bracketright, plusminus ]}; + key {[ 0, equal, braceright, degree ]}; + key {[ apostrophe, question, backslash, questiondown ]}; + key {[ questiondown, exclamdown, dead_cedilla, dead_ogonek ]}; + + key {[ period, colon, at ]}; + key {[ comma, semicolon ]}; + key {[ ntilde, Ntilde, lstroke, Lstroke ]}; + key {[ p, P, paragraph ]}; + key {[ y, Y, yen ]}; + key {[ f, F, tslash, Tslash ]}; + key {[ g, G, dstroke, Dstroke ]}; + key {[ c, C, cent, copyright ]}; + key {[ h, H, hstroke, Hstroke ]}; + key {[ l, L, sterling ]}; + key {[ dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]}; + key {[ plus, asterisk, asciitilde, dead_macron ]}; + + key {[ a, A, ae, AE ]}; + key {[ o, O, oslash, Oslash ]}; + key {[ e, E, EuroSign ]}; + key {[ u, U, aring, Aring ]}; + key {[ i, I, oe, OE ]}; + key {[ d, D, eth, ETH ]}; + key {[ r, R, registered, trademark ]}; + key {[ t, T, thorn, THORN ]}; + key {[ n, N, eng, ENG ]}; + key {[ s, S, ssharp, section ]}; + key {[ braceleft, bracketleft, dead_circumflex, braceleft ]}; + key {[ braceright, bracketright, dead_grave, braceright ]}; + + key {[ less, greater, guillemotleft, guillemotright ]}; + key {[ minus, underscore, hyphen, macron ]}; + key {[ q, Q, currency ]}; + key {[ j, J ]}; + key {[ k, K, kra ]}; + key {[ x, X, multiply, division ]}; + key {[ b, B ]}; + key {[ m, M, mu ]}; + key {[ w, W ]}; + key {[ v, V ]}; + key {[ 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 -// + // Initial contribution by Alexey Ten // Additional contribution and code cleanup by Artur Dryomov -// -// 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 { [NoSymbol, NoSymbol, NoSymbol, approxeq] }; - key { [NoSymbol, NoSymbol, onesuperior, exclamdown] }; // "1" - key { [NoSymbol, NoSymbol, twosuperior, onehalf] }; // "2" - key { [NoSymbol, NoSymbol, threesuperior, onethird] }; // "3" - key { [NoSymbol, NoSymbol, dollar, onequarter] }; // "4" - key { [NoSymbol, NoSymbol, permille] }; // "5" - key { [NoSymbol, NoSymbol, uparrow] }; // "6" - key { [NoSymbol, NoSymbol, ampersand, questiondown] }; // "7" - key { [NoSymbol, NoSymbol, infinity, oneeighth] }; // "8" - key { [NoSymbol, NoSymbol, leftarrow] }; // "9" - key { [NoSymbol, NoSymbol, rightarrow] }; // "0" - key { [NoSymbol, NoSymbol, emdash, endash] }; // "-" - key { [NoSymbol, NoSymbol, notequal, plusminus] }; // "=" - -// 2nd keyboard row - key { [NoSymbol, NoSymbol, EuroSign] }; // "e" - key { [NoSymbol, NoSymbol, registered] }; // "r" - key { [NoSymbol, NoSymbol, trademark] }; // "t" - key { [NoSymbol, NoSymbol, yen] }; // "y" - key { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" - key { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [ - key { [NoSymbol, NoSymbol, bracketright, braceright] }; // ] - -// 3rd keyboard row - key { [NoSymbol, NoSymbol, U0301] }; // "a" - key { [NoSymbol, NoSymbol, section] }; // "s" - key { [NoSymbol, NoSymbol, degree, division] }; // "d" - key { [NoSymbol, NoSymbol, sterling] }; // "f" - key { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j" - key { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k" - key { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l" - key { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";" - key { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'" - -// 4th keyboard row - key { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x" - key { [NoSymbol, NoSymbol, copyright, cent] }; // "c" - key { [NoSymbol, NoSymbol, downarrow, U25CA] }; // "v" - key { [NoSymbol, NoSymbol, U2212, enfilledcircbullet] }; // "m" - key { [NoSymbol, NoSymbol, guillemotleft, less] }; // "," - key { [NoSymbol, NoSymbol, guillemotright, greater] }; // "." - key { [NoSymbol, NoSymbol, ellipsis] }; // "/" + + // 1st keyboard row + key { [ NoSymbol, NoSymbol, NoSymbol, approxeq ] }; // "~" + key { [ NoSymbol, NoSymbol, onesuperior, exclamdown ] }; // "1" + key { [ NoSymbol, NoSymbol, twosuperior, onehalf ] }; // "2" + key { [ NoSymbol, NoSymbol, threesuperior, onethird ] }; // "3" + key { [ NoSymbol, NoSymbol, dollar, onequarter ] }; // "4" + key { [ NoSymbol, NoSymbol, U2030, NoSymbol ] }; // "5" + key { [ NoSymbol, NoSymbol, uparrow, NoSymbol ] }; // "6" + key { [ NoSymbol, NoSymbol, ampersand, questiondown ] }; // "7" + key { [ NoSymbol, NoSymbol, infinity, oneeighth ] }; // "8" + key { [ NoSymbol, NoSymbol, leftarrow, NoSymbol ] }; // "9" + key { [ NoSymbol, NoSymbol, rightarrow, NoSymbol ] }; // "0" + key { [ NoSymbol, NoSymbol, emdash, endash ] }; // "-" + key { [ NoSymbol, NoSymbol, notequal, plusminus ] }; // "=" + + // 2nd keyboard row + key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // "e" + key { [ NoSymbol, NoSymbol, registered, NoSymbol ] }; // "r" + key { [ NoSymbol, NoSymbol, trademark, NoSymbol ] }; // "t" + key { [ NoSymbol, NoSymbol, yen, NoSymbol ] }; // "y" + key { [ NoSymbol, NoSymbol, acute, doubleacute ] }; // "p" + key { [ NoSymbol, NoSymbol, bracketleft, braceleft ] }; // "[" + key { [ NoSymbol, NoSymbol, bracketright, braceright ] }; // "]" + + // 3rd keyboard row + key { [ NoSymbol, NoSymbol, U0301, NoSymbol ] }; // "a" + key { [ NoSymbol, NoSymbol, section, NoSymbol ] }; // "s" + key { [ NoSymbol, NoSymbol, degree, division ] }; // "d" + key { [ NoSymbol, NoSymbol, sterling, NoSymbol ] }; // "f" + key { [ NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark ] }; // "j" + key { [ NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark ] }; // "k" + key { [ NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark ] }; // "l" + key { [ NoSymbol, NoSymbol, leftsinglequotemark, minutes ] }; // ";" + key { [ NoSymbol, NoSymbol, rightsinglequotemark, seconds ] }; // "'" + + // 4th keyboard row + key { [ NoSymbol, NoSymbol, multiply, U22C5 ] }; // "x" + key { [ NoSymbol, NoSymbol, copyright, cent ] }; // "c" + key { [ NoSymbol, NoSymbol, downarrow, U25CA ] }; // "v" + key { [ NoSymbol, NoSymbol, U2212, enfilledcircbullet ] }; // "m" + key { [ NoSymbol, NoSymbol, guillemotleft, less ] }; // "," + key { [ NoSymbol, NoSymbol, guillemotright, greater ] }; // "." + key { [ NoSymbol, NoSymbol, ellipsis, NoSymbol ] }; // "/" + + // 5th keyboard row + key { [ 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 + }; -- cgit v1.2.3