diff --git a/xkb-data_mod/xkb/symbols/gr b/xkb-data_mod/xkb/symbols/gr index 109fe68..032fd27 100644 --- a/xkb-data_mod/xkb/symbols/gr +++ b/xkb-data_mod/xkb/symbols/gr @@ -208,15 +208,18 @@ partial alphanumeric_keys // See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 // This layout is based on its basic Greek (QWERTY) counterpart maintained by V Vasaitis. -// Note: Standard Colemak has semicolon on while Greek(QWERTY) uses . -// I've moved the symbols on to , just like the standard Colemak does. +// Note: Standard Colemak has semicolon on while Greek QWERTY uses . +// The frequently used accents on can move to , like standard Colemak does. +// However, ideally I'd like to keep ;: on instead of on Q, for Colemak compliance. +// Also, I'd love to have room for the two diaeresis letters ϊΪ and ϋΫ for easy typing. But how? partial alphanumeric_keys xkb_symbols "colemak" { include "gr(basic)" include "gr(colemak_gr_12)" include "gr(colemak_gr_34)" + include "gr(colemak_gr_eD)" // NOTE: The basic layout didn't define some keys (no Space?); I've no idea why. -// To compensate, I include the below which defines SPCE. +// To compensate just in case, I include the below which defines SPCE. include "nbsp(level4)" name[Group1]= "Greek (Colemak, phonetic)"; }; @@ -226,37 +229,37 @@ xkb_symbols "colemak_gr_12" { // This is based on the gr(bare) partial; the number/symbol keys aren't changed name[Group1]= "Greek (Colemak levels 1-2)"; -// key { [ semicolon, colon ] }; // ; : -// key { [ Greek_finalsmallsigma, Greek_SIGMA ] }; // ς Σ - key { [ Greek_phi, Greek_PHI ] }; // φ Φ - key { [ Greek_pi, Greek_PI ] }; // π Π - key { [ Greek_gamma, Greek_GAMMA ] }; // γ Γ - key { [ Greek_xi, Greek_XI ] }; // ξ Ξ - key { [ Greek_lamda, Greek_LAMDA ] }; // λ Λ - key { [ Greek_theta, Greek_THETA ] }; // θ Θ - key { [ Greek_upsilon, Greek_UPSILON ] }; // υ Υ - key { [ dead_acute, dead_diaeresis ] }; // ´ ¨ +// key { [ semicolon, colon ] }; // q - ; : +// key { [ Greek_finalsmallsigma, Greek_SIGMA ] }; // w - ς Σ + key { [ Greek_phi, Greek_PHI ] }; // f - φ Φ + key { [ Greek_pi, Greek_PI ] }; // p - π Π + key { [ Greek_gamma, Greek_GAMMA ] }; // g - γ Γ + key { [ Greek_xi, Greek_XI ] }; // j - ξ Ξ + key { [ Greek_lamda, Greek_LAMDA ] }; // l - λ Λ + key { [ Greek_theta, Greek_THETA ] }; // u - θ Θ + key { [ Greek_upsilon, Greek_UPSILON ] }; // y - υ Υ + key { [ dead_acute, dead_diaeresis ] }; // ; - ´ ¨ -// key { [ Greek_alpha, Greek_ALPHA ] }; // α Α - key { [ Greek_rho, Greek_RHO ] }; // ρ Ρ - key { [ Greek_sigma, Greek_SIGMA ] }; // σ Σ - key { [ Greek_tau, Greek_TAU ] }; // τ Τ - key { [ Greek_delta, Greek_DELTA ] }; // δ Δ -// key { [ Greek_eta, Greek_ETA ] }; // η Η - key { [ Greek_nu, Greek_NU ] }; // ν Ν - key { [ Greek_epsilon, Greek_EPSILON ] }; // ε Ε - key { [ Greek_iota, Greek_IOTA ] }; // ι Ι - key { [ Greek_omicron, Greek_OMICRON ] }; // ο Ο +// key { [ Greek_alpha, Greek_ALPHA ] }; // a - α Α + key { [ Greek_rho, Greek_RHO ] }; // r - ρ Ρ + key { [ Greek_sigma, Greek_SIGMA ] }; // s - σ Σ + key { [ Greek_tau, Greek_TAU ] }; // t - τ Τ + key { [ Greek_delta, Greek_DELTA ] }; // d - δ Δ +// key { [ Greek_eta, Greek_ETA ] }; // h - η Η + key { [ Greek_nu, Greek_NU ] }; // n - ν Ν + key { [ Greek_epsilon, Greek_EPSILON ] }; // e - ε Ε + key { [ Greek_iota, Greek_IOTA ] }; // i - ι Ι + key { [ Greek_omicron, Greek_OMICRON ] }; // o - ο Ο -// key { [ Greek_zeta, Greek_ZETA ] }; // ζ Ζ -// key { [ Greek_chi, Greek_CHI ] }; // χ Χ -// key { [ Greek_psi, Greek_PSI ] }; // ψ Ψ -// key { [ Greek_omega, Greek_OMEGA ] }; // ω Ω -// key { [ Greek_beta, Greek_BETA ] }; // β Β - key { [ Greek_kappa, Greek_KAPPA ] }; // κ Κ -// key { [ Greek_mu, Greek_MU ] }; // μ Μ +// key { [ Greek_zeta, Greek_ZETA ] }; // z - ζ Ζ +// key { [ Greek_chi, Greek_CHI ] }; // x - χ Χ +// key { [ Greek_psi, Greek_PSI ] }; // c - ψ Ψ +// key { [ Greek_omega, Greek_OMEGA ] }; // v - ω Ω +// key { [ Greek_beta, Greek_BETA ] }; // b - β Β + key { [ Greek_kappa, Greek_KAPPA ] }; // k - κ Κ +// key { [ Greek_mu, Greek_MU ] }; // m - μ Μ -// key { [ guillemotleft, guillemotright ] }; // « » +// key { [ guillemotleft, guillemotright ] }; // _ - « » }; hidden partial alphanumeric_keys @@ -287,4 +290,15 @@ xkb_symbols "colemak_gr_34" { key { [ NoSymbol, NoSymbol, U03DF, U03DE ] }; // k // key { [ NoSymbol, NoSymbol, U03FB, U03FA ] }; // m }; + +hidden partial alphanumeric_keys +xkb_symbols "colemak_gr_eD" { +// These definitions add DreymaR specific changes to the Greek layout, namely composing dasia/psili/iota etc. + name[Group1]= "Greek (Colemak ed. DreymaR extras)"; + +// key { [ U03CB, U03AB, §, § ] }; // ϋ Ϋ + key { [ U03CA, U03AA, U0345, U037A ] }; // ϊ Ϊ c/p-Ypogegrammenei + key { [ bracketleft, braceleft, U0314, U1FFE ] }; // comb./plain Gr. Dasia + key { [ bracketright, braceright, U0313, U1FBF ] }; // comb./plain Gr. Psili +}; // <-- DreymaR: Additions to xkb/symbols/gr