diff --git a/README.md b/README.md index 3299913..4efa811 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ There are plenty of explanations and further links in there. TODO/DONE for this repo are found in the [xmod folder README][xmREADME].
-One good source of info on the `xkb-data` package is the [xkeyboard-config][XKB-conf] repository itself, and its `docs` folder. The repo is found both on [GitHub][XKBgitHb] and [GitLab][XKBgitLb]. +One good source of info on the `xkb-data` package is the [xkeyboard-config][XKB-conf] repository itself, and its `docs` folder. The repo is found at [GitLab][XKBgitLb].
Or, have a look in the X.Org Wiki. @@ -137,7 +137,6 @@ _DreymaR_ [XKB-conf]: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ (XKeyboard Config page) -[XKBgitHb]: https://github.com/freedesktop/xkeyboard-config (XKB-config on GitHub) [XKBgitLb]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config (XKB-config on GitLab) [XKB-pkgs]: https://pkgs.org/download/xkb-data (pkgs.org xkb-data page) [XKB-DebS]: https://packages.debian.org/sid/xkb-data (Debian Sid xkb-data download) diff --git a/dreymar-xtools/key-xev.sh b/dreymar-xtools/key-xev.sh index 254d39d..e4e69bd 100755 --- a/dreymar-xtools/key-xev.sh +++ b/dreymar-xtools/key-xev.sh @@ -10,7 +10,7 @@ # Usage: 'sh [scriptpath]' or # allow executing file then run in a term window # -# Happy xkb-hacking! Øystein Bech Gadmar (2014) +# Happy xkb-hacking! #---------- init -------------------------------------- SETXKB='setxkbmap -print -v 7' diff --git a/dreymar-xtools/show-xkb.sh b/dreymar-xtools/show-xkb.sh index 354fa20..cba580b 100755 --- a/dreymar-xtools/show-xkb.sh +++ b/dreymar-xtools/show-xkb.sh @@ -10,7 +10,7 @@ # Usage: 'sudo sh [scriptpath]' or # allow executing file then run in a term window # -# Happy xkb-hacking! Øystein Bech Gadmar (2012) +# Happy xkb-hacking! HeadStr="DreymaR's Show XKB info script (by GadOE, 2014)" diff --git a/xkb-data_xmod/README.md b/xkb-data_xmod/README.md index 13b21d6..60ab272 100644 --- a/xkb-data_xmod/README.md +++ b/xkb-data_xmod/README.md @@ -1,7 +1,19 @@ XKB data for DreymaR's Big Bag of Keyboard Tricks ================================================= -This readme holds version info, and also TODO and DONE lists for the BigBag-4-XKB repo. +VERSION: +-------- + File description: Modified xkb-data files for DreymaR's Big Bag of Keyboard Tricks (Linux/XKB) + Files found here: https://github.com/DreymaR/BigBagKbdTrixXKB + xkb-data version: 2-23-1-1ub1, edition DreymaR + XKB archive date: 2018-02-02 + My starting date: 2018-08-21 +
+ + +INTRO: +------ +This readme holds version info, TODO and DONE lists for the BigBag-4-XKB repo. For more general info, see the [main repo README][BBREADME]. @@ -11,45 +23,71 @@ They work fine with other versions though, in nearly all cases.
-VERSION: --------- - File description: Modified xkb-data files for DreymaR's Big Bag of Keyboard Tricks (Linux/XKB) - Files found here: https://github.com/DreymaR/BigBagKbdTrixXKB - xkb-data version: 2-23-1-1ub1, edition DreymaR - XKB archive date: 2018-02-02 - My starting date: 2018-08-21 - - TODO: ----- +* Move the ks variants out of the official sortiment? They're rather bad anyway, and may confuse newcomers? + - Leave them to be added by a simple modding, could have links to them as commented-out lines in the symbols/colemak file or something. + +* Check out Space key implementation now + - `NOTE: The basic layout didn't define some keys (no Space?); I've no idea why.` is found in some locales, which then add a space def. + - This should be handled universally in the colemak file now, though? Shouldn't it? Maybe not for phonetic variants? + +* Update xkb-data + - 2.35.1.1 as of 2023-05 + - Use the [freedesktop.org GitLab repo][XKBgitLb] as that's the freshest there is? But it has the rules in raw/uncompiled format. + +* Test the XKB BigBag on a Wayland system? + +* Sym mod implementation + - Should the Sym mod be implemented as hard (model)? No, it should not rearrange Extend. + - Better to make a new symbols/symbols file, and put everything 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. -* Update all forum.colemak.com links with new BigBag links: Locale topic (id=1458) -> https://dreymar.colemak.org/variants.html#locales etc. + +* Update most forum.colemak.com links with new BigBag links: Locale topic (id=1458) -> https://dreymar.colemak.org/variants.html#locales etc. + - Also, fix the attributions like this: + // 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. + // 2012-01-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : New shift levels 3-4. + - And fix the `for xkb on X.Org Server 7.x` bits, to `for the XKeyboardConfig xkb-data package`. Only fix mine, not Shai/Bucao/Norman's. + * Better instructions for Wayland? - Depends on your Wayland Compositor (Sway is common?) https://wiki.archlinux.org/title/wayland#Compositors - Didn't we have some good ones at the Colemak Discord? Where? https://discord.com/channels/409502982246236160/1059814838408319026/1059866421066203257 + * Lockable lv5 modifier, for users who want Extend-lock. Maybe Shift+Extend to lock it, or something? - It's possible today to have two switch-or-lock lv5 modifiers. But it seems wasteful to use up two keys. + * Non-Fn-key Extend is now the default. Add a separate option for FKey Extend? Many new users struggled with this, or have weird FKey setups. - Add a FKey Extend option to misc? So people can activate `misc:extend` and `misc:extend_fk` separately. + * Add colemak-dh to the colemak symbols file and the US locale? Both ISO, ANSI and Ortho. - Would it be "allowable" to actually move both default and dh colemak _into_ the symbols/colemak file now? - If so, edit rules components accordingly, and consider editing all locale variants to include them + * Not all distros source `~/.bashrc` by default. Seems that `~/.xinitrc` is mostly used by xinit and not generally sourced? - What about `~/.xsession` or `~/.profile`? Seems to be mostly legacy; used by `startx`? It's messy. - Look in `/etc/X11/Xsession` to see how thing are run at startup? - But `~/.Xresources` seems like a good option (and is sourced by xinitrc too)? - Its format is different though. And it doesn't list keyboard layout as one of its intended purposes. + * Add some easy way of returning to the old xkbmap setup? But how? Can't unset settings, so we'd have to store it somehow? Or just let them go to us/us? - Could write setxkbmap output to a file. Check it isn't overwritten, like the normal backup. - Make a restore to default layout shortcut instead? It's only an alias for `setkb 4n/5n`. Maybe `resetkb 4/5`? + * 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! - It might be nice to keep all the BigBag locales in one place though? Or not? + * To get Extend with the currently active layout, use `setxkbmap -v 9 -option "" -option "misc:extend,lv5:caps_switch_lock,compose:menu"`. - The first `-option ""` clears any existing option settings, while the one with non-empty arguments add to existing options. + * Add lv5:lalt_switch_lock for LALT-Extend. + * Add compose:102? Inconsistent between ISO and ANSI, just add a pro-tip. + * The Curl(DH) model implementation has to go as it may mess w/ QWERTY. Instead, I should use two Extend variants. - It also seems very hard for some newcomers to understand. So yes, I should have the Angle mod only and not CurlAngle models? - Also, matrix users want the V-D swap without an Angle mod! Another nail in the coffin for the Curl models. @@ -58,29 +96,33 @@ TODO: - First, just make Curl with D-V swap built in. Let the Extend Paste function be where it falls for now? - Separate Angle mods for Curl and non-Curl? Probably not, as it'll still get silly when using both QWERTY and Cmk-eD. - Separate Extend-Angle includes! Similar to how EPKL handles this problem. + * Check out the compose:102 option. This would be similar to what I've used in EPKL for Windows! It's also present in some other layouts. -* Echo the setxkbmap command when using setkb.sh, for ease of troubleshooting! Also make the script able to output the command for piping? + +* Echo the setxkbmap command when using setkb.sh, for ease of troubleshooting! Also make the script able to output the command for piping. + * Add a localectl option to setkb.sh? So people can choose that or setxkbmap. Eventually, even more variants such as Sway? * Problems with Super+ shortcuts: https://github.com/DreymaR/BigBagKbdTrixXKB/issues/23#issuecomment-1027839924 * A purge option in addition to restore for the install script? So backup dirs etc are removed and the xkb dir restored to original state. -* Update xkb-data and then start testing on a Wayland system! - - Use the [GitLab][XKBgitLb]/[GitHub][XKBgitHb] repo as that's the freshest there is. - -* A clarification by Peter Hutterer on the mystic .part files in the rules component: +* Find out how to change the rules component properly to allow compiling and eventually merging to the main repo? + - A clarification by Peter Hutterer on the mystic .part files in the rules component: - https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/327#note_1436334 - The parts are numbered to get their sequence in the resulting files right. Only when there are differences, they start with base/evdev. - There are RMLVO (user interface) and KcCSGST (actual XKB) letter codes. The naming of those .part files is 1234-rmlvo-kccgst.part... - but with only the relevant bits. So, e.g., `0009-m_g.part` is the model to group mapping of the final rules file. `ml_s.part` is model + layout to symbols. - - It seems that you can make layout commits by editing only the rules/base.xml (and symbols) file(s) though? + - It seems that you can make simple layout commits by editing only the rules/base.xml (and symbols) file(s) though? + - We may need to provide both the uncompiled and compiled files (or a patch thereof) for different purposes. * Add a model-less Colemak-CAWS for people who want to switch to QWERTY? Or instructions on how to setkb it? That's better, I think. + * Problem: Using Google Spreadsheets, hitting Caps Lock (which is mapped to ISO_Level5_Shift) clears the current spreadsheet cell. - https://forum.colemak.com/topic/1438-dreymars-big-bag-of-keyboard-tricks-linuxxkb-files-included/p15/#p23838 - This solves it by convincing Google Sheets that the Caps key is a Win key: `sudo setkeycodes 0x3a 125` - But it only works for built-in laptop keyboards and not USB/Bluetooth ones? + * Is there a way to clear the LevelFive mod on all the Extend mappings by default? Or must I be more careful with each RedirectKey()? - Example: `Q -> Esc -> Caps` caused people trouble, as Ext+Q would act as Esc+Caps. - Possibly, finally make a new key type EIGHT_LEVEL_EXTEND with the action clearmods=LevelFive added to state 5-8? No, no actions. @@ -88,11 +130,12 @@ TODO: - See for instance https://www.x.org/releases/X11R7.5/doc/input/XKB-Enhancing.html - "Usually, all modifiers introduced in 'modifiers=' list are used for shift level calculation and then discarded." - Does this mean that LevelFive should've been discarded but isn't? Is it an XKB bug? -* Update to the latest xkb-data: https://ubuntu.pkgs.org/20.04/ubuntu-main-amd64/xkb-data_2.29-2_all.deb.html -* Find out how to change the rules component properly to allow compiling and eventually merging to the main repo? + * Migrate from `~/.bashrc` to `~/.xprofile`? The latter is more appropriate, but which setups source it and which ones don't? - Include both? Or, people can just enter the file names. + * Could use an key code alias defined in keycodes/evdev (alias = ), instead of the code? + * Test this method for using a local dir, by Bjørnar "zkf" Hansen: - Copy the `xkb-data_mod/xkb` dir to, say, `/usr/local/bigbag/xkb` if desired. - Set `setenv MYXKB ` or `export MYKXB=` as appropriate (not necessary for this, just practical here). @@ -108,6 +151,10 @@ TODO: - "I made that tweak to setkb and some small changes to use a hardcoded $HOME dir path, and it appears good." - Another attempt by birdspider, with some tripups and solutions: https://github.com/DreymaR/BigBagKbdTrixXKB/issues/1#issuecomment-818880299 +* Is something wrong with Rulemak? It's there with the bg (Bulmak) locale, but the ru one seems to sport Polish for some odd reason?!? + - The deal is that Rulemak has its own entry by default now, from GHen himself. + - I think someone asked for that Polish entry under Ru? Not sure why, though... + * For an EsAlt variant as in EPKL: ``` key { [ 4, dollar, dead_currency, EuroSign ] }; // 4 @@ -125,6 +172,11 @@ TODO: ```
+HOLD: +----- +* Is `any` equivalent to `NoSymbol` in the definitions? If so, we could make symbols/extend tidier! + - Doesn't seem that way. There are more compact forms of notation, like leaving out symbols entirely, but those are less clear. +
DONE: ----- @@ -142,7 +194,6 @@ DONE: [XKB-conf]: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ (XKeyboard Config page) -[XKBgitHb]: https://github.com/freedesktop/xkeyboard-config (XKB-config on GitHub) [XKBgitLb]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config (XKB-config on GitLab) [XKB-pkgs]: https://pkgs.org/download/xkb-data (pkgs.org xkb-data page) [XKB-DebS]: https://packages.debian.org/sid/xkb-data (Debian Sid xkb-data download) diff --git a/xkb-data_xmod/xkb-data_version.txt b/xkb-data_xmod/xkb-data_version.txt deleted file mode 100644 index 0368725..0000000 --- a/xkb-data_xmod/xkb-data_version.txt +++ /dev/null @@ -1,8 +0,0 @@ -XKB data for DreymaR's Big Bag of Keyboard Tricks -================================================= - -File description: Modified xkb-data files for DreymaR's Big Bag of Keyboard Tricks (Linux/XKB) -Files found here: https://github.com/DreymaR/BigBagKbdTrixXKB -xkb-data version: 2-23-1-1ub1, edition DreymaR -XKB archive date: 2018-02-02 -My starting date: 2018-08-21 diff --git a/xkb-data_xmod/xkb/geometry/pc b/xkb-data_xmod/xkb/geometry/pc index 3743c53..9c3ee97 100644 --- a/xkb-data_xmod/xkb/geometry/pc +++ b/xkb-data_xmod/xkb/geometry/pc @@ -1567,8 +1567,10 @@ xkb_geometry "pc104alt" { }; // End of "pc104alt" geometry -// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/geometry/pc -// pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2017: Additions to xkb/geometry/pc +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/ergo-mods.html +// +// pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_geometry "pc104angle-z" { include "pc(pc104)" description= "Generic 104 - Angle(Z)Ergo mod"; @@ -1586,11 +1588,11 @@ xkb_geometry "pc104angle-z" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc104angle-z" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc104angle-z" geometry -// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) +// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) xkb_geometry "pc104wide-qu" { include "pc(pc104)" description= "Generic 104 - Wide(Quote)Ergo mod"; @@ -1608,7 +1610,7 @@ xkb_geometry "pc104wide-qu" { , , , { , "BKSP", color="grey20" } }; - }; // End of number row + }; // End of number row row { top= 20; keys { { , "TABK", color="grey20" }, @@ -1616,7 +1618,7 @@ xkb_geometry "pc104wide-qu" { , , , , , , , { , "BKSL" } }; - }; // End of top row + }; // End of top row row { top= 39; keys { { , "CAPS", color="grey20" }, @@ -1624,7 +1626,7 @@ xkb_geometry "pc104wide-qu" { , , , , , , { , "RTRN", color="grey20" } }; - }; // End of home row + }; // End of home row row { top= 58; keys { { , "LFSH", color="grey20" }, @@ -1632,11 +1634,11 @@ xkb_geometry "pc104wide-qu" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc104wide-qu" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc104wide-qu" geometry -// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2015) +// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2015) xkb_geometry "pc104aw-zqu" { include "pc(pc104wide-qu)" description= "Generic 104 - Angle(Z)Wide(Quote)Ergo mod"; @@ -1654,11 +1656,11 @@ xkb_geometry "pc104aw-zqu" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc104aw-zqu" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc104aw-zqu" geometry -// pc104_AngleWing(Quote) ergonomic mod (by DreymaR, 2015) +// pc104_AngleWing(Quote) ergonomic mod (by DreymaR, 2015) xkb_geometry "pc104awing" { include "pc(pc104)" description= "Generic 104 - AngleWing(Quote)Ergo mod"; @@ -1676,7 +1678,7 @@ xkb_geometry "pc104awing" { , , , { , "BKSP", color="grey20" } }; - }; // End of number row + }; // End of number row row { top= 20; keys { { , "TABK", color="grey20" }, @@ -1684,7 +1686,7 @@ xkb_geometry "pc104awing" { , , , , , , , { , "BKSL" } }; - }; // End of top row + }; // End of top row row { top= 39; keys { { , "CAPS", color="grey20" }, @@ -1692,7 +1694,7 @@ xkb_geometry "pc104awing" { , , , , , , { , "RTRN", color="grey20" } }; - }; // End of home row + }; // End of home row row { top= 58; keys { { , "LFSH", color="grey20" }, @@ -1700,11 +1702,11 @@ xkb_geometry "pc104awing" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc104awing" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc104awing" geometry -// pc105_Angle(LSGT) ergonomic mod (by DreymaR, 2011) +// pc105_Angle(LSGT) ergonomic mod (by DreymaR, 2011) xkb_geometry "pc105angle" { include "pc(pc105)" description= "Generic 105 - Angle_Ergo mod"; @@ -1722,11 +1724,11 @@ xkb_geometry "pc105angle" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc105angle" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc105angle" geometry -// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017) +// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017) xkb_geometry "pc105curl" { include "pc(pc105)" description= "Generic 105 - CurlAngle_Ergo mod"; @@ -1744,11 +1746,11 @@ xkb_geometry "pc105curl" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc105curl" geometry + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc105curl" geometry -// pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011) +// pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011) xkb_geometry "pc105aw-sl" { include "pc(pc105)" description= "Generic 105 - AngleWide(/)Ergo mod"; @@ -1766,7 +1768,7 @@ xkb_geometry "pc105aw-sl" { , , , { , "BKSP", color="grey20" } }; - }; // End of number row + }; // End of number row row { top= 20; keys { { , "TABK", color="grey20" }, @@ -1774,7 +1776,7 @@ xkb_geometry "pc105aw-sl" { , , , , , , , { , "RTRN", color="grey20" } }; - }; // End of top row + }; // End of top row row { top= 39; keys { { , "CAPS", color="grey20" }, @@ -1782,7 +1784,7 @@ xkb_geometry "pc105aw-sl" { , , , , , , }; - }; // End of home row + }; // End of home row row { top= 58; keys { { , "LFSH", color="grey20" }, @@ -1790,7 +1792,7 @@ xkb_geometry "pc105aw-sl" { , , , , , { , "RTSH", color="grey20" } }; - }; // End of bottom row - }; // End of "Alpha" section -}; // End of "pc105aw-sl" geometry -// <-- DreymaR: Additions to xkb/geometry/pc + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc105aw-sl" geometry +// <-- DreymaR: Additions to xkb/geometry/pc diff --git a/xkb-data_xmod/xkb/keycodes/aliases b/xkb-data_xmod/xkb/keycodes/aliases index ffe6430..f71b145 100644 --- a/xkb-data_xmod/xkb/keycodes/aliases +++ b/xkb-data_xmod/xkb/keycodes/aliases @@ -98,7 +98,7 @@ xkb_keycodes "qwertz" { alias = ; }; -// --> OEystein Bech "DreymaR" Gadmar, 2013: Additions to xkb/keycodes/aliases +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2013: Additions to xkb/keycodes/aliases xkb_keycodes "colemak" { alias = ; @@ -162,4 +162,4 @@ xkb_keycodes "colemak_dh" { alias = ; alias = ; }; -// <-- DreymaR: Additions to xkb/keycodes/aliases +// <-- DreymaR: Additions to xkb/keycodes/aliases diff --git a/xkb-data_xmod/xkb/keycodes/evdev b/xkb-data_xmod/xkb/keycodes/evdev index e36bbb2..8d763e7 100644 --- a/xkb-data_xmod/xkb/keycodes/evdev +++ b/xkb-data_xmod/xkb/keycodes/evdev @@ -315,7 +315,7 @@ xkb_keycodes "pc98" { }; -// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/keycodes/evdev +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2017: Additions to xkb/keycodes/evdev // pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_keycodes "pc104angle-z" { @@ -474,4 +474,4 @@ xkb_keycodes "pc105wide-rightpart" { = 61; // . < / }; -// <-- DreymaR: Additions to xkb/keycodes/evdev +// <-- DreymaR: Additions to xkb/keycodes/evdev diff --git a/xkb-data_xmod/xkb/keycodes/xfree86 b/xkb-data_xmod/xkb/keycodes/xfree86 index eb7b5bc..201bb99 100644 --- a/xkb-data_xmod/xkb/keycodes/xfree86 +++ b/xkb-data_xmod/xkb/keycodes/xfree86 @@ -411,7 +411,7 @@ xkb_keycodes "thinkpadz60" { }; -// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/keycodes/xfree86 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2017: Additions to xkb/keycodes/xfree86 // pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_keycodes "pc104angle-z" { @@ -570,4 +570,4 @@ xkb_keycodes "pc105wide-rightpart" { = 61; // . < / }; -// <-- DreymaR: Additions to xkb/keycodes/xfree86 +// <-- DreymaR: Additions to xkb/keycodes/xfree86 diff --git a/xkb-data_xmod/xkb/symbols/al b/xkb-data_xmod/xkb/symbols/al index f097302..f3bbb5a 100644 --- a/xkb-data_xmod/xkb/symbols/al +++ b/xkb-data_xmod/xkb/symbols/al @@ -106,30 +106,30 @@ xkb_symbols "plisi" { include "level3(ralt_switch)" -// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/al -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Albanian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-01: Additions to xkb/symbols/al +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Albanian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "al(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Albanian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ ediaeresis, Ediaeresis, dollar, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Albanian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Albanian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -137,11 +137,11 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Albanian (Colemak[eD], unified symbols)"; -// NEEDED: Cedilla Cc; diaeresis Ee +// NEEDED: Cedilla Cc; diaeresis Ee // key { [ bracketleft, braceleft, ccedilla, Ccedilla ] }; // key { [ bracketright, braceright, ediaeresis, Ediaeresis ] }; key { [ ccedilla, Ccedilla, bracketleft, braceleft ] }; // from key { [ ediaeresis, Ediaeresis, bracketright, braceright ] }; // from }; -// <-- DreymaR: Additions to xkb/symbols/al +// <-- DreymaR: Additions to xkb/symbols/al diff --git a/xkb-data_xmod/xkb/symbols/at b/xkb-data_xmod/xkb/symbols/at index 7bd6ea7..e27d70e 100644 --- a/xkb-data_xmod/xkb/symbols/at +++ b/xkb-data_xmod/xkb/symbols/at @@ -32,24 +32,24 @@ xkb_symbols "sundeadkeys" { name[Group1]="German (Austria, with Sun dead keys)"; }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/at -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for German (Austria). -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-01: Additions to xkb/symbols/at +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for German (Austria). +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "de(cmk_ed_ks)" name[Group1]= "German (Austria, Colemak[eD], keep local symbols)"; }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For German (Austria), necessary local letters are added to designated flexible spots in the layout. -// NOTE: - German(de) and German(at) layouts are harmonized. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For German (Austria), necessary local letters are added to designated flexible spots in the layout. +// NOTE: German(de) and German(at) layouts are harmonized. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "de(cmk_ed_us)" name[Group1]= "German (Austria, Colemak[eD], unified symbols)"; }; -// <-- DreymaR: Additions to xkb/symbols/at +// <-- DreymaR: Additions to xkb/symbols/at diff --git a/xkb-data_xmod/xkb/symbols/ba b/xkb-data_xmod/xkb/symbols/ba index 97e7d76..21c664a 100644 --- a/xkb-data_xmod/xkb/symbols/ba +++ b/xkb-data_xmod/xkb/symbols/ba @@ -33,24 +33,24 @@ xkb_symbols "unicodeus" { name[Group1]= "Bosnian (US, with Bosnian digraphs)"; }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-10: Additions to xkb/symbols/ba -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Bosnian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-10: Additions to xkb/symbols/ba +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Bosnian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "rs(cmk_ed_ks)" name[Group1]= "Bosnian (Colemak[eD], keep local symbols)"; }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Bosnian, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Bosnian, necessary local letters are added to designated flexible spots in the layout. // NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "rs(cmk_ed_us)" name[Group1]= "Bosnian (Colemak[eD], unified symbols)"; }; -// <-- DreymaR: Additions to xkb/symbols/ba +// <-- DreymaR: Additions to xkb/symbols/ba diff --git a/xkb-data_xmod/xkb/symbols/be b/xkb-data_xmod/xkb/symbols/be index e426949..0a0a731 100644 --- a/xkb-data_xmod/xkb/symbols/be +++ b/xkb-data_xmod/xkb/symbols/be @@ -238,12 +238,12 @@ partial alphanumeric_keys include "sun_vndr/be(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/be -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Belgian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/be +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Belgian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "be(basic)" @@ -253,15 +253,15 @@ xkb_symbols "cmk_ed_ks" { key { [ semicolon, period, horizconnector, multiply ] }; // // key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Belgian, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Belgian, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -274,6 +274,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 -// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. +// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/be +// <-- DreymaR: Additions to xkb/symbols/be diff --git a/xkb-data_xmod/xkb/symbols/bg b/xkb-data_xmod/xkb/symbols/bg index 6ecee67..e2a8bb0 100644 --- a/xkb-data_xmod/xkb/symbols/bg +++ b/xkb-data_xmod/xkb/symbols/bg @@ -250,12 +250,12 @@ xkb_symbols "latin" { key { type[Group1] = "KEYPAD", [ KP_Delete, KP_Decimal ]}; }; -// --> OEystein Bech "DreymaR" Gadmar, 2016-04: Additions to xkb/symbols/bg +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2016-04: Additions to xkb/symbols/bg // "Bulmak[eD]" (Phonetic Colemak variant for Bulgarian Cyrillic script) -// 2006-01-01 Shai Coleman, http://colemak.com/ -// Bulmak: 2009-2016 Ivan "Ghoul" Haralamov, using transliteration and "common sense". -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 -// Also, the Colemak forum topic on Kyrillic layouts: http://forum.colemak.com/viewtopic.php?id=519 +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// Bulmak: 2009-2016 Ivan "Ghoul" Haralamov, using transliteration and "common sense". +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales +// Also, the Colemak forum topic on Kyrillic layouts: http://forum.colemak.com/viewtopic.php?id=519 partial alphanumeric_keys xkb_symbols "colemak" { @@ -317,11 +317,11 @@ xkb_symbols "colemak" { // key { [ period, colon, greater,greaterthanequal ] }; // key { [ slash, question ] }; -// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (freedom of choice) +// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (freedom of choice) // key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; key { [ U0300, dead_diaeresis, dead_acute, dead_grave ] }; // (U0300 Comb. grave) // key { [ space, space, space, nobreakspace ] }; include "level3(ralt_switch)" }; -// <-- DreymaR: Additions to xkb/symbols/bg +// <-- DreymaR: Additions to xkb/symbols/bg diff --git a/xkb-data_xmod/xkb/symbols/br b/xkb-data_xmod/xkb/symbols/br index 4253913..16d39ae 100644 --- a/xkb-data_xmod/xkb/symbols/br +++ b/xkb-data_xmod/xkb/symbols/br @@ -309,29 +309,29 @@ partial alphanumeric_keys include "sun_vndr/br(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/br -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Portuguese (Brazil). -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/br +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Portuguese (Brazil). +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "br(abnt2)" include "colemak(cmk_ed_letters)" name[Group1]= "Portuguese (Brazil, Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, NoSymbol ] }; // key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // cent is found on the 'C' key key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Portuguese (Brazil), necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Portuguese (Brazil), necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -345,9 +345,9 @@ 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 -// The Brazilian ABNT-2 keyboard has the special key: +// The Brazilian ABNT-2 keyboard has the special key (on ANSI/ISO boards, use AltGr+o/O for º/ª): key { [ masculine, ordfeminine, question, questiondown ] }; // from pt -// ** 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. +// 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. }; -// <-- DreymaR: Additions to xkb/symbols/br +// <-- DreymaR: Additions to xkb/symbols/br diff --git a/xkb-data_xmod/xkb/symbols/ca b/xkb-data_xmod/xkb/symbols/ca index af20a74..50ceee5 100644 --- a/xkb-data_xmod/xkb/symbols/ca +++ b/xkb-data_xmod/xkb/symbols/ca @@ -530,29 +530,29 @@ partial alphanumeric_keys include "sun_vndr/ca(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/ca -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Canadian (multilingual). -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/ca +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Canadian (multilingual). +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "ca(multi)" // The 'multi' variant was chosen over the default 'fr' include "colemak(cmk_ed_letters)" name[Group1]= "Canadian multilingual (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ semicolon, colon, degree, dead_circumflex ] }; // from ; ^ added for easier reach }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Canadian multilingual, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Canadian multilingual, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -565,7 +565,7 @@ 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 -// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. -// For egrave/agrave/ugrave (from //) - use the dead_grave +// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. +// For egrave/agrave/ugrave (from //) - use the dead_grave }; -// <-- DreymaR: Additions to xkb/symbols/ca +// <-- DreymaR: Additions to xkb/symbols/ca diff --git a/xkb-data_xmod/xkb/symbols/colemak b/xkb-data_xmod/xkb/symbols/colemak index 5b50d5d..9724223 100644 --- a/xkb-data_xmod/xkb/symbols/colemak +++ b/xkb-data_xmod/xkb/symbols/colemak @@ -1,11 +1,11 @@ // $XKeyboardConfig$ -// ***************************************************************************************** -// ****** ****** -// ***** Colemak layouts - additions, locales and learning steps as variants ***** -// ***** by OEystein Bech "DreymaR" Gadmar, 2011-2015 ***** -// ***** (The Colemak layout: Shai Coleman, 2006) ***** -// ****** ****** +// ***************************************************************************************** +// ****** ****** +// ***** Colemak layouts - additions, locales and learning steps as variants ***** +// ***** by OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2011- ***** +// ***** (The Colemak layout: Shai Coleman, 2006) ***** +// ****** ****** // ***************************************************************************************** default @@ -77,38 +77,38 @@ xkb_symbols "cmk_standard" { }; -// ***************************************************************************************** -// ****** ****** -// ***** START of DreymaR's Colemak addons (Cmk[eD], Curl-DH, Tarmak1-4, Mirrored) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** START of DreymaR's Colemak addons (Cmk[eD], Curl-DH, Tarmak1-4, Mirrored) ***** +// ****** ****** +// ***************************************************************************************** -// ****************************************************** -// ***** DreymaR: Colemak - edition DreymaR ***** -// ****************************************************** +// ****************************************************** +// ***** DreymaR: Colemak - edition DreymaR ***** +// ****************************************************** -// 'Colemak - edition DreymaR' symbols for xkb on X.Org Server 7.x -// 2006-01-01 Shai Coleman, http://colemak.com/ -// 2012-01-01 OEystein Bech "DreymaR" Gadmar: New shift levels 3-4. -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 +// 'Colemak - edition DreymaR (Cmk-eD)' symbols, for the XKeyboardConfig xkb-data package +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-01-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : New shift levels 3-4. +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/layers-colemaked.html -// NOTE: DreymaR's design goals for tweaking the standard Colemak: -// - Keeping level 1-2 of Colemak intact! This is what I think of as the Colemak layout per se. -// - Dead keys easily accessible as unshifted AltGr+symbol keys; common ones in good positions. -// - Added symbols/glyphs similar to, e.g., Mac ones - allowing common math/tech/etc typing. -// - Added letters/quotes allowing many of the major latin scripts to be written correctly. -// - The positions of added letters and symbols should as far as possible be easy to remember! -// - Modularity allows flexible layout definition using different modifier keys and symbols -// * The symbol keys and number row may be kept unchanged in national variant setups -// * Since Colemak moves the semicolon key it has to go in the letter block though. -// - The brackets (lvl3-4) and the LSGT key may hold the most common locale-specific keys. -// * The letters on LBr/RBr/LSGT may well be replaced; these should also be on dead keys. -// * Also, keys with non-essential mappings (like h/j/k/l) are up for grabs if need be. -// * See the colemak_template symbols file for more info on local Colemak[eD] variants. +// NOTE: DreymaR's design goals for tweaking the standard Colemak: +// - Keeping level 1-2 of Colemak intact! This is what I think of as the Colemak layout per se. +// - Dead keys easily accessible as unshifted AltGr+symbol keys; common ones in good positions. +// - Added symbols/glyphs similar to, e.g., Mac ones - allowing common math/tech/etc typing. +// - Added letters/quotes allowing many of the major latin scripts to be written correctly. +// - The positions of added letters and symbols should as far as possible be easy to remember! +// - Modularity allows flexible layout definition using different modifier keys and symbols +// * The symbol keys and number row may be kept unchanged in national variant setups +// * Since Colemak moves the semicolon key it has to go in the letter block though. +// - The brackets (lvl3-4) and the LSGT key may hold the most common locale-specific keys. +// * The letters on LBr/RBr/LSGT may well be replaced; these should also be on dead keys. +// * Also, keys with non-essential mappings (like h/j/k/l) are up for grabs if need be. +// * See the colemak_template symbols file for more info on local Colemak[eD] variants. -// TODO: All mapped keys lose their repeat behavior; this needs to be fixed! -// It appears to be independent of layout (and extend) mappings though? +// TODO: All mapped keys lose their repeat behavior; this needs to be fixed! +// It appears to be independent of layout (and extend) mappings though? partial alphanumeric_keys xkb_symbols "cmk_ed" { include "colemak(cmk_ed_letters)" @@ -153,12 +153,12 @@ xkb_symbols "cmk_ed_letters" { key { [ space, space, nobreakspace, nobreakspace ] }; // Space // U0292/01B7 ezh/EZH -//// Activating the line below will "hard" enable the Cmk-DH = Curl(DHm) mod; see below. -// include "colemak(cmk_ed_dh)" -//// Activating the line below will "hard" enable the old Curl(DHk) mod; see below. -// include "colemak(cmk_ed_dhk)" -//// This is the old Curl(DvH) Colemak ergo mod, keeping V and M in place. -// include "colemak(cmk_ed_dvh)" +//// Activating the line below will "hard" enable the Cmk-DH = Curl(DHm) mod; see below. +// include "colemak(cmk_ed_dh)" +//// Activating the line below will "hard" enable the old Curl(DHk) mod; see below. +// include "colemak(cmk_ed_dhk)" +//// This is the old Curl(DvH) Colemak ergo mod, keeping V and M in place. +// include "colemak(cmk_ed_dvh)" }; hidden partial alphanumeric_keys @@ -189,86 +189,90 @@ xkb_symbols "cmk_ed_symbols" { key { [ period, greater, dead_abovedot, greaterthanequal ] }; // .> _≥ key { [ slash, question, dead_stroke, questiondown ] }; // /? _¿ // -// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (for freedom of choice etc.) -// key { [ BackSpace, BackSpace, Caps_Lock, Caps_Lock ] }; // Caps/Back +// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (for freedom of choice etc.) +// key { [ BackSpace, BackSpace, Caps_Lock, Caps_Lock ] }; // Caps/Back }; -// NOTE: -// - Missing: U017F long s; chevrons; horizconnector; wynn/yogh; some African -// d-tail; turned Cc/Ee++; latin epsilon/gamma (Berber); italic v; -// - Rare/dropped: U25CA lozenge (Mac; rare); kra (deprecated Inuktitut & IPA); -// union/intersection/includedin; integral (need a science/math deadkey; use esh in a pinch); -// numerosign (mostly Cyrillic; use N + masc.); squareroot (unworkable); function (use hook-f); -// U1E9E Capital German SS (disputed); U2033/U2032 double-/prime (cheat w/ acute/doubleacute?!) -// U2639/U263A/U27E8/27E9 sadface/smilingface/brackets (poorly implemented) -// - Oddly placed?: 'notsign'/'division' (placed by shape/association)? -// TODO: Compose/deadkeys: ligatures (fi/fl/ij); fractions/superior/subscripts; latin/IPA/currencies -// - For Currency: U2044 solidus/shilling; yen -// - For IPA/Latin: U026A/028F SmCap-I/Y; U0251/0252 script-a/turned-script-a; U0283 esh -// U028A lat-upsilon; U027E r-flap; U0294 glottal stop; U025C turned open e -// TODO: Make dead_stroke (for d/g/h/l/i/u) work!? Missing in compose files? -// Also, l-tilde, s/c/j/z/schwa hook? -// TODO: Unused dead_keys: iota, voiced_sound, semivoiced_sound -// (could enhance them like Colemak user 'ghen' suggests, for keys 3/4/5?): -// TODO: A Maths/science dead key? Latin/IPA? Greek? (Currency exists) -// TODO: Add superior/subscript # to dead_acute/grave; fractions to slash/stroke!? -// NB: This happens in the compose files under X11/locale, of which there are legion. :( -// Can one get away with changing only the various iso8859-# ones? Or just en_US.UTF-8 ? -// Since this lies outside the xkb folder, I might just post the code and where to paste it? -// TODO: For extra dead key mappings, could dead_abovering and dead_doubleacute be augmented? -// Make sure dead_hook has rhotic hooks for schwa and turned epsilon! -// Similarly with smallcap letters and their turned counterparts? -// TODO: Add IPA (broad English?) somewhere. Too few free slots, so it'll have to be by dead_keys. -// TODO: Phonetic 'colemak_curl' layouts with Curl-DH (it's best to rewire the whole layout in this case). -// DONE: Add Greek, Kyrillic and Hebrew phonetic Colemak layouts (nice for group 'switch' layout). -// DONE: Update the Tarmak and Mirrored layouts when Colemak[eD] is changed, using search-replace. +// NOTE: +// - Missing: U017F long s; chevrons; horizconnector; wynn/yogh; some African +// d-tail; turned Cc/Ee++; latin epsilon/gamma (Berber); italic v; +// - Rare/dropped: U25CA lozenge (Mac; rare); kra (deprecated Inuktitut & IPA); +// union/intersection/includedin; integral (need a science/math deadkey; use esh in a pinch); +// numerosign (mostly Cyrillic; use N + masc.); squareroot (unworkable); function (use hook-f); +// U1E9E Capital German SS (disputed); U2033/U2032 double-/prime (cheat w/ acute/doubleacute?!) +// U2639/U263A/U27E8/27E9 sadface/smilingface/brackets (poorly implemented) +// - Oddly placed?: 'notsign'/'division' (placed by shape/association)? +// TODO: Compose/deadkeys: ligatures (fi/fl/ij); fractions/superior/subscripts; latin/IPA/currencies +// - For Currency: U2044 solidus/shilling; yen +// - For IPA/Latin: U026A/028F SmCap-I/Y; U0251/0252 script-a/turned-script-a; U0283 esh +// U028A lat-upsilon; U027E r-flap; U0294 glottal stop; U025C turned open e +// TODO: Make dead_stroke (for d/g/h/l/i/u) work!? Missing in compose files? +// Also, l-tilde, s/c/j/z/schwa hook? +// TODO: Unused dead_keys: iota, voiced_sound, semivoiced_sound +// (could enhance them like Colemak user 'ghen' suggests, for keys 3/4/5?): +// TODO: A Maths/science dead key? Latin/IPA? Greek? (Currency exists) +// TODO: Add superior/subscript # to dead_acute/grave; fractions to slash/stroke!? +// NB: This happens in the compose files under X11/locale, of which there are legion. :( +// Can one get away with changing only the various iso8859-# ones? Or just en_US.UTF-8 ? +// Since this lies outside the xkb folder, I might just post the code and where to paste it? +// TODO: For extra dead key mappings, could dead_abovering and dead_doubleacute be augmented? +// Make sure dead_hook has rhotic hooks for schwa and turned epsilon! +// Similarly with smallcap letters and their turned counterparts? +// TODO: Add IPA (broad English?) somewhere. Too few free slots, so it'll have to be by dead_keys. +// TODO: Phonetic 'colemak_curl' layouts with Curl-DH (it's best to rewire the whole layout in this case). +// DONE: Add Greek, Kyrillic and Hebrew phonetic Colemak layouts (nice for group 'switch' layout). +// DONE: Update the Tarmak and Mirrored layouts when Colemak[eD] is changed, using search-replace. -// ****************************************************** -// ***** Stevep99/DreymaR: Curl(DH) ergonomic mods ***** -// ****************************************************** +// ****************************************************** +// ***** Stevep99/DreymaR: Curl(DH) ergonomic mods ***** +// ****************************************************** -// 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 http://forum.colemak.com/viewtopic.php?id=1942 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. -// • DH = Stevep99's Curl-DHm(DvbgHm) mod gives D a good bottom-row place () at the cost of V and B, and -// gives H a good bottom-row position at the cost of M. -// • DreymaR's old Curl-DvH(DbgHk) mod avoided splitting ZXCV by replacing B with D in the full Angle mod, and -// avoided moving M, swapping H and K instead. -// • Some may prefer the 2014-2017 Curl-DHk mod to keep M in the "pocket"; rename cmk_ed_[dh/dhk] below then. -// • The mod causes lv3-4 trouble with Cmk[eD] locales that remap H (and in some cases, D/G and for DHk, K). -// To use Curl-DH, any H in symbols/locale 'cmk_ed_us' sections should change from to /. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2014-10-25 "SteveP" https://colemakmods.github.io/mod-dh/ : The Colemak-DH Curl modded layout variant. +// 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. +// • 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. +// • DH = Stevep99's Curl-DHm(DvbgHm) mod gives D a good bottom-row place () at the cost of V and B, and +// gives H a good bottom-row position at the cost of M. +// • DreymaR's old Curl-DvH(DbgHk) mod avoided splitting ZXCV by replacing B with D in the full Angle mod, and +// avoided moving M, swapping H and K instead. +// • Some may prefer the 2014-2017 Curl-DHk mod to keep M in the "pocket"; rename cmk_ed_[dh/dhk] below then. +// • The mod causes lv3-4 trouble with Cmk[eD] locales that remap H (and in some cases, D/G and for DHk, K). +// To use Curl-DH, any H in symbols/locale 'cmk_ed_us' sections should change from to /. hidden partial alphanumeric_keys xkb_symbols "cmk_ed_dh" { - // Standard Colemak-DH from Oct 2020- is Colemak-DH(m) - // This is the original Curl(DHm/DvbgHm) ergo mod for Colemak, with M on the home row - // In the new implementation, D is moved inside V by one of the CurlAngle mods + // Standard Colemak-DH from Oct 2020- is Colemak-DH(m) + // This is the original Curl(DHm/DvbgHm) ergo mod for Colemak, with M on the home row + // In the new implementation, D is moved inside V by one of the CurlAngle mods include "colemak(cmk_ed_dbg)" include "colemak(cmk_ed_hm)" }; hidden partial alphanumeric_keys xkb_symbols "cmk_ed_dhk" { - // This is the Curl(DHk) ergo mod for Colemak, DH standard 2017-2020 - // D is moved inside V by one of the CurlAngle mods (to affect Extend) + // This is the Curl(DHk) ergo mod for Colemak, DH standard 2017-2020 + // D is moved inside V by one of the CurlAngle mods (to affect Extend) include "colemak(cmk_ed_dbg)" include "colemak(cmk_ed_hmk)" }; hidden partial alphanumeric_keys xkb_symbols "cmk_ed_dvh" { - // This is the old Curl(DvH/DbgHk) ergo mod for Colemak, keeping V and M in place - // By default, it doesn't use a CurlAngle(Wide) model but just an Angle(Wide) one + // This is the old Curl(DvH/DbgHk) ergo mod for Colemak, keeping V and M in place + // By default, it doesn't use a CurlAngle(Wide) model but just an Angle(Wide) one include "colemak(cmk_ed_dbg)" include "colemak(cmk_ed_hk)" }; hidden partial alphanumeric_keys xkb_symbols "cmk_ed_dbg" { - // This is the 'Dbg' loop for the Colemak Curl-DH ergo mod. D is moved inside V (Extend is unaffected). + // This is the 'Dbg' loop for the Colemak Curl-DH ergo mod. D is moved inside V (Extend is unaffected). key { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE T Cmk G key { [ g, G, eng, ENG ] }; // QWE G Cmk D key { [ d, D, eth, ETH ] }; // QWE/Cmk V @@ -277,7 +281,7 @@ xkb_symbols "cmk_ed_dbg" { hidden partial alphanumeric_keys xkb_symbols "cmk_ed_hmk" { - // This is the 'Hmk' switch for the Colemak Curl-DHk ergo mod with K on the home row. + // This is the 'Hmk' switch for the Colemak Curl-DHk ergo mod with K on the home row. key { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H key { [ m, M, multiply, downarrow ] }; // QWE N Cmk K key { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M @@ -285,34 +289,34 @@ xkb_symbols "cmk_ed_hmk" { hidden partial alphanumeric_keys xkb_symbols "cmk_ed_hm" { - // This is the 'Hm' switch for the original/standard Colemak Curl-DHm ergo mod. + // This is the 'Hm' switch for the original/standard Colemak Curl-DHm ergo mod. key { [ m, M, multiply, downarrow ] }; // QWE/Cmk H key { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M }; hidden partial alphanumeric_keys xkb_symbols "cmk_ed_hk" { - // This is the 'Hk' switch for the old Colemak Curl-DvH ergo mod, leaving M in place. + // This is the 'Hk' switch for the old Colemak Curl-DvH ergo mod, leaving M in place. key { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H key { [ h, H, hstroke, Hstroke ] }; // QWE N Cmk K }; -// ****************************************************** -// ***** DreymaR: Tarmak - Transitional Colemak ***** -// ****************************************************** +// ****************************************************** +// ***** DreymaR: Tarmak - Transitional Colemak ***** +// ****************************************************** -// Tarmak symbols for xkb on X.Org Server 7.x -// 2012-01-01 OEystein Bech "DreymaR" Gadmar: Paving the way; 'Tarmak (transitional Colemak)'. -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 -// 2006-01-01 Shai Coleman, http://colemak.com/ -// This section defines the differences between a full Colemak[eD] and the first Tarmak layout step. -// The Tarmak1(E) step moves the E>K>N keys to their Colemak positions, leaving the J at QWERTY 'E'. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-01-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Tarmak (transitional Colemak) layouts. +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/tarmak-intro.html +// This section defines the differences between a full Colemak[eD] and the first Tarmak layout step. +// The Tarmak1(E) step moves the E>K>N keys to their Colemak positions, leaving the J at QWERTY 'E'. partial alphanumeric_keys xkb_symbols "tarmak1__e" { include "colemak(cmk_ed)" - // To exclude the initial (F)EKNJ loop in this step, include its mask and comment out the F-J line below - // (This would only be useful if you want to learn the LUI loop as a warmup; if so, comment out that too) + // To exclude the initial (F)EKNJ loop in this step, include its mask and comment out the F-J line below + // (This would only be useful if you want to learn the LUI loop as a warmup; if so, comment out that too) //include "colemak(tarmak_mask_fekn_to_eknj)" include "colemak(tarmak_mask_dgt_to_gtf)" include "colemak(tarmak_mask_prs_to_rsd)" @@ -322,8 +326,8 @@ xkb_symbols "tarmak1__e" { name[Group1]= "English/Intl (Tarmak1_E - Colemak transitional)"; }; -// This is the first Tarmak step for those who want to learn the Curl(DH) mod, including the HMK switch. -// The old Curl(Hm) mod doesn't affect the first Tarmak step, so it can use the unmodded Tarmak1__e. +// This is the first Tarmak step for those who want to learn the Curl(DH) mod, including the HMK switch. +// The old Curl(Hm) mod doesn't affect the first Tarmak step, so it can use the unmodded Tarmak1__e. partial alphanumeric_keys xkb_symbols "tarmak1c_e" { include "colemak(cmk_ed)" @@ -333,15 +337,15 @@ xkb_symbols "tarmak1c_e" { include "colemak(tarmak_mask_lui_to_uil)" include "colemak(cmk_ed_hk)" key { [ j, J, U0283, U01A9 ] }; // Cmk F - stray J - // NOTE: Re-enforcing of the V and B keys as below is only necessary when running a DBG/DVBG mod (see above) + // NOTE: Re-enforcing of the V and B keys as below is only necessary when running a DBG/DVBG mod (see above) key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V key { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE/Cmk B name[Group1]= "English/Intl (Tarmak1c_E - Colemak Curl-DH transitional)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. -// The Tarmak2(ET) step moves the G>T>F keys to their Colemak positions, leaving the J at QWERTY 'G'. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. +// The Tarmak2(ET) step moves the G>T>F keys to their Colemak positions, leaving the J at QWERTY 'G'. partial alphanumeric_keys xkb_symbols "tarmak2__et" { include "colemak(cmk_ed)" @@ -352,42 +356,42 @@ xkb_symbols "tarmak2__et" { name[Group1]= "English/Intl (Tarmak2_ET - Colemak transitional)"; }; -// The Tarmak2c(ET) step moves the B>T>F keys to their Colemak-Curl(DH) positions, leaving the J at QWERTY 'B'. -// NOTE: The standard Curl(DH) mod requires activating a CurlAngle model to work. (My old variant only used Angle.) +// The Tarmak2c(ET) step moves the B>T>F keys to their Colemak-Curl(DH) positions, leaving the J at QWERTY 'B'. +// NOTE: The standard Curl(DH) mod requires activating a CurlAngle model to work. (My old variant only used Angle.) partial alphanumeric_keys xkb_symbols "tarmak2c_et" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_prs_to_rsd)" include "colemak(tarmak_mask_jyoc_to_yocp)" include "colemak(tarmak_mask_lui_to_uil)" -//// For Curl(DHm), activating the right-hand HM switch is still optional. -// include "colemak(cmk_ed_dbg)" -// include "colemak(cmk_ed_dbghm)" -//// NOTE: The below is for DBG/DVBG mods (VJ/JV on / respectively) -//// For the Curl-DH mod, both sides are activated at this point forward. (Activate it normally for step 3–4.) +//// For Curl(DHm), activating the right-hand HM switch is still optional. +// include "colemak(cmk_ed_dbg)" +// include "colemak(cmk_ed_dbghm)" +//// NOTE: The below is for DBG/DVBG mods (VJ/JV on / respectively) +//// For the Curl-DH mod, both sides are activated at this point forward. (Activate it normally for step 3–4.) include "colemak(cmk_ed_dbghk)" key { [ j, J, U0283, U01A9 ] }; // QWE/Cmk B - stray J key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V name[Group1]= "English/Intl (Tarmak2c_ET - Colemak Curl-DH transitional)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. -// The Tarmak3(ETR) step moves the R>S>D keys to their Colemak positions, leaving the J at QWERTY 'R'. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. +// The Tarmak3(ETR) step moves the R>S>D keys to their Colemak positions, leaving the J at QWERTY 'R'. partial alphanumeric_keys xkb_symbols "tarmak3__etr" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_jyoc_to_yocp)" - // To include the standalone LUI loop in this or any step, comment out its mask (below) + // To include the standalone LUI loop in this or any step, comment out its mask (below) include "colemak(tarmak_mask_lui_to_uil)" key { [ j, J, U0283, U01A9 ] }; // Cmk P - stray J name[Group1]= "English/Intl (Tarmak3_ETR - Colemak transitional)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. -// The Tarmak4(ETRO) step moves the L>U>I keys to their Colemak positions, finalizing the big loop. -// This is the 4th step of the Tarmak(ETROI) and (ETORI) variants, leaving only the LUI loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. +// The Tarmak4(ETRO) step moves the L>U>I keys to their Colemak positions, finalizing the big loop. +// This is the 4th step of the Tarmak(ETROI) and (ETORI) variants, leaving only the LUI loop. partial alphanumeric_keys xkb_symbols "tarmak4__etro" { include "colemak(cmk_ed)" @@ -395,43 +399,43 @@ xkb_symbols "tarmak4__etro" { name[Group1]= "English/Intl (Tarmak4_ETRO - Colemak transitional)"; }; -// NOTE: The Tarmak(ETO) and (ETOI) steps below are the old versions. They won't show up in the menus anymore. -// A quick way of getting them back would be to edit the xkb_symbols names of steps 3 and 4 here. -// A more proper way would be to edit the rules/evdev.xml and evdev.lst files, -// replacing 'tarmak3__etr' with 'tarmak3__eto' and likewise for '4__etro'/'4__etoi', -// and finally editing the corresponding entries in the 'us' symbols file. +// NOTE: The Tarmak(ETO) and (ETOI) steps below are the old versions. They won't show up in the menus anymore. +// A quick way of getting them back would be to edit the xkb_symbols names of steps 3 and 4 here. +// A more proper way would be to edit the rules/evdev.xml and evdev.lst files, +// replacing 'tarmak3__etr' with 'tarmak3__eto' and likewise for '4__etro'/'4__etoi', +// and finally editing the corresponding entries in the 'us' symbols file. -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. -// The Tarmak3(ETO) step moves the J>Y>O keys to their Colemak positions, leaving the ; at QWERTY 'G'. -// This is the 3rd step of the Tarmak(ETOIR) and (ETORI) variants, performing the JYO loop earlier. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. +// The Tarmak3(ETO) step moves the J>Y>O keys to their Colemak positions, leaving the ; at QWERTY 'G'. +// This is the 3rd step of the Tarmak(ETOIR) and (ETORI) variants, performing the JYO loop earlier. partial alphanumeric_keys xkb_symbols "tarmak3__eto" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_prs_to_rsd)" - // To include the standalone LUI loop in this step, comment out its mask below + // To include the standalone LUI loop in this step, comment out its mask below include "colemak(tarmak_mask_lui_to_uil)" key { [ p, P, Greek_pi, paragraph ] }; // Cmk ;: key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Cmk D - stray ;: name[Group1]= "English/Intl (Tarmak3_ETO - Colemak transitional)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. -// The Tarmak4(ETOI) step moves the L>U>I keys to their Colemak positions, stranding the ; at QWERTY 'G'. -// This is the 4th step of the Tarmak(ETOIR) variant, performing the LUI loop earlier. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. +// The Tarmak4(ETOI) step moves the L>U>I keys to their Colemak positions, stranding the ; at QWERTY 'G'. +// This is the 4th step of the Tarmak(ETOIR) variant, performing the LUI loop earlier. partial alphanumeric_keys xkb_symbols "tarmak4__etoi" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_prs_to_rsd)" - // The standalone LUI loop is included in this step; if unwanted here, include its mask instead + // The standalone LUI loop is included in this step; if unwanted here, include its mask instead key { [ p, P, Greek_pi, paragraph ] }; // Cmk ;: key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Cmk D - stray ;: name[Group1]= "English/Intl (Tarmak4_ETOI - Colemak transitional)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (F)EKNJ loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 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, leftarrow ] }; // QWE E Cmk F @@ -440,8 +444,8 @@ xkb_symbols "tarmak_mask_fekn_to_eknj" { key { [ j, J, U0283, U01A9 ] }; // QWE J Cmk N }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (D)GTF loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (D)GTF loop. hidden partial alphanumeric_keys xkb_symbols "tarmak_mask_dgt_to_gtf" { key { [ g, G, eng, ENG ] }; // QWE G Cmk D @@ -449,8 +453,8 @@ xkb_symbols "tarmak_mask_dgt_to_gtf" { key { [ f, F,rightsinglequotemark,rightdoublequotemark ] }; // QWE F Cmk T }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (P)RSD loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (P)RSD loop. hidden partial alphanumeric_keys xkb_symbols "tarmak_mask_prs_to_rsd" { key { [ r, R, registered, trademark ] }; // QWE R Cmk P @@ -458,8 +462,8 @@ xkb_symbols "tarmak_mask_prs_to_rsd" { key { [ d, D, eth, ETH ] }; // QWE D Cmk S }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (J)YO;P loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for the partial (J)YO;P loop. hidden partial alphanumeric_keys xkb_symbols "tarmak_mask_jyoc_to_yocp" { key { [ y, Y, U203A, guillemotright ] }; // QWE Y Cmk J @@ -468,8 +472,8 @@ xkb_symbols "tarmak_mask_jyoc_to_yocp" { key { [ p, P, Greek_pi, paragraph ] }; // QWE P Cmk ; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// See the first Tarmak layout above for more info. This is a QWERTY mask for the standalone LUI loop. +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// See the first Tarmak layout above for more info. This is a QWERTY mask for the standalone LUI loop. hidden partial alphanumeric_keys xkb_symbols "tarmak_mask_lui_to_uil" { key { [ u, U, U2039, guillemotleft ] }; // QWE U Cmk L @@ -478,36 +482,37 @@ xkb_symbols "tarmak_mask_lui_to_uil" { }; -// ****************************************************** -// ***** DreymaR: Mirrored Colemak (Symbols) ***** -// ****************************************************** +// ****************************************************** +// ***** DreymaR: Mirrored Colemak (Symbols) ***** +// ****************************************************** -// Mirrored Colemak[eD] symbols for xkb on X.Org Server 7.x -// 2012-03-01 OEystein Bech "DreymaR" Gadmar: Mirrored Colemak layouts for single-handed typing. -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 -// 2006-01-01 Shai Coleman, http://colemak.com/ -// NOTE: Some adventurous souls might want to try the mirrored Colemak as a main layout? -// (They say it's more similar to Dvorak that way.) However, it's meant for one-handed typing. -// To use it as a standalone layout, you'll want to take out the remapping of special keys. -// Ideally, mirrored keyboarding ought to be done in the keyboard setup (Keylayout) component. -// That way it'd be independent on the chosen symbols layout, like my Angle/Wide mods. -// However, single-handed typing requires the use of a chooser key (like with the Extend mod). -// This is ttbomk currently only supported by the Symbols xkb component. -// Within this limitation, looks like an Overlay should be the best option? -// However (again!), ttbomk this isn't all that well implemented in xkb? -// Using a Group setup, just add the mirrored Colemak[eD] as your next layout (usually Group 2). -// Then you may choose between a slew of "key(s) to change layout (while pressed)" options! -// This does compromise your group options a bit (if you need to use non-latin layouts etc). -// If that bothers you, consider using both 'next' and 'last' layout groups with chooser keys. -// See for instance the Canadian(Multilingual) layout for an example; they choose with RCtrl. -// NOTE: This is made for the AWide-Slash (Wide35) keyboard mod (for bracket key access etc). -// Using it with another keyboard will be messy! I couldn't separate mirroring from the rest. -// The backslash is provided both on the key and on (for ANSI keyboards). -// Included are pre-made options for RAlt and LAlt choosing. Use either one or set a key yourself. -// The below implementations are silly since they show how to choose AWAY the cmk_ed_mirror! -// Use Ubuntu: 'Keyboard Layout'->'Options'->'key(s) to change layout (while pressed)'. +// Mirrored Colemak[eD] symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-04-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Mirrored Colemak layouts. +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/variants.html#mirror +// +// NOTE: Some adventurous souls might want to try the mirrored Colemak as a main layout? +// (They say it's more similar to Dvorak that way.) However, it's meant for one-handed typing. +// To use it as a standalone layout, you'll want to take out the remapping of special keys. +// Ideally, mirrored keyboarding ought to be done in the keyboard setup (Keylayout) component. +// That way it'd be independent on the chosen symbols layout, like my Angle/Wide mods. +// However, single-handed typing requires the use of a chooser key (like with the Extend mod). +// This is ttbomk currently only supported by the Symbols xkb component. +// Within this limitation, looks like an Overlay should be the best option? +// However (again!), ttbomk this isn't all that well implemented in xkb? +// Using a Group setup, just add the mirrored Colemak[eD] as your next layout (usually Group 2). +// Then you may choose between a slew of "key(s) to change layout (while pressed)" options! +// This does compromise your group options a bit (if you need to use non-latin layouts etc). +// If that bothers you, consider using both 'next' and 'last' layout groups with chooser keys. +// See for instance the Canadian(Multilingual) layout for an example; they choose with RCtrl. +// NOTE: This is made for the AWide-Slash (Wide35) keyboard mod (for bracket key access etc). +// Using it with another keyboard will be messy! I couldn't separate mirroring from the rest. +// The backslash is provided both on the key and on (for ANSI keyboards). +// Included are pre-made options for RAlt and LAlt choosing. Use either one or set a key yourself. +// The below implementations are silly since they show how to choose AWAY the cmk_ed_mirror! +// Use Ubuntu: 'Keyboard Layout'->'Options'->'key(s) to change layout (while pressed)'. -// Using the group(switch) map, the right alt key temporarily chooses next group until released. +// Using the group(switch) map, the right alt key temporarily chooses next group until released. partial alphanumeric_keys xkb_symbols "cmk_ed_mirror_ralt" { include "colemak(cmk_ed_mirror)" @@ -558,7 +563,7 @@ xkb_symbols "cmk_ed_mirror_letters" { hidden partial alphanumeric_keys xkb_symbols "cmk_ed_mirror_symbols" { // Alphanumeric section (number/symbol keys) -// TODO: Make the 4-level for this mod; others? +// TODO: Make the 4-level for this mod; others? key { [ grave, asciitilde, dead_tilde, U2248 ] }; key { [ equal, plus, dead_doubleacute, notequal ] }; key { [ 1, exclam, dead_belowdot, exclamdown ] }; @@ -593,8 +598,8 @@ xkb_symbols "cmk_ed_mirror_special" { key { [ Escape ] }; // Esc is often mapped to (usually with Crtl) key { [ Caps_Lock ] }; key { [ Tab, ISO_Left_Tab ] }; -// key { [ ISO_Right_Alt ] }; //NOTE: If this doesn't work, add SetMods -// key { [ Alt_L ] }; //NOTE: If this doesn't work, add SetMods +// key { [ ISO_Right_Alt ] }; // NOTE: If this doesn't work, add SetMods +// key { [ Alt_L ] }; // NOTE: If this doesn't work, add SetMods key { [ F12 ] }; key { [ F11 ] }; key { [ F10 ] }; @@ -610,15 +615,15 @@ xkb_symbols "cmk_ed_mirror_special" { }; -// ****************************************************** -// ***** DreymaR: Colemak[eD] - National variants ***** -// ***** are in colemak_template - copy to a new ***** -// ***** file and find/replace / ***** -// ****************************************************** +// ****************************************************** +// ***** DreymaR: Colemak[eD] - National variants ***** +// ***** are in colemak_template - copy to a new ***** +// ***** file and find/replace / ***** +// ****************************************************** -// ***************************************************************************************** -// ****** ****** -// ***** END of DreymaR's Colemak addons (Cmk[eD], Curl-DH, Tarmak1-4, Mirrored) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** END of DreymaR's Colemak addons (Cmk[eD], Curl-DH, Tarmak1-4, Mirrored) ***** +// ****** ****** +// ***************************************************************************************** diff --git a/xkb-data_xmod/xkb/symbols/colemak_eD_epo b/xkb-data_xmod/xkb/symbols/colemak_eD_epo index 66b6c9c..c4a196e 100644 --- a/xkb-data_xmod/xkb/symbols/colemak_eD_epo +++ b/xkb-data_xmod/xkb/symbols/colemak_eD_epo @@ -1,25 +1,25 @@ // $XKeyboardConfig$ -// ***************************************************************************************** -// ****** ****** -// ***** Colemak layouts - adding locale variants in a consistent fashion ***** -// ***** by OEystein Bech "DreymaR" Gadmar, 2012- ***** -// ***** (copy this template to a new file then find/replace 'Esperanto'/'epo') ***** -// ***** ('' is usually the ISO-3166 two-letter country code) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** Colemak layouts - adding locale variants in a consistent fashion ***** +// ***** by OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012- ***** +// ***** (copy this template to a new file then find/replace 'Esperanto'/'epo') ***** +// ***** ('epo' is usually the ISO-3166 two-letter country code) ***** +// ****** ****** +// ***************************************************************************************** -// *********************************************** -// *** In the symbols file for Esperanto *** -// *** (its filename is 'epo') *** -// *********************************************** +// *********************************************** +// *** In the symbols file for Esperanto *** +// *** (its filename is 'epo') *** +// *********************************************** -// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/epo -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Esperanto. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-01: Additions to xkb/symbols/epo +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Esperanto. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "colemak(cmk_ed_letters)" @@ -29,9 +29,9 @@ xkb_symbols "cmk_ed_ks" { name[Group1]= "Esperanto (Colemak[eD], keep local symbols)"; }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Esperanto, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Esperanto, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -39,21 +39,21 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Esperanto (Colemak[eD], unified symbols)"; -// NEEDED: ĈĉĜĝĤĥĴĵŜŝ, Ŭŭ -// Esperanto letter frequencies: The accented letters add up, so allegedly 6% for the above 6 letters together -// NOTE: Added dead_circumflex to both shifted and unshifted LBracket, so it's easy to use with shifted letters +// NEEDED: ĈĉĜĝĤĥĴĵŜŝ, Ŭŭ +// Esperanto letter frequencies: The accented letters add up, so allegedly 6% for the above 6 letters together. +// NOTE: Added dead_circumflex to both shifted and unshifted LBracket, so it's easy to use with shifted letters. // key { [ bracketleft, braceleft, dead_circumflex, dead_circumflex ] }; // key { [ bracketright, braceright, ubreve, Ubreve ] }; key { [ dead_circumflex, dead_circumflex, bracketleft, braceleft ] }; // common accent key { [ ubreve, Ubreve, bracketright, braceright ] }; // from }; -// <-- DreymaR: Additions to xkb/symbols/epo +// <-- DreymaR: Additions to xkb/symbols/epo -// *********************************************** -// *** In the rules/evdev(+base).xml file *** -// *** Under the epo layout variantList *** -// *********************************************** +// *********************************************** +// *** In the rules/evdev(+base).xml file *** +// *** Under the epo layout variantList *** +// *********************************************** @@ -68,21 +68,21 @@ xkb_symbols "cmk_ed_us" { -// *********************************************** -// *** In the rules/evdev(+base).lst file *** -// *** Under '! variant' (norm. epo) *** -// *********************************************** +// *********************************************** +// *** In the rules/evdev(+base).lst file *** +// *** Under '! variant' (norm. epo) *** +// *********************************************** cmk_ed_ks epo: Esperanto (Colemak[eD], keep local symbols) cmk_ed_us epo: Esperanto (Colemak[eD], unified symbols) -// *********************************************** -// *** (In the main rules/evdev(+base) file *** -// *** no changes should be necessary.) *** -// *********************************************** +// *********************************************** +// *** (In the main rules/evdev(+base) file *** +// *** no changes should be necessary.) *** +// *********************************************** -// ***************************************************************************************** -// ****** ****** -// ***** END of DreymaR's Colemak additions (Cmk[eD], National var.) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** END of DreymaR's Colemak additions (Cmk[eD], National var.) ***** +// ****** ****** +// ***************************************************************************************** diff --git a/xkb-data_xmod/xkb/symbols/colemak_eD_template b/xkb-data_xmod/xkb/symbols/colemak_eD_template index 20abc7a..764b071 100644 --- a/xkb-data_xmod/xkb/symbols/colemak_eD_template +++ b/xkb-data_xmod/xkb/symbols/colemak_eD_template @@ -1,34 +1,34 @@ // $XKeyboardConfig$ -// ***************************************************************************************** -// ****** ****** -// ***** Colemak layouts - adding locale variants in a consistent fashion ***** -// ***** by OEystein Bech "DreymaR" Gadmar, 2012- ***** -// ***** (copy this template to a new file then find/replace ''/'') ***** -// ***** ('' is usually the ISO-3166 two-letter country code) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** Colemak layouts - adding locale variants in a consistent fashion ***** +// ***** by OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012- ***** +// ***** (copy this template to a new file then find/replace ''/'') ***** +// ***** ('' is usually the ISO-3166 two-letter country code) ***** +// ****** ****** +// ***************************************************************************************** -// *********************************************** -// *** In the symbols file for *** -// *** (its filename is '') *** -// *********************************************** +// *********************************************** +// *** In the symbols file for *** +// *** (its filename is '') *** +// *********************************************** -// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/ -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for . -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase, 20??-??: Additions to xkb/symbols/ +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for . +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "(basic)" include "colemak(cmk_ed_letters)" name[Group1]= " (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost @@ -36,9 +36,9 @@ xkb_symbols "cmk_ed_ks" { // key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For , necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For , necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -46,28 +46,28 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= " (Colemak[eD], unified symbols)"; -// NEEDED: -// letter frequencies: -// NOTE: +// NEEDED: +// letter frequencies: +// NOTE: key { [ §, §, oe, OE ] }; // from // key { [ bracketleft, braceleft, §, § ] }; // key { [ bracketright, braceright, §, § ] }; key { [ §, §, bracketleft, braceleft ] }; // from key { [ §, §, bracketright, braceright ] }; // from -// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. +// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. // key { [ k, K, §, § ] }; // from // key { [ h, H, §, § ] }; // from // key { [ j, J, §, § ] }; // from // key { [ l, L, §, § ] }; // from // key { [ §, §, oe, OE ] }; // keep oe }; -// <-- DreymaR: Additions to xkb/symbols/ +// <-- DreymaR: Additions to xkb/symbols/ -// *********************************************** -// *** In the rules/evdev(+base).xml file *** -// *** Under the layout variantList *** -// *********************************************** +// *********************************************** +// *** In the rules/evdev(+base).xml file *** +// *** Under the layout variantList *** +// *********************************************** @@ -82,21 +82,21 @@ xkb_symbols "cmk_ed_us" { -// *********************************************** -// *** In the rules/evdev(+base).lst file *** -// *** Under '! variant' (norm. ) *** -// *********************************************** +// *********************************************** +// *** In the rules/evdev(+base).lst file *** +// *** Under '! variant' (norm. ) *** +// *********************************************** cmk_ed_ks : (Colemak[eD], keep local symbols) cmk_ed_us : (Colemak[eD], unified symbols) -// *********************************************** -// *** (In the main rules/evdev(+base) file *** -// *** no changes should be necessary.) *** -// *********************************************** +// *********************************************** +// *** (In the main rules/evdev(+base) file *** +// *** no changes should be necessary.) *** +// *********************************************** -// ***************************************************************************************** -// ****** ****** -// ***** END of DreymaR's Colemak additions (Cmk[eD], National var.) ***** -// ****** ****** -// ***************************************************************************************** +// ***************************************************************************************** +// ****** ****** +// ***** END of DreymaR's Colemak additions (Cmk[eD], National var.) ***** +// ****** ****** +// ***************************************************************************************** diff --git a/xkb-data_xmod/xkb/symbols/cz b/xkb-data_xmod/xkb/symbols/cz index 2090d44..5c626dc 100644 --- a/xkb-data_xmod/xkb/symbols/cz +++ b/xkb-data_xmod/xkb/symbols/cz @@ -254,29 +254,29 @@ partial alphanumeric_keys include "sun_vndr/cz(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/cz -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Czech. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/cz +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Czech. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "cz(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Czech (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, NoSymbol, mu ] }; // key { [ NoSymbol, NoSymbol, NoSymbol, EuroSign ] }; // Added EuroSign on lv4 to keep percent. key { [ uring, quotedbl, dollar, currency ] }; // from (added lv4) }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Czech, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Czech, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -284,11 +284,11 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Czech (Colemak[eD], unified symbols)"; -// NEEDED: Acute a/e/i/u/y, caron c/e/r/s/z, stroke Dd/Ll, uring. -// Uring is very rare; it's nevertheless provided for (sm)allcaps writing and referral to the letter. +// NEEDED: Acute a/e/i/u/y, caron c/e/r/s/z, stroke Dd/Ll, uring. +// Uring is very rare; it's nevertheless provided for (sm)allcaps writing and referral to the letter. key { [ uring, Uring, oe, OE ] }; // from key { [ dead_acute, dead_acute, bracketleft, braceleft ] }; // from key { [ dead_caron, dead_caron, bracketright, braceright ] }; // from }; -// <-- DreymaR: Additions to xkb/symbols/cz +// <-- DreymaR: Additions to xkb/symbols/cz diff --git a/xkb-data_xmod/xkb/symbols/de b/xkb-data_xmod/xkb/symbols/de index 3bc150c..032909f 100644 --- a/xkb-data_xmod/xkb/symbols/de +++ b/xkb-data_xmod/xkb/symbols/de @@ -1152,30 +1152,30 @@ partial alphanumeric_keys }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/de -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for German. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/de +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for German. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "de(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "German (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For German, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For German, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -1183,7 +1183,8 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "German (Colemak[eD], unified symbols)"; -// NOTE: ÄäÖöÜü are needed. For ß, use AltGr. Tke optional capital ß (U1E9E) is deprecated and hardly in use. +// NOTE: ÄäÖöÜü are needed. For ß, use AltGr. Tke optional capital ß (U1E9E) is deprecated and hardly in use. +// German(de) and German(at) layouts are harmonized. // key { [ bracketleft, braceleft, udiaeresis, Udiaeresis ] }; // key { [ bracketright, braceright, adiaeresis, Adiaeresis ] }; @@ -1196,4 +1197,4 @@ xkb_symbols "cmk_ed_us" { // key { [ s, S, ssharp, U1E9E ] }; // ss/SS // key { [ j, J, any, section ] }; // from S }; -// <-- DreymaR: Additions to xkb/symbols/de +// <-- DreymaR: Additions to xkb/symbols/de diff --git a/xkb-data_xmod/xkb/symbols/dk b/xkb-data_xmod/xkb/symbols/dk index a3ab6ef..f944415 100644 --- a/xkb-data_xmod/xkb/symbols/dk +++ b/xkb-data_xmod/xkb/symbols/dk @@ -87,30 +87,30 @@ partial alphanumeric_keys include "sun_vndr/dk(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/dk -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Danish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/dk +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Danish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "dk(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Danish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, cent is on 'c' key { [ ae, AE, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Danish, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Danish, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -126,6 +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 -// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. +// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/dk +// <-- DreymaR: Additions to xkb/symbols/dk diff --git a/xkb-data_xmod/xkb/symbols/es b/xkb-data_xmod/xkb/symbols/es index 6a7435a..6b3a644 100644 --- a/xkb-data_xmod/xkb/symbols/es +++ b/xkb-data_xmod/xkb/symbols/es @@ -265,31 +265,31 @@ partial alphanumeric_keys include "sun_vndr/es(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/es -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Spanish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/es +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Spanish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. -// NOTE: Since the letter block is now Colemak[eD] mapped, the Euro sign is mapped to AltGr+5 as in es(winkeys) +// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// NOTE: Since the letter block is now Colemak[eD] mapped, the Euro sign is mapped to AltGr+5 as in es(winkeys) partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "es(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Spanish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Spanish, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Spanish, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -305,7 +305,7 @@ 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 -// For ordfeminine/masculine, use AltGr+o/O -// ** NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. +// NOTE: For ordfeminine/masculine, use AltGr+o/O which should be an easy reach. +// NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/es +// <-- DreymaR: Additions to xkb/symbols/es diff --git a/xkb-data_xmod/xkb/symbols/extend b/xkb-data_xmod/xkb/symbols/extend index 020f213..22ec5de 100644 --- a/xkb-data_xmod/xkb/symbols/extend +++ b/xkb-data_xmod/xkb/symbols/extend @@ -1,44 +1,44 @@ -// Extend mode symbols for xkb on X.Org Server 7.x+ -// 2014- OEystein "DreymaR" Bech-Aase (Bech Gadmar until 2021) -// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org -// A modular Extend mapping layer like the one I have in Portable Keyboard Layout for Windows -// - Key names are in /usr/include/X11/keysymdef.h and XF86keysym.h (Removing the XK_ prefix) -// - mapped as XF86 Multimedia keys; shifted versions are implemented (unlike in EPKL for Windows) +// Extend layer symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2014- OEystein "DreymaR" Bech-Aase (Bech Gadmar until 2021) +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/layers-extend.html +// A modular Extend mapping layer like the one I have in Portable Keyboard Layout for Windows +// - Key names are in /usr/include/X11/keysymdef.h and XF86keysym.h (Removing the XK_ prefix) +// - mapped as XF86 Multimedia keys; shifted versions are implemented (unlike in EPKL for Windows) // -// These keys are modified/transposed by holding down the 'extend key' (CapsLock by default): -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |Esc + |F1 <> |F2 << |F3 >> |F4 <> |F5 <> |F6 << |F7 >> |F8 <> |F9 <> |F10<> |F11<> |F12<> | -// | | Pause | Rew | Fwd | Eject | Refr | Bri- | Bri+ | Sleep | WWW | Mail | App1 | App2 | -// | Caps | Play | Prev | Next | Stop | Mute | Vol- | Vol+ | Media | Home | Srch | File | Calc | -// +=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+ -// |` *** |1 |2 |3 |4 |5 |6 |7 |8 |9 |0 |- |= | -// | *MOn | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |Tab |Q €€€ |W *** |F <<> |P <>> |G *** |J ### |L ### |U ### |Y ### |; €€€ |[ €€€ |] €€€ | -// | | Esc | *WhUp | BrBck | BrFwd | *MUp | PgUp | Home | Up | End | Del | Esc | Ins | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |Caps+ |A +++ |R *** |S +++ |T +++ |D *** |H ### |N ### |E ### |I ### |O €€€ |' €€€ |\ ><> | -// | ++++ | Alt | *WhDn | Shift | Ctrl | *MDn | PgDn | Left | Down | Right | Back | Menu | BrFav | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |_ €€€ |Z €€€ |X === |C === |V === |B *** |K *** |M *** |, *** |. *** |/ €€€ |Spc € |Entr€ | -// | Cust | Undo | Cut | Copy | Paste | *Bt1 | *Bt2 | *Bt3 | *MLe | *MRi | Multi | Enter | PrtSc | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// Legend: # Movement; + Modifiers; = GUI edit; * Mouse; <> MultiMedia; € Various commands. +// These keys are modified/transposed by holding down the 'extend key' (CapsLock by default): +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |Esc + |F1 <> |F2 << |F3 >> |F4 <> |F5 <> |F6 << |F7 >> |F8 <> |F9 <> |F10<> |F11<> |F12<> | +// | | Pause | Rew | Fwd | Eject | Refr | Bri- | Bri+ | Sleep | WWW | Mail | App1 | App2 | +// | Caps | Play | Prev | Next | Stop | Mute | Vol- | Vol+ | Media | Home | Srch | File | Calc | +// +=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+=======+ +// |` *** |1 |2 |3 |4 |5 |6 |7 |8 |9 |0 |- |= | +// | *MOn | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |Tab |Q €€€ |W *** |F <<> |P <>> |G *** |J ### |L ### |U ### |Y ### |; €€€ |[ €€€ |] €€€ | +// | | Esc | *WhUp | BrBck | BrFwd | *MUp | PgUp | Home | Up | End | Del | Esc | Ins | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |Caps+ |A +++ |R *** |S +++ |T +++ |D *** |H ### |N ### |E ### |I ### |O €€€ |' €€€ |\ ><> | +// | ++++ | Alt | *WhDn | Shift | Ctrl | *MDn | PgDn | Left | Down | Right | Back | Menu | BrFav | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |_ €€€ |Z €€€ |X === |C === |V === |B *** |K *** |M *** |, *** |. *** |/ €€€ |Spc € |Entr€ | +// | Cust | Undo | Cut | Copy | Paste | *Bt1 | *Bt2 | *Bt3 | *MLe | *MRi | Multi | Enter | PrtSc | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// Legend: # Movement; + Modifiers; = GUI edit; * Mouse; <> MultiMedia; € Various commands. // -// KeyPad overlay with nav block to the left (lv7-8): -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |` *** |1 |2 |3 |4 £ |5 € |6 |7 ⇖ |8 ⇑ |9 ⇗ |0 |- |= | -// | *MOn | ! | @ | # | $ | % | ^ | KP_7 | KP_8 | KP_9 | KP_* | KP_- | KP_= | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |Tab |Q ### |W ### |F ### |P €€€ |G €€€ |J ### |L ⇐ |U ⇔ |Y ⇒ |; |[ { |] } | -// | | Home | Up | End | Del | Esc | PgUp | KP_4 | KP_5 | KP_6 | KP_+ | ( | ) | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |Caps+ |A ### |R ### |S ### |T €€€ |D |H ### |N ⇙ |E ⇓ |I ⇘ |O |' " |\ | | -// | ++++ | Left | Down | Right | Back | K_Lck | PgDn | KP_1 | KP_2 | KP_3 | K_Ent | ' | : | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -// |_ €€€ |Z €€€ |X === |C === |V === |B *** |K |M |, ⇕ |. |/ |Spc |Entr | -// | Cust | Undo | Cut | Copy | Paste | *Bt1 | , | KP_0 | KP_0 | KP_. | KP_/ | Spc | K_Ent | -// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// KeyPad overlay with nav block to the left (lv7-8): +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |` *** |1 |2 |3 |4 £ |5 € |6 |7 ⇖ |8 ⇑ |9 ⇗ |0 |- |= | +// | *MOn | ! | @ | # | $ | % | ^ | KP_7 | KP_8 | KP_9 | KP_* | KP_- | KP_= | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |Tab |Q ### |W ### |F ### |P €€€ |G €€€ |J ### |L ⇐ |U ⇔ |Y ⇒ |; |[ { |] } | +// | | Home | Up | End | Del | Esc | PgUp | KP_4 | KP_5 | KP_6 | KP_+ | ( | ) | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |Caps+ |A ### |R ### |S ### |T €€€ |D |H ### |N ⇙ |E ⇓ |I ⇘ |O |' " |\ | | +// | ++++ | Left | Down | Right | Back | K_Lck | PgDn | KP_1 | KP_2 | KP_3 | K_Ent | ' | : | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +// |_ €€€ |Z €€€ |X === |C === |V === |B *** |K |M |, ⇕ |. |/ |Spc |Entr | +// | Cust | Undo | Cut | Copy | Paste | *Bt1 | , | KP_0 | KP_0 | KP_. | KP_/ | Spc | K_Ent | +// +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ // // TODO: A lv7 modifier to reach the second Extend layer directly. // Test out this: diff --git a/xkb-data_xmod/xkb/symbols/fi b/xkb-data_xmod/xkb/symbols/fi index 806e1ef..bcb8640 100644 --- a/xkb-data_xmod/xkb/symbols/fi +++ b/xkb-data_xmod/xkb/symbols/fi @@ -346,30 +346,30 @@ xkb_symbols "fidvorak" { include "level3(ralt_switch)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/fi -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Finnish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/fi +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Finnish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "fi(kotoistus)" include "colemak(cmk_ed_letters)" name[Group1]= "Finnish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, NoSymbol ] }; // key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // permille is lost key { [odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Finnish, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Finnish, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -386,6 +386,6 @@ xkb_symbols "cmk_ed_us" { key { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from // key { [ h, H, ae, AE ] }; // keep æÆ -// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. +// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/fi +// <-- DreymaR: Additions to xkb/symbols/fi diff --git a/xkb-data_xmod/xkb/symbols/fr b/xkb-data_xmod/xkb/symbols/fr index e49a67e..f454d8e 100644 --- a/xkb-data_xmod/xkb/symbols/fr +++ b/xkb-data_xmod/xkb/symbols/fr @@ -1072,12 +1072,12 @@ xkb_symbols "azerty" { key { [ exclam, section ] }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/fr -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for French. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/fr +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for French. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "fr(basic)" @@ -1087,15 +1087,15 @@ xkb_symbols "cmk_ed_ks" { key { [ semicolon, period, horizconnector, multiply ] }; // // key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, NoSymbol, mu ] }; // key { [ NoSymbol, NoSymbol, NoSymbol, EuroSign ] }; // EuroSign added on lv4 to keep bracketleft }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For French, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For French, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -1110,6 +1110,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 -// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. +// NOTE: The be/ca/fr layouts have been harmonized; this should not affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/fr +// <-- DreymaR: Additions to xkb/symbols/fr diff --git a/xkb-data_xmod/xkb/symbols/gb b/xkb-data_xmod/xkb/symbols/gb index ff348e1..6252263 100644 --- a/xkb-data_xmod/xkb/symbols/gb +++ b/xkb-data_xmod/xkb/symbols/gb @@ -204,12 +204,12 @@ partial alphanumeric_keys include "sun_vndr/gb(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/gb -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for English (UK). -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/gb +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for English (UK). +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "gb(basic)" @@ -217,11 +217,11 @@ xkb_symbols "cmk_ed_ks" { name[Group1]= "English (UK, Colemak[eD], keep local symbols)"; }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// It is the same as us(cmk_ed_us), but added for completeness and ease of language setting. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// It is the same as us(cmk_ed_us), but added for completeness and ease of language setting. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed)" name[Group1]= "English (UK, Colemak[eD], unified symbols)"; }; -// <-- DreymaR: Additions to xkb/symbols/gb +// <-- DreymaR: Additions to xkb/symbols/gb diff --git a/xkb-data_xmod/xkb/symbols/gr b/xkb-data_xmod/xkb/symbols/gr index 6b13714..d162402 100644 --- a/xkb-data_xmod/xkb/symbols/gr +++ b/xkb-data_xmod/xkb/symbols/gr @@ -202,31 +202,31 @@ partial alphanumeric_keys include "sun_vndr/gr(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/gr -// Phonetic Colemak variant for Greek. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/gr +// Phonetic Colemak variant for Greek. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// This layout is based on its basic Greek (QWERTY) counterpart maintained by V Vasaitis. -// Note: Standard Colemak has semicolon on while Greek QWERTY uses (the Q). -// The frequently used accents on could move to , like standard Colemak does. -// However, we should keep ;: on instead of on Q, for Colemak compliance. ( =^･ω･^=)丿 -// I thought to include the diaeresis letters ϊΪ and ϋΫ for easy typing, but they're rare? +// This layout is based on its basic Greek (QWERTY) counterpart maintained by V Vasaitis. +// Note: Standard Colemak has semicolon on while Greek QWERTY uses (the Q). +// The frequently used accents on could move to , like standard Colemak does. +// However, we should keep ;: on instead of on Q, for Colemak compliance. ( =^･ω･^=)丿 +// I thought to include the diaeresis letters ϊΪ and ϋΫ for easy typing, but they're rare? 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 just in case, I include the below which defines SPCE. +// NOTE: The basic layout didn't define some keys (no Space?); I've no idea why. +// To compensate just in case, I include the below which defines SPCE. include "nbsp(level4)" name[Group1]= "Greek (Colemak, phonetic)"; }; hidden partial alphanumeric_keys xkb_symbols "colemak_gr_12" { -// This is based on the gr(bare) partial; the number/symbol keys aren't changed +// This is based on the gr(bare) partial; the number/symbol keys aren't changed name[Group1]= "Greek (Colemak levels 1-2)"; key { [ dead_acute, dead_diaeresis ] }; // q - ´ ¨ @@ -264,7 +264,7 @@ xkb_symbols "colemak_gr_12" { hidden partial alphanumeric_keys xkb_symbols "colemak_gr_34" { -// The gr(basic) layout includes lv1-2 and then specifies lv3-4 separately like this +// The gr(basic) layout includes lv1-2 and then specifies lv3-4 separately like this name[Group1]= "Greek (Colemak levels 3-4)"; key { [ NoSymbol, NoSymbol, dead_acute, dead_psili ] }; // q @@ -293,7 +293,7 @@ xkb_symbols "colemak_gr_34" { 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. +// 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, §, § ] }; // ϋ Ϋ @@ -301,4 +301,4 @@ xkb_symbols "colemak_gr_eD" { key { [ bracketleft, braceleft, U0314, U1FFE ] }; // comb./plain Gr. Dasia key { [ bracketright, braceright, U0313, U1FBF ] }; // comb./plain Gr. Psili }; -// <-- DreymaR: Additions to xkb/symbols/gr +// <-- DreymaR: Additions to xkb/symbols/gr diff --git a/xkb-data_xmod/xkb/symbols/group b/xkb-data_xmod/xkb/symbols/group index 2174248..1c998f8 100644 --- a/xkb-data_xmod/xkb/symbols/group +++ b/xkb-data_xmod/xkb/symbols/group @@ -467,24 +467,24 @@ xkb_symbols "lctrl_lwin_toggle" { }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2013: Additions to xkb/symbols/group -// The Left Ctrl key (while pressed) chooses the second group. -// (Needed mainly for mirrored layouts.) +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2013: Additions to xkb/symbols/group +// The Left Ctrl key (while pressed) chooses the second group. +// (Needed mainly for mirrored layouts.) partial modifier_keys xkb_symbols "lctrl_switch" { key { symbols[Group1]= [ Mode_switch ] }; -}; // lctrl_switch +}; // lctrl_switch -// The Right Control key (while pressed) chooses the next group. -// Control_L+Control_R toggles groups. +// The Right Control key (while pressed) chooses the next group. +// Control_L+Control_R toggles groups. partial modifier_keys xkb_symbols "rctrl_switch_ctrls_toggle" { key { type[ Group1 ] = "PC_CONTROL_LEVEL2", symbols[ Group1 ] = [ Mode_switch, ISO_Next_Group ] }; -}; // rctrl_switch_ctrls_toggle -// <-- DreymaR: Additions to xkb/symbols/group +}; // rctrl_switch_ctrls_toggle +// <-- DreymaR: Additions to xkb/symbols/group diff --git a/xkb-data_xmod/xkb/symbols/hr b/xkb-data_xmod/xkb/symbols/hr index 7ec4099..40492ba 100644 --- a/xkb-data_xmod/xkb/symbols/hr +++ b/xkb-data_xmod/xkb/symbols/hr @@ -65,33 +65,33 @@ xkb_symbols "unicodeus" { name[Group1]= "Croatian (US, with Croatian digraphs)"; }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-10: Additions to xkb/symbols/hr -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Croatian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-10: Additions to xkb/symbols/hr +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Croatian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "hr(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Croatian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, dead_abovering ] }; // key { [ NoSymbol, NoSymbol, EuroSign, dead_abovering ] }; // 'degree' is mapped on dead_abovering key { [ ccaron, Ccaron, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Croatian, necessary local letters are added to designated flexible spots in the layout. -// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Croatian, necessary local letters are added to designated flexible spots in the layout. +// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "rs(cmk_ed_us)" name[Group1]= "Croatian (Colemak[eD], unified symbols)"; }; -// <-- DreymaR: Additions to xkb/symbols/hr +// <-- DreymaR: Additions to xkb/symbols/hr diff --git a/xkb-data_xmod/xkb/symbols/hu b/xkb-data_xmod/xkb/symbols/hu index c8366fc..dab055a 100644 --- a/xkb-data_xmod/xkb/symbols/hu +++ b/xkb-data_xmod/xkb/symbols/hu @@ -604,30 +604,30 @@ key.type[Group1]="FOUR_LEVEL_SEMIALPHABETIC"; }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/hu -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Hungarian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/hu +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Hungarian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "hu(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Hungarian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, degree ] }; // key { [ NoSymbol, NoSymbol, EuroSign, degree ] }; // dead_abovering is lost key { [ eacute, Eacute, dollar, cent ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Hungarian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Hungarian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -635,9 +635,9 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Hungarian (Colemak[eD], unified symbols)"; -// In Hungarian, á/é/ö are common (Furedi/Kelemen(1989) frequencies: eatlnskomzrigáéydbvhjöfupőócüíúűxw) -// Acute accent is used a lot (áéóíú); umlaut (öü) and doubleacute (őű) some; accessible dead keys would be nice -// From frequencies alone it seems x and w should go instead but that's unwise in an international world! +// In Hungarian, á/é/ö are common (Furedi/Kelemen(1989) frequencies: eatlnskomzrigáéydbvhjöfupőócüíúűxw) +// Acute accent is used a lot (áéóíú); umlaut (öü) and doubleacute (őű) some; accessible dead keys would be nice +// From frequencies alone it seems x and w should go instead but that's unwise in an international world! // key { [ bracketleft, braceleft, dead_acute, dead_doubleacute ] }; // key { [ bracketright, braceright, dead_doubleacute, dead_diaeresis ] }; @@ -645,14 +645,14 @@ xkb_symbols "cmk_ed_us" { key { [ dead_doubleacute, dead_diaeresis, bracketright, braceright ] }; // easier accents key { [ odiaeresis, Odiaeresis, udiaeresis, Udiaeresis ] }; // from / -//// One alternative is to provide áéó, öü and őű on AltGr mappings: +//// One alternative is to provide áéó, öü and őű on AltGr mappings: // key { [ eacute, Eacute, bracketleft, braceleft ] }; // from // key { [ odiaeresis, Odiaeresis, bracketright, braceright ] }; // from // key { [ aacute, Aacute, oe, OE ] }; // from -// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. +// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. // key { [ k, K, odoubleacute, Odoubleacute ] }; // from // key { [ h, H, oacute, Oacute ] }; // from // key { [ j, J, udiaeresis, Udiaeresis ] }; // from // key { [ l, L, udoubleacute, Udoubleacute ] }; // from }; -// <-- DreymaR: Additions to xkb/symbols/hu +// <-- DreymaR: Additions to xkb/symbols/hu diff --git a/xkb-data_xmod/xkb/symbols/il b/xkb-data_xmod/xkb/symbols/il index 8a19d60..0106169 100644 --- a/xkb-data_xmod/xkb/symbols/il +++ b/xkb-data_xmod/xkb/symbols/il @@ -322,16 +322,16 @@ xkb_symbols "biblicalSIL" { key { [ space, space, thinspace, nobreakspace ] };//space space thin space, nbsp }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-08: Additions to xkb/symbols/il -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-08: Additions to xkb/symbols/il +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales partial alphanumeric_keys xkb_symbols "colemak" { include "il(phonetic)" -// The phonetic layout for Hebrew is il(phonetic)???; this is a Colemak translation. -// TODO: Proper implementation with more glyphs, like the SIL Biblical!?! -// NOTE: The basic layout didn't define some keys (no Space?); I've no idea why. +// The phonetic layout for Hebrew is il(phonetic)???; this is a Colemak translation. +// TODO: Proper implementation with more glyphs, like the SIL Biblical!?! +// 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. include "nbsp(level4)" name[Group1]= "Hebrew (Colemak, phonetic)"; @@ -364,11 +364,11 @@ xkb_symbols "colemak" { partial alphanumeric_keys xkb_symbols "colemak_il" { include "il(basic)" -// The default layout for Israel is il(basic); this is a Colemak translation. -// Based on the latin letters on the keys, it's not phonetic but maybe easier for some. -// I moved the key on to , just like the standard Colemak does. -// 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. +// The default layout for Israel is il(basic); this is a Colemak translation. +// Based on the latin letters on the keys, it's not phonetic but maybe easier for some. +// I moved the key on to , just like the standard Colemak does. +// 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. include "nbsp(level4)" name[Group1]= "Hebrew (Colemak, Israel)"; @@ -393,4 +393,4 @@ xkb_symbols "colemak_il" { key { [ hebrew_lamed, K ] }; }; -// <-- DreymaR: Additions to xkb/symbols/il +// <-- DreymaR: Additions to xkb/symbols/il diff --git a/xkb-data_xmod/xkb/symbols/is b/xkb-data_xmod/xkb/symbols/is index 1e21de6..2b1ce70 100644 --- a/xkb-data_xmod/xkb/symbols/is +++ b/xkb-data_xmod/xkb/symbols/is @@ -283,30 +283,30 @@ xkb_symbols "dvorak" { include "level3(ralt_switch)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/is -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Icelandic. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/is +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Icelandic. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "is(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Icelandic (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ ae, AE, asciicircum, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Icelandic, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Icelandic, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -314,8 +314,8 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Icelandic (Colemak[eD], unified symbols)"; -// Icelandic letters: Áá/Íí/Óó/Éé/Úú/Ýý 5.9% (1.8/1.6/1.0/0.7/0.6/0.2); Ðð 4.4%; Þþ 1.5%; Ææ 0.9%; Öö 0.8%. -// Need a good dead_acute. Keep Ææ on AltGr+Aa; Þþ on AltGr+Tt may be replaced with Öö. +// Icelandic letters: Áá/Íí/Óó/Éé/Úú/Ýý 5.9% (1.8/1.6/1.0/0.7/0.6/0.2); Ðð 4.4%; Þþ 1.5%; Ææ 0.9%; Öö 0.8%. +// Need a good dead_acute. Keep Ææ on AltGr+Aa; Þþ on AltGr+Tt may be replaced with Öö. // key { [ dead_acute, dead_circumflex, bracketright, braceright ] }; //from // key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; //from @@ -329,4 +329,4 @@ xkb_symbols "cmk_ed_us" { key { [ d, D, aring, Aring ] }; // keep Åå // key { [ h, H, ae, AE ] }; // keep æÆ }; -// <-- DreymaR: Additions to xkb/symbols/is +// <-- DreymaR: Additions to xkb/symbols/is diff --git a/xkb-data_xmod/xkb/symbols/it b/xkb-data_xmod/xkb/symbols/it index d3a29c6..67f8ac3 100644 --- a/xkb-data_xmod/xkb/symbols/it +++ b/xkb-data_xmod/xkb/symbols/it @@ -420,30 +420,30 @@ partial alphanumeric_keys key { [ uacute, section, ugrave, dead_breve ] }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/it -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Italian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/it +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Italian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "it(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Italian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ ograve, ccedilla, at, dead_cedilla ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Italian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Italian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -451,10 +451,10 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Italian (Colemak[eD], unified symbols)"; -// NEEDED: Grave eauoi (0.42-0.09% but on Wikipedia àèù 0.64-0.17%; ìò 0.03-0.002%); é (0.06%) -// Also ç (Ligurian); ł (Venetian). In it(basic), these are on lv1-2 mappings (but ł isn't there). -// In it(basic), ñÑ are on nN lv3-4. I optionally provide ñ but for Ñ use the dead_tilde. -// NOTE: Also consider the es/latam cmk_ed_us layouts for a strong deadkey-based approach (better, in my opinion). +// NEEDED: Grave eauoi (0.42-0.09% but on Wikipedia àèù 0.64-0.17%; ìò 0.03-0.002%); é (0.06%) +// Also ç (Ligurian); ł (Venetian). In it(basic), these are on lv1-2 mappings (but ł isn't there). +// In it(basic), ñÑ are on nN lv3-4. I optionally provide ñ but for Ñ use the dead_tilde. +// NOTE: Also consider the es/latam cmk_ed_us layouts for a strong deadkey-based approach (better, in my opinion). // key { [ bracketleft, braceleft, egrave, eacute ] }; // key { [ bracketright, braceright, agrave, ograve ] }; @@ -463,4 +463,4 @@ xkb_symbols "cmk_ed_us" { key { [ ugrave, igrave, oe, OE ] }; // / // key { [ k, K, ccedilla, ntilde ] }; // / }; -// <-- DreymaR: Additions to xkb/symbols/it +// <-- DreymaR: Additions to xkb/symbols/it diff --git a/xkb-data_xmod/xkb/symbols/latam b/xkb-data_xmod/xkb/symbols/latam index 1ef65f4..a3954eb 100644 --- a/xkb-data_xmod/xkb/symbols/latam +++ b/xkb-data_xmod/xkb/symbols/latam @@ -128,12 +128,12 @@ xkb_symbols "dvorak" { include "level3(ralt_switch)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/latam -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Spanish (Latin American). -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/latam +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Spanish (Latin American). +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "latam(basic)" @@ -143,9 +143,9 @@ xkb_symbols "cmk_ed_ks" { key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Spanish (Latin American), necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Spanish (Latin American), necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -160,7 +160,7 @@ 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 -// Note: For ordfeminine/masculine, use AltGr+o/O -// NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. +// NOTE: For ordfeminine/masculine, use AltGr+o/O which should be an easy reach. +// NOTE: The es and latam layouts have been harmonized; this should not affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/latam +// <-- DreymaR: Additions to xkb/symbols/latam diff --git a/xkb-data_xmod/xkb/symbols/level5 b/xkb-data_xmod/xkb/symbols/level5 index 3e3ca06..3304eea 100644 --- a/xkb-data_xmod/xkb/symbols/level5 +++ b/xkb-data_xmod/xkb/symbols/level5 @@ -151,12 +151,12 @@ xkb_symbols "rwin_switch_lock_cancel" { }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2011-05: Additions to xkb/symbols/level5 -// The CapsLock Level5 switches are good for Extend overlay mappings using Caps as an Extend modifier -// The Left Ctrl Level5 switches are good for Extend overlay mappings if you're using Caps as Left Ctrl -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2011-05: Additions to xkb/symbols/level5 +// The CapsLock Level5 switches are good for Extend overlay mappings using Caps as an Extend modifier +// The Left Ctrl Level5 switches are good for Extend overlay mappings if you're using Caps as Left Ctrl +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org/layers-extend.html -// The CapsLock key (while pressed) chooses the fifth shift level. Now included in xkb-data. +// The CapsLock key (while pressed) chooses the fifth shift level. Now included in xkb-data. //partial modifier_keys //xkb_symbols "caps_switch" { // key { @@ -166,7 +166,7 @@ xkb_symbols "rwin_switch_lock_cancel" { // include "level5(modifier_mapping)" //}; -// CapsLock chooses 5th level, locks when pressed together with another 5th-level-chooser +// CapsLock chooses 5th level, locks when pressed together with another 5th-level-chooser partial modifier_keys xkb_symbols "caps_switch_lock" { include "level5(lock)" @@ -177,7 +177,7 @@ xkb_symbols "caps_switch_lock" { }; }; -// CapsLock chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser +// CapsLock chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser partial modifier_keys xkb_symbols "caps_switch_lock_cancel" { include "level5(lock)" @@ -188,7 +188,7 @@ xkb_symbols "caps_switch_lock_cancel" { }; }; -// The Left Ctrl key (while pressed) chooses the fifth shift level. +// The Left Ctrl key (while pressed) chooses the fifth shift level. partial modifier_keys xkb_symbols "lctl_switch" { key { @@ -198,7 +198,7 @@ xkb_symbols "lctl_switch" { include "level5(modifier_mapping)" }; -// Left Ctrl chooses 5th level, locks when pressed together with another 5th-level-chooser +// Left Ctrl chooses 5th level, locks when pressed together with another 5th-level-chooser partial modifier_keys xkb_symbols "lctl_switch_lock" { include "level5(lock)" @@ -209,7 +209,7 @@ xkb_symbols "lctl_switch_lock" { }; }; -// Left Ctrl chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser +// Left Ctrl chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser partial modifier_keys xkb_symbols "lctl_switch_lock_cancel" { include "level5(lock)" @@ -219,4 +219,4 @@ xkb_symbols "lctl_switch_lock_cancel" { ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; -// <-- DreymaR: Additions to xkb/symbols/level5 +// <-- DreymaR: Additions to xkb/symbols/level5 diff --git a/xkb-data_xmod/xkb/symbols/nl b/xkb-data_xmod/xkb/symbols/nl index 9ab3744..e7eabb4 100644 --- a/xkb-data_xmod/xkb/symbols/nl +++ b/xkb-data_xmod/xkb/symbols/nl @@ -149,29 +149,29 @@ partial alphanumeric_keys include "sun_vndr/nl(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/nl -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Dutch. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/nl +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Dutch. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "nl(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Dutch (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ plus, plusminus, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Dutch, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Dutch, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -182,4 +182,4 @@ xkb_symbols "cmk_ed_us" { key { [dead_diaeresis,dead_circumflex, bracketleft, braceleft ] }; // kept key { [ dead_acute, dead_grave, bracketright, braceright ] }; // from }; -// <-- DreymaR: Additions to xkb/symbols/nl +// <-- DreymaR: Additions to xkb/symbols/nl diff --git a/xkb-data_xmod/xkb/symbols/no b/xkb-data_xmod/xkb/symbols/no index 4b1f2d6..27d384c 100644 --- a/xkb-data_xmod/xkb/symbols/no +++ b/xkb-data_xmod/xkb/symbols/no @@ -266,30 +266,30 @@ partial alphanumeric_keys include "sun_vndr/no(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/no -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Norwegian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/no +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Norwegian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "no(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Norwegian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, permille is lost key { [ oslash, Ooblique, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Norwegian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Norwegian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -302,6 +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 -// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. +// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/no +// <-- DreymaR: Additions to xkb/symbols/no diff --git a/xkb-data_xmod/xkb/symbols/pl b/xkb-data_xmod/xkb/symbols/pl index 8096617..2fdab1c 100644 --- a/xkb-data_xmod/xkb/symbols/pl +++ b/xkb-data_xmod/xkb/symbols/pl @@ -541,25 +541,25 @@ xkb_symbols "glagolica" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/pl -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Polish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/pl +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Polish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// This variant keeps the national symbol and special letter setup (from the "basic" variant). +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "pl(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Polish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, NoSymbol ] }; // key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // The pl(basic) layout has EuroSign on '5' -// NOTE: The Polish standard layout has its locale letters on AltGr letter keys. Some have been converted here. +// NOTE: The Polish standard layout has its locale letters on AltGr letter keys. Some have been converted here. key { [ l, L, lstroke, Lstroke ] }; key { [ a, A, aogonek, Aogonek ] }; key { [ s, S, sacute, Sacute ] }; @@ -573,8 +573,8 @@ xkb_symbols "cmk_ed_ks" { key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Polish, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Polish, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -589,6 +589,6 @@ xkb_symbols "cmk_ed_us" { key { [ zabovedot, Zabovedot, oe, OE ] }; // QWERTZ key { [ dead_acute, dead_acute, bracketleft, braceleft ] }; // by frequency key { [ dead_ogonek, dead_ogonek, bracketright, braceright ] }; // QWERTZ -// Note: I consider level1 access to the accents paramount; lstroke should be an easy reach on AltGr+l I hope? +// NOTE: I consider level1 access to the accents paramount; lstroke should be an easy reach on AltGr+l I hope? }; -// <-- DreymaR: Additions to xkb/symbols/pl +// <-- DreymaR: Additions to xkb/symbols/pl diff --git a/xkb-data_xmod/xkb/symbols/pt b/xkb-data_xmod/xkb/symbols/pt index f44f88e..4220903 100644 --- a/xkb-data_xmod/xkb/symbols/pt +++ b/xkb-data_xmod/xkb/symbols/pt @@ -212,29 +212,29 @@ partial alphanumeric_keys include "sun_vndr/pt(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/pt -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Portuguese. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/pt +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Portuguese. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "pt(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Portuguese (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Portuguese, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Portuguese, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -249,8 +249,8 @@ 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 -// 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. +// NOTE: For ordfeminine/masculine, use AltGr+o/O which should be an easy reach. +// NOTE: The es and latam 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. }; -// <-- DreymaR: Additions to xkb/symbols/pt +// <-- DreymaR: Additions to xkb/symbols/pt diff --git a/xkb-data_xmod/xkb/symbols/ro b/xkb-data_xmod/xkb/symbols/ro index 5ca198a..27400d0 100644 --- a/xkb-data_xmod/xkb/symbols/ro +++ b/xkb-data_xmod/xkb/symbols/ro @@ -235,27 +235,27 @@ partial alphanumeric_keys include "sun_vndr/ro(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/ro -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Romanian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/ro +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Romanian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "ro(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Romanian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, dead_abovering ] }; // key { [ NoSymbol, NoSymbol, EuroSign, dead_abovering ] }; // dead_abovering is moved key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] -// NOTE: The Romanian standard layout has its locale letters on AltGr letter keys. Some have been converted here. +// NOTE: The Romanian standard layout has its locale letters on AltGr letter keys. Some have been converted here. key { [ q, Q, acircumflex, Acircumflex ] }; key { [ w, W, ssharp, any ] }; key { [ p, P, section, any ] }; @@ -267,9 +267,9 @@ xkb_symbols "cmk_ed_ks" { key { [ i, I, icircumflex, Icircumflex ] }; }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Romanian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Romanian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -277,9 +277,9 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Romanian (Colemak[eD], unified symbols)"; -// NEEDED: Circumflex A/I; breve A/I (the I for Crimean Tatars); commabelow S/T; stroke D/L (?) -// Romanian letter frequencies: ă 2.3%(?); î 1.4%(?); others < 0.1%(?) (şţâ...). In ro(basic), all are lv3-4. -// NOTE: Commabelow, not cedilla, is correct for S/T. The dead_cedilla key can produce the latter if desired. +// NEEDED: Circumflex A/I; breve A/I (the I for Crimean Tatars); commabelow S/T; stroke D/L (?) +// Romanian letter frequencies: ă 2.3%(?); î 1.4%(?); others < 0.1%(?) (şţâ...). In ro(basic), all are lv3-4. +// NOTE: Commabelow, not cedilla, is correct for S/T. The dead_cedilla key can produce the latter if desired. // key { [ bracketleft, braceleft, abreve, Abreve ] }; // key { [ bracketright, braceright, icircumflex, Icircumflex ] }; @@ -289,9 +289,9 @@ xkb_symbols "cmk_ed_us" { key { [ s, S, 0x1000219, 0x1000218 ] }; // comma-s from 's' key { [ t, T, 0x100021b, 0x100021a ] }; // comma-t from 't' key { [ d, D, dstroke, Dstroke ] }; // from 'd' -// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. +// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. key { [ h, H, ssharp, section ] }; // from Cmk[eD] 's' key { [ k, K, ibreve, Ibreve ] }; // Crimean Tatar key { [ l, L, lstroke, Lstroke ] }; // from 'l' }; -// <-- DreymaR: Additions to xkb/symbols/ro +// <-- DreymaR: Additions to xkb/symbols/ro diff --git a/xkb-data_xmod/xkb/symbols/rs b/xkb-data_xmod/xkb/symbols/rs index 7b20b8b..9910056 100644 --- a/xkb-data_xmod/xkb/symbols/rs +++ b/xkb-data_xmod/xkb/symbols/rs @@ -328,30 +328,30 @@ xkb_symbols "combiningkeys" { key { [ any, any, U0304 ] }; // -, U0304 = COMBINING MACRON }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-10: Additions to xkb/symbols/rs -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Serbian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-10: Additions to xkb/symbols/rs +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Serbian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "rs(latin)" include "colemak(cmk_ed_letters)" name[Group1]= "Serbian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, dead_abovering ] }; // key { [ NoSymbol, NoSymbol, EuroSign, dead_abovering ] }; // 'degree' is mapped on dead_abovering key { [ ccaron, Ccaron, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Serbian, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Serbian, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -359,8 +359,8 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Serbian (Colemak[eD], unified symbols)"; -// NEEDED: Caron Cc/Ss/Zz; Acute Cc; stroke Dd. -// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. +// NEEDED: Caron Cc/Ss/Zz; Acute Cc; stroke Dd. +// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. // - The digraphs NJ, LJ and DŽ are not included by default but as optional AltGr mappings. // - I suggest lv1 dead_caron for the 3 caron letters, but I also provide the option for AltGr mappings. @@ -369,7 +369,7 @@ xkb_symbols "cmk_ed_us" { // key { [ bracketright, braceright, dead_caron, dead_caron ] }; // from key { [ dstroke, Dstroke, bracketleft, braceleft ] }; // on key { [ dead_caron, dead_caron, bracketright, braceright ] }; // from ++ -// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. +// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. // key { [ k, K, ccaron, Ccaron ] }; // from // key { [ h, H, zcaron, Zcaron ] }; // from // key { [ l, L, scaron, Scaron ] }; // from @@ -379,4 +379,4 @@ xkb_symbols "cmk_ed_us" { // key { [ j, J, U1CC, U1CB ] }; // NJ digraph // key { [ l, L, U1C9, U1C8 ] }; // LJ digraph }; -// <-- DreymaR: Additions to xkb/symbols/rs +// <-- DreymaR: Additions to xkb/symbols/rs diff --git a/xkb-data_xmod/xkb/symbols/ru b/xkb-data_xmod/xkb/symbols/ru index e11a472..698cc7a 100644 --- a/xkb-data_xmod/xkb/symbols/ru +++ b/xkb-data_xmod/xkb/symbols/ru @@ -960,25 +960,25 @@ xkb_symbols "prxn" { // https://bugs.freedesktop.org/show_bug.cgi?id=102189 }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/pl -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Polish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/pl +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Polish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// This variant keeps the national symbol and special letter setup (from the "basic" variant). +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "pl(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Polish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, NoSymbol ] }; // key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // The pl(basic) layout has EuroSign on '5' -// NOTE: The Polish standard layout has its locale letters on AltGr letter keys. Some have been converted here. +// NOTE: The Polish standard layout has its locale letters on AltGr letter keys. Some have been converted here. key { [ l, L, lstroke, Lstroke ] }; key { [ a, A, aogonek, Aogonek ] }; key { [ s, S, sacute, Sacute ] }; @@ -992,8 +992,8 @@ xkb_symbols "cmk_ed_ks" { key { [ semicolon, colon, dead_diaeresis, ellipsis ] }; // Colemak[eD] }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Polish, necessary local letters are added to designated flexible spots in the layout. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Polish, necessary local letters are added to designated flexible spots in the layout. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -1008,6 +1008,6 @@ xkb_symbols "cmk_ed_us" { key { [ zabovedot, Zabovedot, oe, OE ] }; // QWERTZ key { [ dead_acute, braceleft, bracketleft, dstroke ] }; // by frequency key { [ dead_ogonek, braceright, bracketright, Greek_alpha ] }; // QWERTZ -// Note: I consider level1 access to the accents paramount; lstroke should be an easy reach on AltGr+l I hope? +// NOTE: I consider level1 access to the accents paramount; lstroke should be an easy reach on AltGr+l I hope? }; -// <-- DreymaR: Additions to xkb/symbols/pl +// <-- DreymaR: Additions to xkb/symbols/pl diff --git a/xkb-data_xmod/xkb/symbols/se b/xkb-data_xmod/xkb/symbols/se index 07f0c4b..db8453d 100644 --- a/xkb-data_xmod/xkb/symbols/se +++ b/xkb-data_xmod/xkb/symbols/se @@ -396,30 +396,30 @@ xkb_symbols "us_dvorak" { include "level3(ralt_switch)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/se -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Swedish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/se +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Swedish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "se(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Swedish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, NoSymbol ] }; // key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // The se(basic) layout has EuroSign on '5' key { [odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Swedish, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Swedish, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -436,6 +436,6 @@ xkb_symbols "cmk_ed_us" { key { [ adiaeresis, Adiaeresis, bracketright, braceright ] }; // from key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; // from // key { [ h, H, ae, AE ] }; // keep æÆ -// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. +// NOTE: The Scandinavian layouts (dk/fi/no/se) have been harmonized. This shouldn't affect typing efficiency. }; -// <-- DreymaR: Additions to xkb/symbols/se +// <-- DreymaR: Additions to xkb/symbols/se diff --git a/xkb-data_xmod/xkb/symbols/si b/xkb-data_xmod/xkb/symbols/si index a1408d7..159a07f 100644 --- a/xkb-data_xmod/xkb/symbols/si +++ b/xkb-data_xmod/xkb/symbols/si @@ -28,33 +28,33 @@ xkb_symbols "alternatequotes" { key { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-10: Additions to xkb/symbols/si -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Slovenian. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2014-10: Additions to xkb/symbols/si +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Slovenian. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "si(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Slovenian (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, dead_abovering ] }; // key { [ NoSymbol, NoSymbol, EuroSign, dead_abovering ] }; // 'degree' is mapped on dead_abovering key { [ ccaron, Ccaron, dead_acute, dead_doubleacute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Slovenian, necessary local letters are added to designated flexible spots in the layout. -// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Slovenian, necessary local letters are added to designated flexible spots in the layout. +// NOTE: - Bosnian(ba), Croatian(hr), Slovenian(si) and Serbian(sr) layouts are harmonized. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "rs(cmk_ed_us)" name[Group1]= "Slovenian (Colemak[eD], unified symbols)"; }; -// <-- DreymaR: Additions to xkb/symbols/si +// <-- DreymaR: Additions to xkb/symbols/si diff --git a/xkb-data_xmod/xkb/symbols/tr b/xkb-data_xmod/xkb/symbols/tr index 7106bdc..24a50bf 100644 --- a/xkb-data_xmod/xkb/symbols/tr +++ b/xkb-data_xmod/xkb/symbols/tr @@ -355,33 +355,33 @@ partial alphanumeric_keys include "sun_vndr/tr(sun_type6)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/tr -// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Turkish. -// 2006-01-01 Shai Coleman, http://colemak.com/ -// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/tr +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Turkish. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// See the Big Bag section on Cmk[eD] locales: https://dreymar.colemak.org/variants.html#locales -// The 'keep local symbols' variant keeps the national symbol and special letter setup. +// The 'keep local symbols' variant keeps the national symbol and special letter setup. partial alphanumeric_keys xkb_symbols "cmk_ed_ks" { include "tr(basic)" include "colemak(cmk_ed_letters)" name[Group1]= "Turkish (Colemak[eD], keep local symbols)"; -// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. -// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. -// Colemak[eD] has EuroSign on 'E' and mu on '5'. +// NOTE: Symbols on letter keys may be lost in cmk_ed_ks if they are not on Colemak[eD] letter keys. +// EuroSign is often on 'E'. The latin(intl) and locale(winkeys) layout variants use '5'. +// Colemak[eD] has EuroSign on 'E' and mu on '5'. // key { [ NoSymbol, NoSymbol, mu, onehalf ] }; // key { [ NoSymbol, NoSymbol, EuroSign, onehalf ] }; // onehalf is moved, threeeights is lost -// NOTE: The Turkish layout has idotless where QWERTY has i; this has been added here. +// NOTE: The Turkish layout has idotless where QWERTY has i; this has been added here. key { [ idotless, I, any, any ] }; key { [ scedilla, Scedilla, acute, dead_acute ] }; // from }; -// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. -// For Turkish, necessary local letters are added to designated flexible spots in the layout. -// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Turkish, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { include "colemak(cmk_ed_letters)" @@ -389,17 +389,17 @@ xkb_symbols "cmk_ed_us" { include "level3(ralt_switch)" name[Group1]= "Turkish (Colemak[eD], unified symbols)"; -// - Turkish doesn't use QWX and J is rare, but they need to be kept in place because of English etc! -// - ıİ (3.9%) üÜ (1.8%) şŞ (1.6%) çÇ (1.4%) ğĞ (0.9%) öÖ (0.7%) are needed -// - The 'I' key holds ıI and iİ in the 'tr' layout -// - â îÎ ôÔ are on lv3-4 of 'AIO' -// - êÊ îÎ ûÛ are needed for Kurdish; íÍ (on 'F') ĭĬ (on 'J') ñÑ (on 'N') for Crimean Tatar -// - üÜ on '[{' is consistent with other locales (e.g., de); however, the tr layout has it on ']}'! -// - Putting ıI on 'I', iİ goes to or ']}'? -// - I already have çÇ on 'K'; this should suffice as it's an easy enough reach (even 1-handed, using a Wide mod)? -// - Similarly, ğĞ isn't so common that it can't be on 'G' (and ĭĬ on 'J') -// - I feel that öÖ is easy to write with the dead_diaeresis key on ';:' - but maybe not sufficiently? -// - There should be a lv1-2 dead_circumflex?!? It's not easy to reach on AltGr+6. +// - Turkish doesn't use QWX and J is rare, but they need to be kept in place because of English etc! +// - ıİ (3.9%) üÜ (1.8%) şŞ (1.6%) çÇ (1.4%) ğĞ (0.9%) öÖ (0.7%) are needed +// - The 'I' key holds ıI and iİ in the 'tr' layout +// - â îÎ ôÔ are on lv3-4 of 'AIO' +// - êÊ îÎ ûÛ are needed for Kurdish; íÍ (on 'F') ĭĬ (on 'J') ñÑ (on 'N') for Crimean Tatar +// - üÜ on '[{' is consistent with other locales (e.g., de); however, the tr layout has it on ']}'! +// - Putting ıI on 'I', iİ goes to or ']}'? +// - I already have çÇ on 'K'; this should suffice as it's an easy enough reach (even 1-handed, using a Wide mod)? +// - Similarly, ğĞ isn't so common that it can't be on 'G' (and ĭĬ on 'J') +// - I feel that öÖ is easy to write with the dead_diaeresis key on ';:' - but maybe not sufficiently? +// - There should be a lv1-2 dead_circumflex?!? It's not easy to reach on AltGr+6. // key { [ bracketleft, braceleft, i, Iabovedot ] }; // key { [ bracketright, braceright, udiaeresis, Udiaeresis ] }; @@ -410,9 +410,9 @@ xkb_symbols "cmk_ed_us" { key { [ scedilla, Scedilla, odiaeresis, Odiaeresis ] }; // from tr / // key { [ dead_circumflex, dead_tilde, odiaeresis, Odiaeresis ] }; // needed '^'; tr // key { [ s, S, scedilla, Scedilla ] }; // from tr -// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. +// NOTE: The Curl(DH) ergo mod moves H and K, which may interfere with these mappings. // key { [ h, H, ssharp, section ] }; // from Cmk[eD] 's' key { [ g, G, gbreve, Gbreve ] }; // from tr key { [ k, K, ibreve, Ibreve ] }; // Crimean Turkish }; -// <-- DreymaR: Additions to xkb/symbols/tr +// <-- DreymaR: Additions to xkb/symbols/tr diff --git a/xkb-data_xmod/xkb/symbols/us b/xkb-data_xmod/xkb/symbols/us index 64637a5..8dadde5 100644 --- a/xkb-data_xmod/xkb/symbols/us +++ b/xkb-data_xmod/xkb/symbols/us @@ -802,24 +802,24 @@ xkb_symbols "colemak" { include "level3(ralt_switch)" }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/us -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 - -// 'Colemak - edition DreymaR'/'Cmk[eD]' symbols for xkb on X.Org Server 7.x -// 2006-01-01 Shai Coleman, http://colemak.com/ -// 2012-01-01 OEystein Bech "DreymaR" Gadmar: New shift levels 3-4. - -// DreymaR's design goals for tweaking the standard Colemak: -// - Keeping level 1-2 of Colemak intact! This is what I think of as the Colemak layout per se. -// - Dead keys easily accessible as unshifted AltGr+symbol keys; common ones in good positions. -// - Added symbols/greek (similar to, e.g., the Mac ones) allowing common math/tech/etc typing. -// - Added letters/quotes allowing many of the major latin scripts to be written correctly. -// - The positions of added letters and symbols should as far as possible be easy to remember. -// - A modular system allows flexible layout definition using different modifier keys and symbols -// * The symbol keys including the number row may be kept unchanged (national variant setups) -// * Due to the nature of the layout, this does not extend to the semicolon key! -// - The brackets (lvl3-4) and the LSGT key hold the most common locale-specific letter glyphs. -// * See the colemak_template symbols file for more info on local Colemak[eD] variants. +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2012-01: Additions to xkb/symbols/us +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org +// +// 'Colemak - edition DreymaR (Cmk-eD)' symbols, for the XKeyboardConfig xkb-data package +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-01-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : New shift levels 3-4. +// +// DreymaR's design goals for tweaking the standard Colemak: +// - Keeping level 1-2 of Colemak intact! This is what I think of as the Colemak layout per se. +// - Dead keys easily accessible as unshifted AltGr+symbol keys; common ones in good positions. +// - Added symbols/greek (similar to, e.g., the Mac ones) allowing common math/tech/etc typing. +// - Added letters/quotes allowing many of the major latin scripts to be written correctly. +// - The positions of added letters and symbols should as far as possible be easy to remember. +// - A modular system allows flexible layout definition using different modifier keys and symbols +// * The symbol keys including the number row may be kept unchanged (national variant setups) +// * Due to the nature of the layout, this does not extend to the semicolon key! +// - The brackets (lvl3-4) and the LSGT key hold the most common locale-specific letter glyphs. +// * See the colemak_template symbols file for more info on local Colemak[eD] variants. partial alphanumeric_keys xkb_symbols "cmk_ed_us" { @@ -827,9 +827,10 @@ xkb_symbols "cmk_ed_us" { name[Group1]= "English/Intl (Colemak, edition DreymaR)"; }; -// Tarmak symbols for xkb on X.Org Server 7.x -// 2012-01-01 OEystein Bech "DreymaR" Gadmar: Paving the way; 'Tarmak (transitional Colemak)'. -// 2006-01-01 Shai Coleman, http://colemak.com/ +// Tarmak symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-01-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Tarmak (transitional Colemak) layouts. + partial alphanumeric_keys xkb_symbols "tarmak1__e" { include "colemak(tarmak1__e)" @@ -878,10 +879,11 @@ xkb_symbols "tarmak4__etro" { // name[Group1]= "English/Intl (Tarmak4__ETOI - Colemak transitional)"; //}; -// Colemak-Curl(DH) symbols for xkb on X.Org Server 7.x -// 2015-01-18 OEystein Bech "DreymaR" Gadmar -// 2006-01-01 Shai Coleman, http://colemak.com/ -// This is the Curl-DH Colemak ergo mod by Stevep99 and DreymaR. +// Colemak-Curl(DH) symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2014-10-25 "SteveP" https://colemakmods.github.io/mod-dh/ : The Colemak-DH Curl modded layout variant. +// 2015-01-18 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Colemak[eD] Curl-DH implementations. + partial alphanumeric_keys xkb_symbols "cmk_ed_dh" { include "colemak(cmk_ed)" @@ -889,15 +891,17 @@ xkb_symbols "cmk_ed_dh" { name[Group1]= "English/Intl (Colemak[eD], Curl-DH ergo)"; }; -// 2012-04-01 OEystein Bech "DreymaR" Gadmar: Mirrored Colemak[eD] for one-handed typing -// NOTE: For use with the AWide-Slash keyboard mod only, as a second Group with a switch key. -// 2006-01-01 Shai Coleman, http://colemak.com/ +// Mirrored Colemak (one-handed typing) symbols by DreymaR, for the XKeyboardConfig xkb-data package. +// 2006-01-01 Shai Coleman http://colemak.com/ (Public Domain) : The Colemak keyboard layout. +// 2012-04-01 OEystein "DreymaR" Bech-Aase, formerly Bech Gadmar : Mirrored Colemak layouts. +// NOTE: For use with the AngleWide keyboard model, as a second Group with a switch modifier. + partial alphanumeric_keys xkb_symbols "cmk_ed_mirror" { include "colemak(cmk_ed_mirror)" name[Group1]= "English/Intl (Colemak[eD], mirrored)"; }; -// <-- DreymaR: Additions to xkb/symbols/us +// <-- DreymaR: Additions to xkb/symbols/us // I do NOT like dead-keys - the International keyboard as defined by Microsoft // does not fit my needs. Why use two keystrokes for all simple characters (eg ' diff --git a/xkb-data_xmod/xkb/types/level5 b/xkb-data_xmod/xkb/types/level5 index c553e5c..4c693d0 100644 --- a/xkb-data_xmod/xkb/types/level5 +++ b/xkb-data_xmod/xkb/types/level5 @@ -194,12 +194,12 @@ partial default xkb_types "default" { map[Lock+LevelThree+LevelFive] = Level7; map[Lock+Shift+LevelThree+LevelFive] = Level8; -// --> OEystein Bech "DreymaR" Gadmar, 2015-09: Additions to xkb/types/level5 -// Space+Shift would consume the Shift which is bad for hotkeys; added a preserve[Shift] line -// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 +// --> OEystein "DreymaR" Bech-Aase (formerly Bech Gadmar), 2015-09: Additions to xkb/types/level5 +// See "DreymaR's Big Bag of Keyboard Tricks": https://dreymar.colemak.org +// Space+Shift would consume the Shift which is bad for hotkeys; added a preserve[Shift] line preserve[Shift] = Shift; preserve[Shift+LevelFive] = Shift; -// <-- DreymaR: Additions to xkb/types/level5 +// <-- DreymaR: Additions to xkb/types/level5 preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; preserve[Lock+LevelFive] = Lock;