From 0a5888393c68f6f7db86206d1f277232db18240b Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 4 Mar 2011 13:54:03 +0000 Subject: xserver xkeyboard-config mesa git update 4 Marc 2011 --- .../xkeyboard-config/symbols/extras/Makefile.am | 5 - xorg-server/xkeyboard-config/symbols/extras/apl | 294 --------------------- xorg-server/xkeyboard-config/symbols/extras/ir | 63 ----- xorg-server/xkeyboard-config/symbols/extras/rs | 15 -- xorg-server/xkeyboard-config/symbols/extras/ru | 58 ---- xorg-server/xkeyboard-config/symbols/extras/us | 146 ---------- 6 files changed, 581 deletions(-) delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/Makefile.am delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/apl delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/ir delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/rs delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/ru delete mode 100644 xorg-server/xkeyboard-config/symbols/extras/us (limited to 'xorg-server/xkeyboard-config/symbols/extras') diff --git a/xorg-server/xkeyboard-config/symbols/extras/Makefile.am b/xorg-server/xkeyboard-config/symbols/extras/Makefile.am deleted file mode 100644 index 948060441..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -symbolsdir = $(xkb_base)/symbols/extras -dist_symbols_DATA = apl \ - ir \ - rs ru \ - us diff --git a/xorg-server/xkeyboard-config/symbols/extras/apl b/xorg-server/xkeyboard-config/symbols/extras/apl deleted file mode 100644 index 57cdb0824..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/apl +++ /dev/null @@ -1,294 +0,0 @@ -// APL Keyboard Layouts - -// This file supports: -// - The Sharp APL for Unix (SAX) layout -// - The IBM APL2 layout -// - The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout - -// Unicode APL table: http://aplwiki.com/UnicodeAplTable -// ...and another: http://publibfp.boulder.ibm.com/epubs/pdf/h2110611.pdf (appendix A) -// Generic Unicode stuff: http://www.fileformat.info/info/unicode/category/index.htm - -// Tim Nelson (this file's creator) says: - -// This file doesn't deal with all the combining stuff -- I'm not an APL programmer, -// and am not quite sure what's needed here. However, it may be possible to get this -// working with dead keys and the like. Patches gratefully accepted. - -// Some of the shift-key assignments may differ from the APL tradition. If -// that's not considered acceptable, it should be possible to remap the -// shift keys. I have striven, however, to ensure that the use of shift keys -// in these maps is at least self-consistent. - -// I'm assuming that this will be used with another keyboard layout (ie. for -// your language), with a special shift key to use these maps. - -partial alphanumeric_keys modifier_keys -xkb_symbols "common" { - name[Group1]= "APL"; - - key { [ diaeresis ] }; - key { [ U00AF ] }; // ¯ -- Macron - key { [ less ] }; - key { [ U2264 ] }; // ≤ -- Less-than Or Equal To - key { [ equal ] }; - key { [ U2265 ] }; // ≥ -- Greater-than Or Equal To - key { [ greater ] }; - key { [ U2260 ] }; // ≠ -- Not Equal To - key { [ U2228 ] }; // ∨ -- Logical Or - key { [ U2227 ] }; // ∧ -- Logical And - - // Q - key { [ question ] }; - // W - key { [ U2375 ] }; // ⍵ -- APL Functional Symbol Omega - // E - key { [ U220A ] }; // ∊ -- Small Element Of - // R - key { [ U2374 ] }; // ⍴ -- APL Functional Symbol Rho - // T - key { [ asciitilde ] }; - // Y - key { [ U2191 ] }; // ↑ -- Upwards Arrow - // U - key { [ U2193 ] }; // ↓ -- Downwards Arrow - // I - key { [ U2373 ] }; // ⍳ -- APL Functional Symbol Iota - // O - key { [ U25CB ] }; // ○ -- White Circle - // P - key { [ U22C6 ] }; // ⋆ -- Should this be a plain asterisk, or the star operator??? - // [ - key { [ U2190 ] }; // ← -- Leftwards Arrow - - // A - key { [ U237A ] }; // ⍺ -- APL Functional Symbol Alpha - // S - key { [ U2308 ] }; // ⌈ -- Left Ceiling - // D - key { [ U230A ] }; // ⌊ -- Left Floor - // F - key { [ underscore ] }; - // G - key { [ U2207 ] }; // ∇ -- Nabla - // H - key { [ U2206 ] }; // ∆ -- Increment - // J - key { [ U2218 ] }; // ∘ -- Ring Operator - // K - key { [ apostrophe ] }; - // L - key { [ U2395 ] }; // ⎕ -- APL Functional Symbol Quad - - // Z - key { [ U2282 ] }; // ⊂ -- Subset Of - // X - key { [ U2283 ] }; // ⊃ -- Superset Of - // C - key { [ U2229 ] }; // ∩ -- Intersection - // V - key { [ U222A ] }; // ∪ -- Union - // B - key { [ U22A5 ] }; // ⊥ -- Up Tack - // N - key { [ U22A4 ] }; // ⊤ -- Down Tack - // M - key { [ U007C ] }; // | -- Vertical Line -}; - -// Keys common to a number of keyboards that allow normal language usage alongside APL -partial alphanumeric_keys modifier_keys -xkb_symbols "unified" { - name[Group1]= "APL Keyboard Symbols: Unified Layout"; - - include "apl(common)" - - // ` - key { [ U22C4 ] }; // ⋄ -- Diamond Operator - key { [ NoSymbol, U2371 ] }; // ⍱ -- APL Functional Symbol Down Caret Tilde - key { [ NoSymbol, U2372 ] }; // ⍲ -- APL Functional Symbol Up Caret Tilde - // - - key { [ U00D7 ] }; // × -- Multiplication Sign - // = - key { [ U00F7, U2339 ] }; // ÷ ⌹ -- Division Sign / APL Functional Symbol Quad Divide - - // ] - key { [ U2192 ] }; // → -- Rightwards Arrow -}; - -// Layout: http://www.wickensonline.co.uk/apl-unicomp.html -default -partial alphanumeric_keys modifier_keys -xkb_symbols "sax" { - name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix"; - - include "apl(unified)" - - key { [ NoSymbol, U00A1 ] }; // ¡ -- Inverted Exclamation Mark - key { [ NoSymbol, cent ] }; - key { [ NoSymbol, U2342 ] }; // ⍂ -- APL Functional Symbol Quad Backslash - // - - key { [ NoSymbol, U2261 ] }; // ≡ -- Identical To - - // Q - key { [ NoSymbol, U00BF ] }; // ¿ -- Inverted Question Mark - // W - key { [ NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile - // E - key { [ NoSymbol, U2377 ] }; // ⍷ -- APL Functional Symbol Epsilon Underbar - // T - key { [ NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash - // I - key { [ NoSymbol, U2378 ] }; // ⍸ -- APL Functional Symbol Iota Underbar - // O - key { [ NoSymbol, U2365 ] }; // ⍥ -- APL Functional Symbol Circle Diaeresis - // P - key { [ NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star - - // A - key { [ NoSymbol, U2296 ] }; // ⊖ -- Circled Minus - // F - key { [ NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde - // G - key { [ NoSymbol, U2352 ] }; // ∇ ⍒ -- APL Functional Symbol Del Stile - // H - key { [ NoSymbol, U234B ] }; // ∆ ⍋ -- APL Functional Symbol Delta Stile - // J - key { [ NoSymbol, U2364 ] }; // ⍤ -- APL Functional Symbol Jot Diaeresis - // K - key { [ NoSymbol, U233B ] }; // ⌻ - // L - key { [ NoSymbol, U235E ] }; // ⍞ -- APL Functional Symbol Quote Quad - // ; - key { [ U22A2 ] }; // ⊢ -- Right Tack - // ' - key { [ U22A3 ] }; // ⊣ -- Left Tack - - // C - key { [ NoSymbol, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot - // B - key { [ NoSymbol, U234E ] }; // ⍎ -- APL Functional Symbol Down Tack Jot (Unicode got the name wrong; it should have been "Up Tack") - // N - key { [ NoSymbol, U2355 ] }; // ⍕ -- APL Functional Symbol Up Tack Jot (Unicode got the name wrong; it should have been "Down Tack") - // M - key { [ NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam - // , - key { [ U235E, U236A ] }; // ⍞ ⍪ -- APL Functional Symbol Quote Quad / APL Functional Symbol Comma Bar - // . - key { [ U234E, U2359 ] }; // ⍎ ⍙ -- [See B key] / APL Functional Symbol Delta Underbar - // / - key { [ U2355, U233F ] }; // ⍕ ⌿ -- [See N key] / APL Functional Symbol Slash Bar - - key { [ U235D, U2340 ] }; // ⍝ ⍀ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Backslash Bar -}; - -// Layout: http://www.wickensonline.co.uk/apl-unicomp.html -partial alphanumeric_keys modifier_keys -xkb_symbols "apl2" { - name[Group1]= "APL Keyboard Symbols: IBM APL2"; - - include "apl(common)" - - // The first column is NoSymbol because it inherits. The second is NoSymbol because those keys don't do anything - - // ` - key { [ NoSymbol, U233B, U2342 ] }; // ⌻ ⍂ -- - key { [ NoSymbol, NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam - key { [ NoSymbol, NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde - key { [ NoSymbol, NoSymbol, U2353 ] }; // ⍒ -- APL Functional Symbol Del Stile - key { [ NoSymbol, NoSymbol, U234B ] }; // ⍋ -- APL Functional Symbol Delta Stile - key { [ NoSymbol, NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile - key { [ NoSymbol, NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash - key { [ NoSymbol, NoSymbol, U2296 ] }; // ⊖ -- Circled Minus - key { [ NoSymbol, NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star - key { [ NoSymbol, NoSymbol, U2371 ] }; // ⍱ -- APL Functional Symbol Down Caret Tilde - key { [ NoSymbol, NoSymbol, U2372 ] }; // ⍲ -- APL Functional Symbol Up Caret Tilde - // - - key { [ plus, minus, exclam ] }; - // = - key { [ U00D7, U00F7, U2339 ] }; // × ÷ ⌹ -- Multiplication Sign / Division Sign / APL Functional Symbol Quad Divide - - // [ - key { [ NoSymbol, U2192, U235E ] }; // (←) → ⍞ -- Rightwards Arrow / APL Functional Symbol Quote Quad - // ] - key { [ U2337, U2378, U2359 ] }; // ⌷ ⍸ ⍙ -- APL Functional Symbol Squish Quad / APL Functional Symbol Iota Underbar / APL Functional Symbol Delta Underbar - - // ; - key { [ bracketleft, parenleft, U234E ] }; // ⍎ -- [See B key in SAX layout] - // ' - key { [ bracketright, parenright, U2355 ] }; // ⍕ -- [See N key in SAX layout] - - // , - key { [ comma, semicolon, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot - // . - key { [ period, colon, U2340 ] }; // ⍀ -- APL Functional Symbol Backslash Bar - // / - key { [ slash, backslash, U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar - - key { [ U2261, U2377, U2364 ] }; // ≡ ⍷ ⍤ -- Identical To / APL Functional Symbol Epsilon Underbar / APL Functional Symbol Jot Diaeresis -}; - -partial alphanumeric_keys modifier_keys -xkb_symbols "aplplusII" { - name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II"; - - include "apl(apl2)" - - // ` - key { [ dollar, U22C4, U236A ] }; // ⋄ ⍪ -- Diamond Operator / APL Functional Symbol Comma Bar - key { [ NoSymbol, NoSymbol, U2261 ] }; // ≡ -- Identical To - - // [ - key { [ U2190, NoSymbol, U235E ] }; // ← ⍞ -- Leftwards Arrow / APL Functional Symbol Quote Quad - // ] - key { [ U2192, NoSymbol, U236C ] }; // → ⍬ -- Rightwards Arrow / APL Functional Symbol Zilde - - // ; - key { [ bracketleft, parenleft, U234E ] }; // ⍎ -- [See B key in SAX layout] - // ' - key { [ bracketright, parenright, U2355 ] }; // ⍕ -- [See N key in SAX layout] - - key { [ U22A3, U22A2, U2359 ] }; // ⊣ ⊢ ⍙ -- Left Tack / Right Tack / APL Functional Symbol Delta Underbar -}; - - -// MicroAPL layout: http://aplwiki.com/APLXKeyboardLayouts -// I didn't do the old-style MicroAPL layout; patches gratefully accepted -partial alphanumeric_keys modifier_keys -xkb_symbols "aplx" { - name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout"; - - include "apl(unified)" - - // ` - key { [ NoSymbol, U235E ] }; // ⍞ -- APL Functional Symbol Quote Quad - key { [ NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam - key { [ NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde - key { [ NoSymbol, U2353 ] }; // ⍒ -- APL Functional Symbol Del Stile - key { [ NoSymbol, U234B ] }; // ⍋ -- APL Functional Symbol Delta Stile - key { [ NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile - key { [ NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash - key { [ NoSymbol, U2296 ] }; // ⊖ -- Circled Minus - key { [ NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star - // - - key { [ NoSymbol, exclam ] }; - - // [ - key { [ NoSymbol, U2347 ] }; // ⍇ -- Box With Left Arrow - // ] - key { [ NoSymbol, U2348 ] }; // ⍈ -- Box With Right Arrow - - // ; - key { [ U234E, U2261 ] }; // ⍎ ≡ -- [See B key in SAX layout] / Identical To - // ' - key { [ U2355, U2262 ] }; // ⍕ ≢ -- [See N key in SAX layout] / Not Identical To - - // , - key { [ U235D, U236A ] }; // ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar - // . - key { [ U2340, U2364 ] }; // ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis - // / - key { [ U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar - - key { [ U22A3, U22A3 ] }; // ⊣ ⊢ -- Left Tack / Right Tack -}; diff --git a/xorg-server/xkeyboard-config/symbols/extras/ir b/xorg-server/xkeyboard-config/symbols/extras/ir deleted file mode 100644 index 52502bf75..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/ir +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Generated keyboard layout file with the Keyboard Layout Editor. -// For more about the software, see http://code.google.com/p/keyboardlayouteditor -// -// Version 0.2, fixed AD09. -// -// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32 -// Creation of this file by Simos Xenitellis. - -partial default alphanumeric_keys -xkb_symbols "ave" -{ - name[Group1] = "Iran - Avestan"; - - key { [ U10B30, U10B32 ] }; // 𐬰 𐬲 - key { [ U10B11, U10B12 ] }; // 𐬑 𐬒 - key { [ U10B17, UE102 ] }; // 𐬗  - key { [ U10B2C, U10B13 ] }; // 𐬬 𐬓 - key { [ U10B20, U10B21 ] }; // 𐬠 𐬡 - key { [ U10B25, U10B27 ] }; // 𐬥 𐬧 - key { [ U10B28, U10B29 ] }; // 𐬨 𐬩 - key { [ U10B3C, U10B39 ] }; // 𐬼 𐬹 - key { [ U10B3E, U10B3D ] }; // 𐬾 𐬽 - key { [ U10B3F, periodcentered ] }; // 𐬿 · - - key { [ U10B00, U10B01 ] }; // 𐬀 𐬁 - key { [ U10B2F, U10B31 ] }; // 𐬯 𐬱 - key { [ U10B1B, U10B1C ] }; // 𐬛 𐬜 - key { [ U10B1F, U10B16 ] }; // 𐬟 𐬖 - key { [ U10B14, U10B15 ] }; // 𐬔 𐬕 - key { [ U10B35, UE100 ] }; // 𐬵  - key { [ U10B18, U10B24 ] }; // 𐬘 𐬤 - key { [ U10B10, UE101 ] }; // 𐬐  - key { [ U10B2E, UE103 ] }; // 𐬮  - key { [ U10B3B, U10B3A ] }; // 𐬻 𐬺 - key { [ U10B1D ] }; // 𐬝 - - key { [ U10B22, U10B23 ] }; // 𐬢 𐬣 - key { [ U10B33, U10B34 ] }; // 𐬳 𐬴 - key { [ U10B08, U10B09 ] }; // 𐬈 𐬉 - key { [ U10B2D, U10B26 ] }; // 𐬭 𐬦 - key { [ U10B19, U10B1A ] }; // 𐬙 𐬚 - key { [ U10B2B, U10B2A ] }; // 𐬫 𐬪 - key { [ U10B0E, U10B0F ] }; // 𐬎 𐬏 - key { [ U10B0C, U10B0D ] }; // 𐬌 𐬍 - key { [ U10B0A, U10B0B ] }; // 𐬊 𐬋 - key { [ U10B1E ] }; // 𐬞 - key { [ U10B06, U10B07 ] }; // 𐬆 𐬇 - key { [ U10B02, U10B03 ] }; // 𐬂 𐬃 - - key { [ U10B78 ] }; // 𐭸 - key { [ U10B79 ] }; // 𐭹 - key { [ U10B7A ] }; // 𐭺 - key { [ U10B7B ] }; // 𐭻 - key { [ U10B7C ] }; // 𐭼 - key { [ U10B7D ] }; // 𐭽 - key { [ U10B7E ] }; // 𐭾 - key { [ U10B7F ] }; // 𐭿 - - key { [ U10B04, U10B05 ] }; // 𐬄 𐬅 - key { [ U10B04, U10B05 ] }; // 𐬄 𐬅 -}; diff --git a/xorg-server/xkeyboard-config/symbols/extras/rs b/xorg-server/xkeyboard-config/symbols/extras/rs deleted file mode 100644 index cc6b5fb44..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/rs +++ /dev/null @@ -1,15 +0,0 @@ -xkb_symbols "combiningkeys" { - // Raw combining characters instead of dead keys, - // especially good for post-accenting texts. - - name[Group1]= "Serbia - Combining accents instead of dead keys"; - - include "rs(basic)" - - key { [ any,any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT - key { [ any,any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT - key { [ any,any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT - key { [ any,any, U0301, NoSymbol ] }; // 9, U0301 = COMBINING ACUTE ACCENT - key { [ any,any, U0311, NoSymbol ] }; // 0, U0311 = COMBINING INVERTED BREVE - key { [ any,any, U0304, NoSymbol ] }; // -, U0304 = COMBINING MACRON -}; diff --git a/xorg-server/xkeyboard-config/symbols/extras/ru b/xorg-server/xkeyboard-config/symbols/extras/ru deleted file mode 100644 index b872be3d8..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/ru +++ /dev/null @@ -1,58 +0,0 @@ -// Church Slavonic language layout -// based on -// russian standard keyboard -// Aleksandr Andreev and Yuri Shardt -// Last Changes 2010/08/01. Contact - -partial alphanumeric_keys -xkb_symbols "chu" -{ - name[Group1]= "Russia - Church Slavonic"; - key { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign - key { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ - key { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ - key { [ U046F, U046E, U0469, U0468] }; // ѯ Ѯ ѩ Ѩ - key { [ U0471, U0470, U046D, U046C] }; // ѱ Ѱ ѭ Ѭ - key { [ U0473, U0472, UA657, UA656] }; // ѳ Ѳ iotified A - key { [ U0475, U0474, U0477, U0476] }; // ѵ Ѵ ѷ Ѷ - key { [ U047B, U047A, UA64D, UA64C] }; // ѻ Ѻ ꙍ Ꙍ - key { [ U047F, U047E, U046B, U046A] }; // ѿ Ѿ ѫ Ѫ - key { [ U0455, U0405, parenleft, U002A ] }; // ѕ Ѕ ( * - key { [ Cyrillic_u, Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u - key { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore) - key { [ U0301, U0300, U0484, UA67E] }; // а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka) - key { [ Cyrillic_shorti, Cyrillic_SHORTI, U0456 ] }; - key { [ Cyrillic_tse, Cyrillic_TSE, U2DF0 ] }; - key { [ UA64B, UA64A, U2DF9 ] }; // Cyrillic monograph Uk (not U)! - key { [ Cyrillic_ka, Cyrillic_KA, U2DE6 ] }; - key { [ Cyrillic_ie, Cyrillic_IE, U2DF7 ] }; - key { [ Cyrillic_en, Cyrillic_EN, U2DE9 ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE, U2DE2 ] }; - key { [ Cyrillic_sha, Cyrillic_SHA, U2DF2 ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA, U2DF3 ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, U2DE5 ] }; - key { [ Cyrillic_ha, Cyrillic_HA, U2DEF ] }; - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D ] }; // Payerok - key { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU ] }; - key { [ Cyrillic_ve, Cyrillic_VE, U2DE1 ] }; - key { [ Cyrillic_a, Cyrillic_A, U2DF6 ] }; - key { [ Cyrillic_pe, Cyrillic_PE, U2DEB ] }; - key { [ Cyrillic_er, Cyrillic_ER, U2DEC ] }; - key { [ Cyrillic_o, Cyrillic_O, U2DEA ] }; - key { [ Cyrillic_el, Cyrillic_EL, U2DE7 ] }; - key { [ Cyrillic_de, Cyrillic_DE, U2DE3 ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, U2DE4 ] }; - key { [ U0463, U0462, U2DFA ] }; // Yat - key { [ U0467, U0466, U2DFD ] }; // Small Yus - key { [ Cyrillic_che, Cyrillic_CHE, U2DF1 ] }; - key { [ Cyrillic_es, Cyrillic_ES, U2DED ] }; - key { [ Cyrillic_em, Cyrillic_EM, U2DE8 ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_te, Cyrillic_TE, U2DEE ] }; - key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_be, Cyrillic_BE, U2DE0 ] }; - key { [ Cyrillic_yu, Cyrillic_YU, U2DFB ] }; - key { [ period, comma, semicolon, exclam ] }; -}; diff --git a/xorg-server/xkeyboard-config/symbols/extras/us b/xorg-server/xkeyboard-config/symbols/extras/us deleted file mode 100644 index 45d9954cf..000000000 --- a/xorg-server/xkeyboard-config/symbols/extras/us +++ /dev/null @@ -1,146 +0,0 @@ -// 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 -// US-intl layout; but it uses AltGr for combining, like altgr-intl. -// -// This might break your font layout layout systems (because they -// suck), caveat emptor. Also, most of today's software will count -// individual combining marks for selection, deletion, character -// counting &c., and won't be smart enough to do canonical equivalence -// when searching, &c. -// -// With Unicode combining you use "handwriting order", not -// "typewriting order" as with deadkeys. That is, you first type the -// base character, then the diacritics/accents/modifiers. This has -// the advantage of avoiding hidden states --- each keypress changes -// something on screen. -// -// TODO: as of now, this duplicates all us(intl) functionality with -// combining. With care, perhaps we could add more combining marks -// not present in intl, and support all major languages. -partial alphanumeric_keys -xkb_symbols "intl-unicode" { - - name[Group1]= "USA - International (AltGr Unicode combining)"; - - include "us(intl)" - include "level3(ralt_switch)" - - // grave, tilde - key { [grave, asciitilde, U0300, U0303 ] }; - // double acute - key { [ 2, at, twosuperior, U030B ] }; - // macron - key { [ 3, numbersign, threesuperior, U0304 ] }; - // circumflex - key { [ 6, asciicircum, onequarter, U0302 ] }; - // horn - key { [ 7, ampersand, onehalf, U031B ] }; - // ogonek - key { [ 8, asterisk, threequarters, U0328 ] }; - // breve - key { [ 9, parenleft, leftsinglequotemark, U0306 ] }; - // abovering - key { [ 0, parenright, rightsinglequotemark, U030A ] }; - - // belowdot - key { [ minus, underscore, yen, U0323 ] }; - // acute, diaeresis - key { [apostrophe, quotedbl, U0301, U0308 ] }; - // abovedot, caron - key { [ period, greater, U0307, U030C ] }; - // hook - key { [ slash, question, questiondown, 0309 ] }; - - // alt-intl compatibility - // cedilla, caron - key { [ comma, less, U0327, U030C ] }; - // ogonek, diaeresis - key { [ semicolon, colon, U0328, U0308 ] }; - // doubleacute, horn - key { [ equal, plus, U030B, U031B ] }; - - // we don't do combining latin letters and combining enclosures - // because support for those is very rare. -}; - -// 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 break compatibility with us-intl, -// whenever I thought it would be more mnemonic or Unicodeish. -partial alphanumeric_keys -xkb_symbols "alt-intl-unicode" { - - name[Group1]= "USA - International (AltGr Unicode combining, alternative)"; - - include "extras/us(intl-unicode)" - include "level3(ralt_switch)" - - // easier macron; em-dash. - // em-dash is available via compose, but I added here since it's such - // an important typographic character. - key { [ minus, underscore, U0304, U2014 ] }; - - // belowdot, abovedot (caron at coma/less key, per above) - key { [ period, greater, U0323, U0307 ] }; - -}; - -partial alphanumeric_keys -xkb_symbols "ats" { - - include "us" - - name[Group1]= "USA - Atsina"; - - //Using Dead key to get COMBINING COMMA ABOVE for ejectives on - //q, l, t, s, m, g, k, p, w, y, r - //XCompose key is used for the other accute and grave. - - key { [ e, E, eacute, Eacute ] }; - key { [ u, U, uacute, Uacute ] }; - key { [ i, I, iacute, Iacute ] }; - key { [ o, O, oacute, Oacute ] }; - key { [ bracketleft, braceleft, U03B8 ] }; - key { [ bracketright, braceright, U010D, U010C ] }; - //U+010C (uppercase Č) and U+010D (lowercase č). - - key { [ a, A, aacute, Aacute ] }; - - - //Small letter Open use compose to key get acute accent - key { [ c, C, U0254, U0186 ] }; - key { [ comma, less, U0313 ] }; - key { [ slash, question, U0294 ] }; - - include "level3(ralt_switch)" - include "compose(rctrl)" -}; - -partial alphanumeric_keys -xkb_symbols "crd" { - - include "us" - - name[Group1]= "USA - Couer D'alene Salish"; - - // Alphanumeric section - key { [ w, W, U02B7, U02B7 ] }; - key { [ 7, ampersand, U0294 ] }; - key { [ q, Q, U221A ] }; - key { [ v, V, U0259 ] }; - key { [ backslash, bar, U026B ] }; - key { [ e, E, U025B ] }; - key { [ i, I, U026A ] }; - key { [ j, J, U01F0 ] }; - key { [ 6, asciicircum, U0295 ] }; - key { [ s, S, U0161 ] }; - key { [ c, C, U010D ] }; - key { [ o, O, U0254 ] }; - key { [ period, greater, U0323 ] }; - - include "level3(ralt_switch)" - include "compose(rctrl)" - - // End alphanumeric section -}; -- cgit v1.2.3