From 8c2df9c9f2f66bda46e5fa82c65c80c89e15b0ed Mon Sep 17 00:00:00 2001 From: DreymaR <7303297+DreymaR@users.noreply.github.com> Date: Wed, 24 May 2023 16:27:00 +0200 Subject: [PATCH] Link update --- xkb-data_xmod/README.md | 28 +++++++++++++++++++--------- xkb-data_xmod/xkb/symbols/colemak | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/xkb-data_xmod/README.md b/xkb-data_xmod/README.md index b42b3a1..fad75ca 100644 --- a/xkb-data_xmod/README.md +++ b/xkb-data_xmod/README.md @@ -26,17 +26,24 @@ They work fine with other versions though, in nearly all cases. TODO: ----- * Update xkb-data - - 2.35.1.1 as of 2023-05 + - 2.35.1.1 as of 2023-05-24 (2022-04-05) - Use the [freedesktop.org GitLab repo][XKBgitLb] as that's the freshest there is? But it has the rules in raw/uncompiled format. + - So, instead use the [Debian Sid xkb-data package][XKB-DebS] which is the most updated one in use. + - Add the patch that fixes the hobbled Colemak (LatAm, Colemak for Gaming) variant + - Commit bc927671 "symbols/latam: remove a hobbled Colemak variant" by Benno Schulenberg 2022-07-04 + - https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/bc927671 + +* Is `any` equivalent to `NoSymbol` in the definitions? If so, we could make symbols/extend tidier! + - Maybe? There are some compact forms of notation, like leaving out symbols entirely, but those are less clear. + - In the repo, I've seen `NoSymbol` been replaced with `any`, and `VoidSymbol` with `none`. This may be the new syntax. + - Is it implemented everywhere yet, though? Hard to find good docs on it, methinks. * Sym mod implementation - - Should the Sym mod be implemented as hard (model)? No, it should not rearrange Extend. - - Better to make a new symbols/symbolkeys file, and put everything in there. + - The Sym mod should not be implemented as hard/model; it must not rearrange Extend. + - Better to make a new symbols/symbolkeys file, and put all symbol key definitions in there. - Then select sym mod according to wide status, as an option. - Update setkb.sh to handle all that. -* Make a patch file of the mod dir. - * Better instructions for Wayland? - Depends on your Wayland Compositor (Sway is common?) https://wiki.archlinux.org/title/wayland#Compositors @@ -148,13 +155,16 @@ TODO: HOLD: ----- +* Make a patch file of the mod dir? + - WinMerge doesn't support patch generation. So it'd have to be by CLI. + - It's a little cumbersome to have to update both the files and the patch file for each commit. So no, for now? + * Move the ks (Keep Local Symbols) variants out of the official sortiment? They're rather bad anyway, and may confuse newcomers? - Could leave them in so as to be addable by a simple modding: Links as commented-out lines in the symbols/colemak file or something. -* Is `any` equivalent to `NoSymbol` in the definitions? If so, we could make symbols/extend tidier! - - Doesn't seem that way. There are some compact forms of notation, like leaving out symbols entirely, but those are less clear. - -* Transition many ###.xml changes to ###.extras.xml? Other Colemak locale variants reside there. But it's a mess: Many (such as Norwegian) are in the main file! +* Transition ###.xml changes to ###.extras.xml? + - Some other Colemak locale variants reside there, like Latvian/Polish/Greek/Portuguese Colemak and Russian Rulemak. + - But it's a mess: Others (such as Norwegian, Latam and Filipino) are in the main file! - It might be nice to keep all the BigBag locales in one place though? Or not? * Rulemak (ru) has its own entry now, by its creator GHen (Geert Hendrickx). Bulmak (bg) is still provided in the BigBag. diff --git a/xkb-data_xmod/xkb/symbols/colemak b/xkb-data_xmod/xkb/symbols/colemak index 9724223..584beb9 100644 --- a/xkb-data_xmod/xkb/symbols/colemak +++ b/xkb-data_xmod/xkb/symbols/colemak @@ -233,7 +233,7 @@ xkb_symbols "cmk_ed_symbols" { // 2015-01-18 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Colemak[eD] Curl-DH implementations. // This is the Colemak Curl(DH) ergo mod, bringing D and H down to comfortable lower row positions. -// See http://colemakmods.github.io/mod-dh/ and https://dreymar.colemak.org/ergo-mods.html#CurlDH for more info. +// See http://colemakmods.github.io/mod-dh/ and https://dreymar.colemak.org/ergo-mods.html#curl-dh for more info. // • Curl(DH) is implemented both as an US English variant (cmk_ed_dh) and an option (misc:cmk_curl_dh). // • There is now one unified Curl(DH) mod; it moves zxc Dbg Hm (ZXC are moved in the CurlAngle mod). // For this mod to work as intended, a CurlAngle mod (such as the pc105cawide-sl model) is necessary.