diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al index 3f29fe8..78aed8e 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al @@ -136,11 +136,9 @@ xkb_symbols "cmk_ed_us" { // NEEDED: Cedilla Cc; diaeresis Ee -// key { [ oe, OE, dstroke, Greek_alpha ] }; // keep đ/α // key { [ bracketleft, braceleft, ccedilla, Ccedilla ] }; // key { [ bracketright, braceright, ediaeresis, Ediaeresis ] }; key { [ ccedilla, Ccedilla, bracketleft, braceleft ] }; // from key { [ ediaeresis, Ediaeresis, bracketright, braceright ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α }; // <-- DreymaR: Additions to xkb/symbols/al diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be index 18d6d4e..0be0207 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be @@ -273,7 +273,6 @@ xkb_symbols "cmk_ed_us" { key { [ eacute, Eacute, oe, OE ] }; // ; oe key { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // kept key { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/be diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br index b42425a..5e3cf7c 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br @@ -345,7 +345,6 @@ xkb_symbols "cmk_ed_us" { key { [ dead_acute, dead_grave, bracketleft, braceleft ] }; // kept key { [ dead_tilde, dead_circumflex, bracketright, braceright ] }; // from key { [ ccedilla, Ccedilla, oe, OE ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // The Brazilian ABNT-2 keyboard has the special key: key { [ masculine, ordfeminine, question, questiondown ] }; // from pt // ** NOTE: The pt and br layouts have been harmonized; this should not affect typing efficiency. diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca index 93aa917..5374af7 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca @@ -563,7 +563,6 @@ xkb_symbols "cmk_ed_us" { key { [ eacute, Eacute, oe, OE ] }; // ; oe key { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // kept key { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. // For egrave/agrave/ugrave (from //) - use the dead_grave }; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak index ad96460..ed8a963 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak @@ -131,14 +131,14 @@ xkb_symbols "cmk_ed_letters" { key { [ y, Y, U203A, guillemotright ] }; // QWE O Cmk Y key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // QWE P Cmk ;: // U2039/203A single guillemets; U0283/01A9 esh/ESH - key { [ a, A, ae, AE ] }; // QWE/Cmk A + key { [ a, A, dstroke, Greek_alpha ] }; // QWE/Cmk A key { [ r, R, registered, trademark ] }; // QWE S Cmk R key { [ s, S, ssharp, section ] }; // QWE D Cmk S key { [ t, T, thorn, THORN ] }; // QWE F Cmk T key { [ d, D, eth, ETH ] }; // QWE G Cmk D key { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk H - key { [ n, N, endash, leftarrow ] }; // QWE J Cmk N - key { [ e, E, EuroSign, uparrow ] }; // QWE K Cmk E + key { [ n, N, endash, uparrow ] }; // QWE J Cmk N + key { [ e, E, EuroSign, leftarrow ] }; // QWE K Cmk E key { [ i, I, emdash, rightarrow ] }; // QWE L Cmk I key { [ o, O, masculine, ordfeminine ] }; // QWE ; Cmk O // @@ -177,7 +177,7 @@ xkb_symbols "cmk_ed_symbols" { key { [ equal, plus, dead_doubleacute, notequal ] }; // =+ // U2248 approx equal; U2030 per mille key { [ bracketleft, braceleft, aring, Aring ] }; // [{ - key { [ bracketright, braceright, dstroke, Greek_alpha ] }; // ]} + key { [ bracketright, braceright, ae, AE ] }; // ]} // key { [ apostrophe, quotedbl, dead_acute, U2032 ] }; // '" key { [ backslash, bar, dead_grave, brokenbar ] }; // \| @@ -279,16 +279,14 @@ hidden partial alphanumeric_keys xkb_symbols "cmk_ed_hmk" { // This is the 'Hmk' switch for the Colemak Curl-DH ergo mod key { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H - key { [ m, M, multiply, leftarrow ] }; // QWE N Cmk K + key { [ m, M, multiply, downarrow ] }; // QWE N Cmk K key { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M }; hidden partial alphanumeric_keys xkb_symbols "cmk_ed_hm" { // This is the 'Hm' switch for the old Colemak Curl-DHm ergo mod, with M on the home row. - // N isn't changed in this mod, but the Cmk[eD] arrow symbols are rearranged into a Vim-like line! - key { [ m, M, multiply, leftarrow ] }; // QWE/Cmk H - key { [ n, N, endash, downarrow ] }; // QWE J Cmk N + key { [ m, M, multiply, downarrow ] }; // QWE/Cmk H key { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M }; @@ -437,9 +435,9 @@ xkb_symbols "tarmak4__etoi" { // See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (F)EKNJ loop. hidden partial alphanumeric_keys xkb_symbols "tarmak_mask_fekn_to_eknj" { - key { [ e, E, EuroSign, uparrow ] }; // QWE E Cmk F + key { [ e, E, EuroSign, leftarrow ] }; // QWE E Cmk F key { [ k, K, ccedilla, Ccedilla ] }; // QWE K Cmk E - key { [ n, N, endash, leftarrow ] }; // QWE N Cmk K + key { [ n, N, endash, uparrow ] }; // QWE N Cmk K key { [ j, J, U0283, U01A9 ] }; // QWE J Cmk N }; @@ -539,14 +537,14 @@ xkb_symbols "cmk_ed_mirror_letters" { key { [ u, U, U2039, guillemotleft ] }; key { [ y, Y, U203A, guillemotright ] }; key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; - key { [ a, A, ae, AE ] }; + key { [ a, A, dstroke, Greek_alpha ] }; key { [ r, R, registered, trademark ] }; key { [ s, S, ssharp, section ] }; key { [ t, T, thorn, THORN ] }; key { [ d, D, eth, ETH ] }; key { [ h, H, hstroke, Hstroke ] }; - key { [ n, N, endash, leftarrow ] }; - key { [ e, E, EuroSign, uparrow ] }; + key { [ n, N, endash, uparrow ] }; + key { [ e, E, EuroSign, leftarrow ] }; key { [ i, I, emdash, rightarrow ] }; key { [ o, O, masculine, ordfeminine ] }; key { [ z, Z, U0292, U01B7 ] }; @@ -576,7 +574,7 @@ xkb_symbols "cmk_ed_mirror_symbols" { key { [ 0, parenright, dead_abovering, degree ] }; key { [ minus, underscore, dead_macron, plusminus ] }; // key { [ bracketleft, braceleft, aring, Aring ] }; -// key { [ bracketright, braceright, dstroke, Greek_alpha ] }; +// key { [ bracketright, braceright, ae, AE ] }; key { [ comma, less, dead_cedilla, lessthanequal ] }; key { [ period, greater, dead_abovedot, greaterthanequal ] }; key { [ slash, question, dead_stroke, questiondown ] }; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo index 963da9f..66b6c9c 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo @@ -47,7 +47,6 @@ xkb_symbols "cmk_ed_us" { // key { [ bracketright, braceright, ubreve, Ubreve ] }; key { [ dead_circumflex, dead_circumflex, bracketleft, braceleft ] }; // common accent key { [ ubreve, Ubreve, bracketright, braceright ] }; // from - key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α }; // <-- DreymaR: Additions to xkb/symbols/epo diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template index f737ebd..20abc7a 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template @@ -60,7 +60,6 @@ xkb_symbols "cmk_ed_us" { // key { [ h, H, §, § ] }; // from // key { [ j, J, §, § ] }; // from // key { [ l, L, §, § ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // key { [ §, §, oe, OE ] }; // keep oe }; // <-- DreymaR: Additions to xkb/symbols/ diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de index 5252c8a..1b466dd 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de @@ -932,6 +932,8 @@ xkb_symbols "cmk_ed_us" { key { [ udiaeresis, Udiaeresis, bracketleft, braceleft ] }; // from key { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from key { [ odiaeresis, Odiaeresis, oe, OE ] }; // from + key { [ a, A, aring, Aring ] }; // keep åÅ +// key { [ h, H, ae, AE ] }; // keep æÆ // key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // key { [ s, S, ssharp, U1E9E ] }; // ss/SS // key { [ j, J, any, section ] }; // from S diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk index fa9b31e..e5300dd 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk @@ -126,7 +126,6 @@ xkb_symbols "cmk_ed_us" { key { [ aring, Aring, bracketleft, braceleft ] }; // from key { [ ae, AE, bracketright, braceright ] }; // from key { [ oslash, Ooblique, oe, OE ] }; // from - key { [ a, A, dstroke, Greek_alpha ] }; // ae/AE moved // NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/dk diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es index f32e464..87383c7 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es @@ -305,7 +305,6 @@ xkb_symbols "cmk_ed_us" { key { [ dead_acute, dead_diaeresis, bracketleft, braceleft ] }; // Sun ** key { [ dead_grave, dead_circumflex, bracketright, braceright ] }; // Sun ** key { [ ntilde, Ntilde, oe, OE ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // For ordfeminine/masculine, use AltGr+o/O // ** NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. }; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi index 66e7f01..24dc6d5 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi @@ -320,7 +320,7 @@ xkb_symbols "cmk_ed_us" { key { [ aring, Aring, bracketleft, braceleft ] }; // from key { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α +// key { [ h, H, ae, AE ] }; // keep æÆ // NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/fi diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr index 2128d19..7ef857f 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr @@ -1109,7 +1109,6 @@ xkb_symbols "cmk_ed_us" { key { [ eacute, Eacute, oe, OE ] }; // ; oe key { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // kept key { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/fr diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is index 22e2649..e33d3b5 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is @@ -326,8 +326,7 @@ xkb_symbols "cmk_ed_us" { key { [ thorn, THORN, bracketright, braceright ] }; //from key { [ dead_acute, dead_circumflex, oslash, Ooblique ] }; //from key { [ t, T, odiaeresis, Odiaeresis ] }; //from - key { [ d, D, aring, Aring ] }; // provide Åå -// key { [ l, L, oe, OE ] }; // keep Œœ -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α + key { [ d, D, aring, Aring ] }; // keep Åå +// key { [ h, H, ae, AE ] }; // keep æÆ }; // <-- DreymaR: Additions to xkb/symbols/is diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it index 801d31b..b0f9cea 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it @@ -350,6 +350,5 @@ xkb_symbols "cmk_ed_us" { key { [ agrave, ograve, bracketright, braceright ] }; // / key { [ ugrave, igrave, oe, OE ] }; // / // key { [ k, K, ccedilla, ntilde ] }; // / -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α }; // <-- DreymaR: Additions to xkb/symbols/it diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam index 3ff24cd..28d3d6c 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam @@ -160,7 +160,6 @@ xkb_symbols "cmk_ed_us" { key { [ dead_acute, dead_diaeresis, bracketleft, braceleft ] }; // kept key { [ dead_grave, dead_circumflex, bracketright, braceright ] }; // es/Sun key { [ ntilde, Ntilde, oe, OE ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // Note: For ordfeminine/masculine, use AltGr+o/O // NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. }; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl index afe580f..24eb5a5 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl @@ -181,6 +181,5 @@ xkb_symbols "cmk_ed_us" { key { [dead_diaeresis,dead_circumflex, bracketleft, braceleft ] }; // kept key { [ dead_acute, dead_grave, bracketright, braceright ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α }; // <-- DreymaR: Additions to xkb/symbols/nl diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no index d72eb63..f11a1ae 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no @@ -302,7 +302,6 @@ xkb_symbols "cmk_ed_us" { key { [ aring, Aring, bracketleft, braceleft ] }; // from key { [ ae, AE, bracketright, braceright ] }; // from key { [ oslash, Ooblique, oe, OE ] }; // from - key { [ a, A, dstroke, Greek_alpha ] }; // ae/AE moved // NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/no diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl index 2d4d32e..823e6af 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl @@ -541,7 +541,6 @@ xkb_symbols "cmk_ed_us" { // key { [ lstroke, Lstroke, oe, OE ] }; // QWERTZ // key { [ zabovedot, Zabovedot, bracketleft, braceleft ] }; // QWERTZ // key { [ dead_acute, dead_ogonek, bracketright, braceright ] }; // by frequency -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α key { [ zabovedot, Zabovedot, oe, OE ] }; // QWERTZ key { [ dead_acute, braceleft, bracketleft, dstroke ] }; // by frequency diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt index a14d0c2..6b8717b 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt @@ -249,7 +249,6 @@ xkb_symbols "cmk_ed_us" { key { [ dead_acute, dead_grave, bracketleft, braceleft ] }; // from ** key { [ dead_tilde, dead_circumflex, bracketright, braceright ] }; // from key { [ ccedilla, Ccedilla, oe, OE ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α // For ordfeminine/masculine, use AltGr+o/O which should be an easy reach. // ** NOTE: The pt and br layouts have been harmonized; this should not affect typing efficiency. // Whether to keep the acute on br or pt was a bit of a choice; the acute seems logical. diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se index 095726f..c7633d0 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se @@ -398,7 +398,7 @@ xkb_symbols "cmk_ed_us" { key { [ aring, Aring, bracketleft, braceleft ] }; // from key { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from -// key { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α +// key { [ h, H, ae, AE ] }; // keep æÆ // NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; // <-- DreymaR: Additions to xkb/symbols/se