stellarskylark
/
big-bag-skylark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor revision to Cmk[eD]

This commit is contained in:
DreymaR 2018-01-19 18:19:12 +01:00
parent eadcbdd9ad
commit 9036abeb36
20 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al
View File

@ -136,11 +136,9 @@ xkb_symbols "cmk_ed_us" {
// NEEDED: Cedilla Cc; diaeresis Ee
// key <LSGT> { [ oe, OE, dstroke, Greek_alpha ] }; // keep đ/α
// key <AD11> { [ bracketleft, braceleft, ccedilla, Ccedilla ] };
// key <AD12> { [ bracketright, braceright, ediaeresis, Ediaeresis ] };
key <AD11> { [ ccedilla, Ccedilla, bracketleft, braceleft ] }; // from <AD11>
key <AD12> { [ ediaeresis, Ediaeresis, bracketright, braceright ] }; // from <AC10>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
};
// <-- DreymaR: Additions to xkb/symbols/al

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be
View File

@ -273,7 +273,6 @@ xkb_symbols "cmk_ed_us" {
key <LSGT> { [ eacute, Eacute, oe, OE ] }; // <AE02>; oe
key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage
// key <AC06> { [ 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

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br
View File

@ -345,7 +345,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ dead_acute, dead_grave, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_tilde, dead_circumflex, bracketright, braceright ] }; // from <AC11>
key <LSGT> { [ ccedilla, Ccedilla, oe, OE ] }; // from <AC10>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
// The Brazilian ABNT-2 keyboard has the special <AB11> key:
key <AB11> { [ masculine, ordfeminine, question, questiondown ] }; // from pt <AC11>
// ** NOTE: The pt and br layouts have been harmonized; this should not affect typing efficiency.

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca
View File

@ -563,7 +563,6 @@ xkb_symbols "cmk_ed_us" {
key <LSGT> { [ eacute, Eacute, oe, OE ] }; // <AE02>; oe
key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage
// key <AC06> { [ 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 <AC11>/<BKSL>/<LSGT>) - use the dead_grave
};

26
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak
View File

