From 2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 15 Jan 2013 08:09:32 +0100 Subject: mesa fontconfig xkeyboard-config git update 15 jan 2013 mesa: 1c9833ba70466906d3d2ad3aee6a10642a39abdd fontconfig: 8b8f0d21534aa9b82276815c84429ffca8941d2a xkeyboard-config: 89f25045cb14ff9f08a047494a0d5966f2c1727d --- xorg-server/xkeyboard-config/symbols/in | 18 ++--- xorg-server/xkeyboard-config/symbols/pl | 121 +++++++++++++++++++------------- 2 files changed, 81 insertions(+), 58 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index f98d060c3..68f1b8aba 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -1445,8 +1445,8 @@ xkb_symbols "jhelum" { key { [ 3,numbersign, U0A69, numbersign ] }; key { [ 4,dollar, U0A6A, dollar ] }; key { [ 5,percent,U0A6B, percent ] }; - key { [ 6,asciicircum, U0A6C,asciicircum ] }; - key { [ 7,ampersand,U0A6D,ampersand ] }; + key { [ 6,U0A73, U0A6C,asciicircum ] }; + key { [ 7,U0A72,U0A6D,ampersand ] }; key { [ 8,asterisk,U0A6E, asterisk ] }; key { [ 9,parenleft,U0A6F,parenleft ] }; key { [ 0,parenright,U0A66,parenright ] }; @@ -1462,23 +1462,23 @@ xkb_symbols "jhelum" { key { [ U0A42, U0A0A ] }; // T: u, uu key { [ U0A30, U0A5C ] }; // Y: ra, raa key { [ U0A26, U0A27 ] }; // U: tha, thha - key { [ U0A17, U0A18 ] }; // I:ga, gha + key { [ U0A17, U0A18, U0A5A ] }; // I:ga, gha key { [ U0A24, U0A1F ] }; // O: ta, tha - key { [ U0A2A, U0A5E ] }; // P: pa, pha + key { [ U0A2A, U0A5E, VoidSymbol,U0A5E ] }; // P: pa, pha key { [ U0A21, U0A22, bracketleft, braceleft ] }; key { [ U0A19, U0A1E, bracketright, braceright ] }; //A Row key { [ U0A4B, U0A13 ] }; // A: o, oo - key { [ U0A40, U0A0F ] }; // S: e, ee + key { [ U0A47, U0A0F ] }; // S: e, ee key { [ U0A4D, U0A05 ] }; // D: halant, aa key { [ U0A3F, U0A07 ] }; // F: i, aa key { [ U0A41, U0A09 ] }; // G: u, uh key { [ U0A39, U0A20 ] }; // H: ha, thha - key { [ U0A1C, U0A1D ] }; // J: ja, jha - key { [ U0A15, U0A16 ] }; // K: ka, kha - key { [ U0A32, U0A25 ] }; // L: la, tha - key { [ U0A38, semicolon, colon ] }; //; sa + key { [ U0A1C, U0A1D, U0A5B ] }; // J: ja, jha + key { [ U0A15, U0A16,VoidSymbol ,U0A59 ] }; // K: ka, kha + key { [ U0A32, U0A25, U0A33 ] }; // L: la, tha + key { [ U0A38, colon, U0A36 ] }; //; sa key { [apostrophe, quotedbl ] }; //Z Row diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl index b769307ce..02432acca 100644 --- a/xorg-server/xkeyboard-config/symbols/pl +++ b/xorg-server/xkeyboard-config/symbols/pl @@ -124,55 +124,6 @@ xkb_symbols "qwertz" { include "level3(ralt_switch)" }; -// A Polish keymap with a comprehensive set of quotes, dashes, and dead accents -// -// See http://marcinwolinski.pl/keyboard/ for a description. -// -// ┌────┐ -// │ 2 4│ 2 = Shift, 4 = Level3 + Shift -// │ 1 3│ 1 = Normal, 3 = Level3 -// └────┘ -// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ -// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back ┃ -// │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃ space ┃ -// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ -// ┃ ┃ Q │ W │ E Ę │ R │ T │ Y │ U │ I │ O Ó │ P │ { « │ } » ┃ Enter ┃ -// ┃Tab ↹ ┃ q │ w │ e ę │ r │ t │ y │ u │ i │ o ó │ p │ [ ‹ │ ] › ┃ ⏎ ┃ -// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ -// ┃ ┃ A Ą │ S Ś │ D │ F │ G │ H │ J │ K │ L Ł │ : “ │ " ” │ | ¶ ┃ ┃ -// ┃Caps ⇬ ┃ a ą │ s ś │ d │ f │ g │ h │ j │ k │ l ł │ ; ‘ │ ' ’ │ \ ┃ ┃ -// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ -// ┃ │ Z Ż │ X Ź │ C Ć │ V │ B │ N Ń │ M │ < „ │ > · │ ? ¿ ┃ ┃ -// ┃Shift ⇧ │ z ż │ x ź │ c ć │ v │ b │ n ń │ m │ , ‚ │ . … │ / ⁄ ┃Shift ⇧ ┃ -// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛ -// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃ -// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃ -// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ - -partial alphanumeric_keys -xkb_symbols "intl" { - - include "latin(intl)" - - name[Group1]="Polish (international with dead keys)"; - - key { [ e, E, eogonek, Eogonek ] }; - key { [ o, O, oacute, Oacute ] }; - - key { [ a, A, aogonek, Aogonek ] }; - key { [ s, S, sacute, Sacute ] }; - key { [ l, L, lstroke, Lstroke ] }; - - key { [ z, Z, zabovedot, Zabovedot ] }; - key { [ x, X, zacute, Zacute ] }; - key { [ c, C, cacute, Cacute ] }; - key { [ n, N, nacute, Nacute ] }; - - include "kpdl(comma)" - - include "level3(ralt_switch)" -}; - // Polish Dvorak keymaps // by Rafal Rzepecki @@ -479,3 +430,75 @@ xkb_symbols "ru_phonetic_dvorak" { include "level3(ralt_switch)" }; +// EXTRAS: + +// A Polish keymap with a comprehensive set of quotes, dashes, and dead accents +// +// See http://marcinwolinski.pl/keyboard/ for a description. +// +// ┌────┐ +// │ 2 4│ 2 = Shift, 4 = Level3 + Shift +// │ 1 3│ 1 = Normal, 3 = Level3 +// └────┘ +// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ +// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back ┃ +// │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃ space ┃ +// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ +// ┃ ┃ Q │ W │ E Ę │ R │ T │ Y │ U │ I │ O Ó │ P │ { « │ } » ┃ Enter ┃ +// ┃Tab ↹ ┃ q │ w │ e ę │ r │ t │ y │ u │ i │ o ó │ p │ [ ‹ │ ] › ┃ ⏎ ┃ +// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ +// ┃ ┃ A Ą │ S Ś │ D │ F │ G │ H │ J │ K │ L Ł │ : “ │ " ” │ | ¶ ┃ ┃ +// ┃Caps ⇬ ┃ a ą │ s ś │ d │ f │ g │ h │ j │ k │ l ł │ ; ‘ │ ' ’ │ \ ┃ ┃ +// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ +// ┃ │ Z Ż │ X Ź │ C Ć │ V │ B │ N Ń │ M │ < „ │ > · │ ? ¿ ┃ ┃ +// ┃Shift ⇧ │ z ż │ x ź │ c ć │ v │ b │ n ń │ m │ , ‚ │ . … │ / ⁄ ┃Shift ⇧ ┃ +// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛ +// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃ +// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃ +// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ + +partial alphanumeric_keys +xkb_symbols "intl" { + + include "latin(intl)" + + name[Group1]="Polish (international with dead keys)"; + + key { [ e, E, eogonek, Eogonek ] }; + key { [ o, O, oacute, Oacute ] }; + + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ l, L, lstroke, Lstroke ] }; + + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ n, N, nacute, Nacute ] }; + + include "kpdl(comma)" + + include "level3(ralt_switch)" +}; + +// Polish Colemak +// by Tomek Piotrowski +// +partial alphanumeric_keys +xkb_symbols "colemak" { + include "us(colemak)" + name[Group1]= "Polish (Colemak)"; + + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ n, N, nacute, Nacute ] }; + key { [ e, E, eogonek, Eogonek ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ l, L, lstroke, Lstroke ] }; + + include "level3(ralt_switch)" +}; + -- cgit v1.2.3