@ -131,14 +131,14 @@ xkb_symbols "cmk_ed_letters" {
key <AD09> { [ y, Y, U203A, guillemotright ] }; // QWE O Cmk Y
key <AD10> { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // QWE P Cmk ;:
// U2039/203A single guillemets; U0283/01A9 esh/ESH
key <AC01> { [ a, A, ae, AE ] }; // QWE/Cmk A
key <AC01> { [ a, A, dstroke, Greek_alpha ] }; // QWE/Cmk A
key <AC02> { [ r, R, registered, trademark ] }; // QWE S Cmk R
key <AC03> { [ s, S, ssharp, section ] }; // QWE D Cmk S
key <AC04> { [ t, T, thorn, THORN ] }; // QWE F Cmk T
key <AC05> { [ d, D, eth, ETH ] }; // QWE G Cmk D
key <AC06> { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk H
key <AC07> { [ n, N, endash, leftarrow ] }; // QWE J Cmk N
key <AC08> { [ e, E, EuroSign, uparrow ] }; // QWE K Cmk E
key <AC07> { [ n, N, endash, uparrow ] }; // QWE J Cmk N
key <AC08> { [ e, E, EuroSign, leftarrow ] }; // QWE K Cmk E
key <AC09> { [ i, I, emdash, rightarrow ] }; // QWE L Cmk I
key <AC10> { [ o, O, masculine, ordfeminine ] }; // QWE ; Cmk O
//
@ -177,7 +177,7 @@ xkb_symbols "cmk_ed_symbols" {
key <AE12> { [ equal, plus, dead_doubleacute, notequal ] }; // =+
// U2248 approx equal; U2030 per mille
key <AD11> { [ bracketleft, braceleft, aring, Aring ] }; // [{
key <AD12> { [ bracketright, braceright, dstroke, Greek_alpha ] }; // ]}
key <AD12> { [ bracketright, braceright, ae, AE ] }; // ]}
//
key <AC11> { [ apostrophe, quotedbl, dead_acute, U2032 ] }; // '"
key <BKSL> { [ 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 <AC06> { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H
key <AB06> { [ m, M, multiply, leftarrow ] }; // QWE N Cmk K
key <AB06> { [ m, M, multiply, downarrow ] }; // QWE N Cmk K
key <AB07> { [ 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 <AC06> { [ m, M, multiply, leftarrow ] }; // QWE/Cmk H
key <AC07> { [ n, N, endash, downarrow ] }; // QWE J Cmk N
key <AC06> { [ m, M, multiply, downarrow ] }; // QWE/Cmk H
key <AB07> { [ 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 <AD03> { [ e, E, EuroSign, uparrow ] }; // QWE E Cmk F
key <AD03> { [ e, E, EuroSign, leftarrow ] }; // QWE E Cmk F
key <AC08> { [ k, K, ccedilla, Ccedilla ] }; // QWE K Cmk E
key <AB06> { [ n, N, endash, leftarrow ] }; // QWE N Cmk K
key <AB06> { [ n, N, endash, uparrow ] }; // QWE N Cmk K
key <AC07> { [ j, J, U0283, U01A9 ] }; // QWE J Cmk N
};
@ -539,14 +537,14 @@ xkb_symbols "cmk_ed_mirror_letters" {
key <AD03> { [ u, U, U2039, guillemotleft ] };
key <AD02> { [ y, Y, U203A, guillemotright ] };
key <AD01> { [ semicolon, colon, dead_diaeresis, ellipsis ] };
key <AC10> { [ a, A, ae, AE ] };
key <AC10> { [ a, A, dstroke, Greek_alpha ] };
key <AC09> { [ r, R, registered, trademark ] };
key <AC08> { [ s, S, ssharp, section ] };
key <AC07> { [ t, T, thorn, THORN ] };
key <AC06> { [ d, D, eth, ETH ] };
key <AC05> { [ h, H, hstroke, Hstroke ] };
key <AC04> { [ n, N, endash, leftarrow ] };
key <AC03> { [ e, E, EuroSign, uparrow ] };
key <AC04> { [ n, N, endash, uparrow ] };
key <AC03> { [ e, E, EuroSign, leftarrow ] };
key <AC02> { [ i, I, emdash, rightarrow ] };
key <AC01> { [ o, O, masculine, ordfeminine ] };
key <AB10> { [ z, Z, U0292, U01B7 ] };
@ -576,7 +574,7 @@ xkb_symbols "cmk_ed_mirror_symbols" {
key <AE02> { [ 0, parenright, dead_abovering, degree ] };
key <AE01> { [ minus, underscore, dead_macron, plusminus ] };
// key <AD11> { [ bracketleft, braceleft, aring, Aring ] };
// key <AD12> { [ bracketright, braceright, dstroke, Greek_alpha ] };
// key <AD12> { [ bracketright, braceright, ae, AE ] };
key <AB03> { [ comma, less, dead_cedilla, lessthanequal ] };
key <AB02> { [ period, greater, dead_abovedot, greaterthanequal ] };
key <AB01> { [ slash, question, dead_stroke, questiondown ] };

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo
View File

@ -47,7 +47,6 @@ xkb_symbols "cmk_ed_us" {
// key <AD12> { [ bracketright, braceright, ubreve, Ubreve ] };
key <AD11> { [ dead_circumflex, dead_circumflex, bracketleft, braceleft ] }; // common accent
key <AD12> { [ ubreve, Ubreve, bracketright, braceright ] }; // from <AC11>
key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
};
// <-- DreymaR: Additions to xkb/symbols/epo

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template
View File

@ -60,7 +60,6 @@ xkb_symbols "cmk_ed_us" {
// key <AC06> { [ h, H, §, § ] }; // from <A>
// key <AD06> { [ j, J, §, § ] }; // from <A>
// key <AD07> { [ l, L, §, § ] }; // from <A>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
// key <A§§§> { [ §, §, oe, OE ] }; // keep oe
};
// <-- DreymaR: Additions to xkb/symbols/<LL>

2
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de
View File

@ -932,6 +932,8 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ udiaeresis, Udiaeresis, bracketleft, braceleft ] }; // from <AD11>
key <AD12> { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from <AC11>
key <LSGT> { [ odiaeresis, Odiaeresis, oe, OE ] }; // from <AC10>
key <AC01> { [ a, A, aring, Aring ] }; // keep åÅ
// key <AC06> { [ h, H, ae, AE ] }; // keep æÆ
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
// key <AC03> { [ s, S, ssharp, U1E9E ] }; // ss/SS
// key <AD06> { [ j, J, any, section ] }; // from S

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk
View File

@ -126,7 +126,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ aring, Aring, bracketleft, braceleft ] }; // from <AD10>
key <AD12> { [ ae, AE, bracketright, braceright ] }; // from <AC10>
key <LSGT> { [ oslash, Ooblique, oe, OE ] }; // from <AC11>
key <AC01> { [ 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

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es
View File

@ -305,7 +305,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ dead_acute, dead_diaeresis, bracketleft, braceleft ] }; // Sun <AC11>**
key <AD12> { [ dead_grave, dead_circumflex, bracketright, braceright ] }; // Sun <AD11>**
key <LSGT> { [ ntilde, Ntilde, oe, OE ] }; // from <AC10>
// key <AC06> { [ 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.
};

2
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi
View File

@ -320,7 +320,7 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ aring, Aring, bracketleft, braceleft ] }; // from <AD10>
key <AD12> { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from <AC11>
key <LSGT> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from <AC10>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
// key <AC06> { [ 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

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr
View File

@ -1109,7 +1109,6 @@ xkb_symbols "cmk_ed_us" {
key <LSGT> { [ eacute, Eacute, oe, OE ] }; // <AE02>; oe
key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_grave, numerosign, bracketright, braceright ] }; // from usage
// key <AC06> { [ 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

5
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is
View File

@ -326,8 +326,7 @@ xkb_symbols "cmk_ed_us" {
key <AD12> { [ thorn, THORN, bracketright, braceright ] }; //from <AB10>
key <LSGT> { [ dead_acute, dead_circumflex, oslash, Ooblique ] }; //from <AC11>
key <AC04> { [ t, T, odiaeresis, Odiaeresis ] }; //from <AE11>
key <AC05> { [ d, D, aring, Aring ] }; // provide Åå
// key <AD07> { [ l, L, oe, OE ] }; // keep Œœ
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
key <AC05> { [ d, D, aring, Aring ] }; // keep Åå
// key <AC06> { [ h, H, ae, AE ] }; // keep æÆ
};
// <-- DreymaR: Additions to xkb/symbols/is

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it
View File

@ -350,6 +350,5 @@ xkb_symbols "cmk_ed_us" {
key <AD12> { [ agrave, ograve, bracketright, braceright ] }; // <AC11>/<AC10>
key <LSGT> { [ ugrave, igrave, oe, OE ] }; // <BKSL>/<AE12>
// key <AB06> { [ k, K, ccedilla, ntilde ] }; // <AC10>/<AB06>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
};
// <-- DreymaR: Additions to xkb/symbols/it

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam
View File

@ -160,7 +160,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ dead_acute, dead_diaeresis, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_grave, dead_circumflex, bracketright, braceright ] }; // es/Sun <AD11>
key <LSGT> { [ ntilde, Ntilde, oe, OE ] }; // from <AC10>
// key <AC06> { [ 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.
};

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl
View File

@ -181,6 +181,5 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [dead_diaeresis,dead_circumflex, bracketleft, braceleft ] }; // <AD11> kept
key <AD12> { [ dead_acute, dead_grave, bracketright, braceright ] }; // from <AC11>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
};
// <-- DreymaR: Additions to xkb/symbols/nl

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no
View File

@ -302,7 +302,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ aring, Aring, bracketleft, braceleft ] }; // from <AD10>
key <AD12> { [ ae, AE, bracketright, braceright ] }; // from <AC11>
key <LSGT> { [ oslash, Ooblique, oe, OE ] }; // from <AC10>
key <AC01> { [ 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

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl
View File

@ -541,7 +541,6 @@ xkb_symbols "cmk_ed_us" {
// key <LSGT> { [ lstroke, Lstroke, oe, OE ] }; // QWERTZ <AC10>
// key <AD11> { [ zabovedot, Zabovedot, bracketleft, braceleft ] }; // QWERTZ <AD11>
// key <AD12> { [ dead_acute, dead_ogonek, bracketright, braceright ] }; // by frequency
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
key <LSGT> { [ zabovedot, Zabovedot, oe, OE ] }; // QWERTZ <AC10>
key <AD11> { [ dead_acute, braceleft, bracketleft, dstroke ] }; // by frequency

1
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt
View File

@ -249,7 +249,6 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ dead_acute, dead_grave, bracketleft, braceleft ] }; // from <AD12>**
key <AD12> { [ dead_tilde, dead_circumflex, bracketright, braceright ] }; // from <BKSL>
key <LSGT> { [ ccedilla, Ccedilla, oe, OE ] }; // from <AC10>
// key <AC06> { [ 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 <AD11> or pt <AD12> was a bit of a choice; the acute seems logical.

2
x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se
View File

@ -398,7 +398,7 @@ xkb_symbols "cmk_ed_us" {
key <AD11> { [ aring, Aring, bracketleft, braceleft ] }; // from <AD10>
key <AD12> { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from <AC11>
key <LSGT> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from <AC10>
// key <AC06> { [ h, H, dstroke, Greek_alpha ] }; // keep đ/α
// key <AC06> { [ 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