summaryrefslogtreecommitdiff
path: root/rules
Commit message (Collapse)AuthorAgeFilesLines
...
* move two group options to the file where they belongBenno Schulenberg2022-07-041-2/+2
| | | | | | | Having these two group options located in a different file from all the others was needlessly confusing. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* delete two space-bar options that behave identically to two othersBenno Schulenberg2022-07-042-14/+0
| | | | | | | | | | | | | | | With an explicit key type, specifying 'NoSymbol' for an upper level is exactly the same as leaving the level empty. The latter is what the options without the trailing 's' do. (The intent was probably to use VoidSymbol instead, but as no one has complained that these options don't actually clear the fourth level, and I can't see any definitions of `<SPCE>` where it would make sense to clear the hard-to-type fourth level, just drop these options.) Also trim two unneeded comments that are likely to become outdated. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* symbols/latam: remove a hobbled Colemak variantBenno Schulenberg2022-07-041-6/+0
| | | | | | | | | | | | | | | Colemak variants have a consistent order of symbols on the middle row: A R S T D H N E I O. Moving three of these symbols just to keep them in their normal QWERTY positions is not in the spirit of Colemak. Such niche adjustments are more something for the `custom` option that xkeyboard-config offers since commit 5ca9f8aea2. This fixes issue #327. Requested-by: Øystein Bech-Aase Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* symbols/ca: give Canadian CSA layout its proper name, and add the € signBenno Schulenberg2022-07-031-1/+1
| | | | | | This partially addresses issue #335. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* symbols/ca: delete the old implementation of the Canadian CSA layoutBenno Schulenberg2022-07-011-12/+0
| | | | | | | | | | | | Having two implementations of the same layout was somewhat confusing. And the old implementation was odd and difficult, requiring the user to set up two groups *and* to select the necessary options. This fixes issue #336. The newer and simpler 'multix' implementation remains available. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* add a Tamil InScript layout with Arabic numerals, and make it the defaultBenno Schulenberg2022-06-271-1/+12
| | | | | | | | | | | As documented in merge request !388, the international Arabic numerals are used far more often than the local special Tamil numerals, so make the main Tamil InScript layout use Arabic numerals, and add a layout with Tamil numerals as another option. Requested-by: Kannan M Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules/compat: remove the incomplete and faulty rules for Dvorak layoutsBenno Schulenberg2022-06-263-7/+0
| | | | | | | | | | | | | They are incomplete because, for example, 'setxkbmap dvorak it' will give you the American Dvorak layout, not the Italian one. They are faulty because, for example, 'setxkbmap dvorak ca' fails (because the rules expect the layout to be called "dvorak", not "fr-dvorak"). These rules may have been useful during a transition period of a few years, but now they are just anomalies that distract from the basic format of 'setxkbmap country-code variant-name'. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules/compat: delete an alias that should no longer be neededBenno Schulenberg2022-06-242-3/+0
| | | | | | | | | | Eighteen years ago, in commit 1bdb65affc, the inaccurately named option 'shift_toggle' was renamed to the better 'shifts_toggle', and 'shift_toggle' was added as a convenience alias for existing users of the option. For how long should such an alias be kept? Ten years seems more than enough, so it's time to drop this one. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules/xfree98: correct the names of two optionsBenno Schulenberg2022-06-241-2/+2
| | | | | Eleven years ago, commit 6b47b2e5e9 renamed several options but forgot to rename these four occurrences too.
* rules/compat: adjust whitespace, to align the columns verticallyBenno Schulenberg2022-06-246-47/+47
|
* rules/compat: remove four mappings to variants that no longer existBenno Schulenberg2022-06-201-4/+0
| | | | | | Four years ago commit 2a7cfb5cc5 renamed these Tamil layouts, making these mappings no longer work. Since no one has complained, there obviously is no need for them.
* shorten the names of some Tamil layouts, trimming the 'tam_' prefixBenno Schulenberg2022-06-201-4/+4
| | | | Having a repeated 'tam' in the name is pointless and irritating.
* rules: fix the country code for ArmeniaBenno Schulenberg2022-06-172-2/+2
| | | | | | | Commits 175077ece6 and 297bb51556 from five months ago assigned the code for Albania by mistake. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* Split Indonesia (Arab Melayu) and Indonesia (Arab Pegon)fikr4n2022-06-141-4/+10
| | | | | | | | | | | | | | | "Arab Melayu" layout was renamed to "Arab Pegon". However, Arab Melayu and Arab Pegon writing systems are actually slighly different, so that I think this was a bug. The fix is to revert Arab Pegon name to Arab Melayu and introduce a new layout named Arab Pegon which is copied and modified from Arab Melayu. For this purpose, the Arab Melayu 'phonetic' and 'phoneticx' are renamed to 'melayu-phonetic' and 'melayu-phoneticx' respectively, while the Arab Pegon one is named 'pegon-phonetic'. Additionally, both in Arab Melayu and Arab Pegon, I also add "theh" letter to the position of AltGr+Shift+S, because phonetically "theh" is closer to S, its current position at V is just a shortcut, imitating the position of "theh" in Arabic phonetic layout.
* rules: remove two rules that reference two sections that were deletedBenno Schulenberg2022-06-122-2/+0
| | | | | | | | | | Commit fe36f31e8c from three months ago removed the need for special aliases and key assignments for applealu_jis keyboards but forgot to remove the two rules that reference these sections. This fixes issue #325. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules: use backslashes instead of slashes for line continuation :\Benno Schulenberg2022-06-101-14/+14
| | | | | | | | | | This fixes #324. Reported-by: Adriaan de Groot Bug existed since commit c3c5d02a7e from six weeks ago. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules/compat: retire two aliases that should not be neededBenno Schulenberg2022-05-291-2/+0
| | | | | | | | | | These aliases may have been useful during a transition period when things were renamed and moved around, but nowadays... it's better to remove irregularities and make the user learn the proper syntax. Also, to me it seems easier to type "cz qwerty" than "cz_qwerty", and "fr latin9" than "fr-latin9". Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules/compat: retire a long-obsolete code for Serbia + MontenegroBenno Schulenberg2022-05-291-1/+0
| | | | | | | | | | | | The Union of Crna Gora and Srbija ceased to exist sixteen years ago and its country code (CS) was deleted from ISO_3166 the next year. (See, for example, https://en.wikipedia.org/wiki/ISO_3166-2:CS.) Nowadays, when a user does 'setxkbmap cs', they most likely want to set a Czech layout, not a Serbian layout, so it will be much better to fail with an error message in that case than to set a Cyrillic layout that is both unexpected and makes it impossible for the user to issue a command to get back a usable keyboard.
* Add US Workman-P layout based on US Workman with top row digits switched onlyVladimir Gorelov2022-05-221-0/+10
|
* New layout: bqnB. Wilson2022-05-221-0/+10
| | | | | | | | | | BQN [0] is a programming language in the APL family. This commit adds a new `bqn` layout supporting input of BQN symbols. Note, the `bqn` layout is not simply an `apl` variant, since BQN utilizes and entirely different symbol set. [0]:https://mlochbaum.github.io/BQN/
* rules: make a handful of toggle descriptions more grammaticalBenno Schulenberg2022-05-221-7/+7
| | | | | | | | | In English, when "both" is followed by a single noun, the noun is (understandably) in the plural: "both hands", "both feet"... [The "both" and "together" are rather pleonastic, though, but I don't want to change the first word as that would change the position of these options in the sorted list.]
* rules: make the Right-Alt group toggle override any layout's Right AltBenno Schulenberg2022-05-176-1/+5
| | | | | | | | | | | | | | Many layouts include the ralt_switch option, which meant that any such layout as non-first group would monopolize the Right-Alt key and would invalidate the group toggle -- because the grp:toggle rule would get applied only to the first layout. Correct this by applying the rule, when chosen, to every layout. This fixes https://bugs.debian.org/704209. Reported-by: Ivan Shmakov <oneingray@gmail.com> Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* symbols/group: put two options next to their brother or sistersBenno Schulenberg2022-05-161-6/+6
|
* rules: place the +group() options together, for neatnessBenno Schulenberg2022-05-165-15/+15
|
* remove pieces that are no longer needed after the previous two commitsBenno Schulenberg2022-05-131-24/+0
| | | | | | | | And some pieces that became redundant after commit 4346c44713 from six years ago: it made the Ctrls toggle rely on the plain Control modifier again instead of on the non-working LControl/RControl virtual modifiers. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* add a "Both Alts; AltGr for level 3" option for switching between groupsBenno Schulenberg2022-05-136-0/+11
| | | | | | | | | | | This allows the user to switch between layouts with the two Alt keys (to either the previous or the next group) *and* to use the right Alt key as third-level chooser. In the bargain it avoids either Alt key from producing a different symbol upon key release than upon press. This improves the fix for issue #316. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* make the "Both Alts" option for switching between groups work againBenno Schulenberg2022-05-136-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Seemingly unintentionally bundled together with massive OLPC changes, commit a8551efb70 from fifteen years ago changed the alts_toggle and ctrls_toggle to use new key types that relied on virtual modifiers, in order to address issue #122. But specifying a virtual modifier in a key assignment does not work, apparenly due to some limitation of XKM (https://gitlab.freedesktop.org/xorg/xserver/-/issues/297). It does not look like that limitation will be fixed. So, let's roll back the alts_toggle to what it was fifteen years ago when it worked. This refreshed alts_toggle may cause problems for programs that cannot cope with an Alt key that produces a different symbol upon key release than upon key press -- the user will then have to choose a different option for switching between layouts. (The ctrls_toggle was restored in commit 4346c44713, six years ago.) This fixes issue #316. It also fixes issue #43, reported by Mohammed Adnène Trojette, originally by Itaï Ben Yaacov in https://bugs.debian.org/463373. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules: correct three descriptions to say "second" instead of "last" layoutBenno Schulenberg2022-05-051-4/+4
| | | | | | | | | | | | | | | | Contrary to what the symbol `ISO_Last_Group` seems to imply, it does not select the last group that the user defined but the second group. Adjust the descriptions to reflect that. Also make a fourth description more accurate: for lctrl_lwin_rctrl_menu any Ctrl key will do -- which will be relevant when using CapsLock as Ctrl, for example, or the right Ctrl key as fifth-level chooser. Also adjust the comments in the symbols file accordingly. This addresses issue #315. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules: make the Rctrl and Caps switches for the fifth level selectableBenno Schulenberg2022-05-042-0/+15
| | | | | | | | | | | | | The Rctrl switch for the fifth level has been available for seventeen years (since commit 075eed027d), and the Caps switch for five years (since commit bb80698c2b), but were not exposed in the rules files. Also, restore the Menu switch for the fifth level that existed for a while a year ago, and make it selectable. This fixes issue #314. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules: list the codes of Indonesian languages with over 1 million speakersBenno Schulenberg2022-05-021-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://en.wikipedia.org/wiki/Languages_of_Indonesia, the following languages in Indonesia (that can be written with the Latin script and can thus use the default Indonesian layout) are spoken natively by the listed number of people: Indonesian (ind) : 210 million Javanese (jav) : 84 million Sundanese (sun) : 42 million Madurese (mad) : 13 million Minangkabau (min) : 5.5 million Buginese (bug) : 5.0 million Palembang (mui) : 3.9 million Banjarese (bjn) : 3.5 million Acehnese (ace) : 3.5 million Balinese (ban) : 3.3 million Betawi (bew) : 2.7 million Sasak (sas) : 2.1 million Makassarese (mak) : 2.1 million Toba Batak (bbc) : 1.6 million Simalungun (bts) : 1.2 million Mandailing (btm) : 1.1 million Jambi Malay (jax) : 1.0 million Gorontalo (gor) : 1.0 million In the <languageList> the codes are listed in alphabetical order, except for the code for the national language (ind).
* rules: fix two typos in the keyboard indicator commentsBenno Schulenberg2022-05-021-2/+2
|
* rules/compat: fix a typo, and remove six obsolete remappingsBenno Schulenberg2022-05-022-7/+1
| | | | | The typo was made in commit 0a5705d83d, and the symbols/srp file has not existed since commit bad7b04130, both from seventeen years ago.
* Add evdev rule for ppkb modelundef2022-04-281-0/+1
| | | | | This allows the keyboard model to be picked up automatically on wayland based systems.
* symbols/jv: move the Javanese layout to the file for IndonesiaBenno Schulenberg2022-04-261-14/+7
| | | | | | | | | Java is not a separate country, so should not have its own file, and the Javanese script can be used to write various Indonesian languages. This fixes issue #312. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rules: sort the names of multimedia keyboards alphabeticallyBenno Schulenberg2022-04-261-14/+16
|
* sort a name alphabetically, fix a typo, and reduce some whitespaceBenno Schulenberg2022-04-261-4/+3
|
* Add model for Pine64 PinePhone keyboardundef2022-04-152-1/+8
| | | | | | | | This adds a model for the Pine64 PinePhone Keyboard (https://wiki.pine64.org/wiki/PinePhone_(Pro)_Keyboard). Specifically, it implements the symbols listed on the top row of the keyboard as a third layer which are not available in the kernel driver.
* Add Abkhazian (Russia) layoutНарт Лӏыша2022-04-151-0/+9
|
* rules: make the RCtrl+RShift toggle work by adding a per-group ruleBenno Schulenberg2022-04-156-1/+5
| | | | | | | | | | | | For some reason, when there is only a general rule for an option, it gets applied (always? often?) only to the first group, which is problematic especially for group toggles, because they are meant to work in every group. Avoid the problem by explicitly defining a rule for the RCtrl+RShift toggle for every group. This fixes issue #252. Originally-reported-by: Leonard Lausen
* rules: sort some keyboard names alphabetically, and align some stuffBenno Schulenberg2022-04-1319-75/+77
| | | | | | Vertically align the rules in several of the files, using tab size 8. Also fix a typo in a Cherry keyboard name.
* Correct country codes for layouts vn(fr) and vn(us).M Hickford2022-03-231-1/+7
| | | | These are intended for users in France and USA respectively.
* Correct language codes for some layoutsM Hickford2022-03-201-1/+10
| | | | Update description for consistency
* Add Czech colemak UCW layoutMarek Maskarinec2022-02-161-0/+6
|
* Add toggling layouts via Ctrl+SpaceAlexander Konotop2022-02-086-0/+11
|
* Add Polish Colemak-DH ANSI variantfenuks2022-02-081-1/+7
|
* Turkish E keyboard layout added.𐰀𐰞𐰃:𐰺𐰃𐰔𐰀:𐰚𐰀𐰾𐰚𐰃𐰤 (𐰽𐰆𐰞𐰃𐰤𐰆𐰽)2022-02-081-0/+6
|
* Add Russian engineering keyboard layout (Ruchey)Andrey Baryshkin2022-02-081-0/+20
|
* rules: expose the existing RightAlt+RightShift group-switching optionBenno Schulenberg2022-02-081-0/+6
| | | | | | | | | The option itself has existed for ten years (since commit de45ece5ab), but was not included in the base.xml file -- probably by mistake. Fixes #221. Requested-by: Yousuf Philips
* make the Win+Space toggle work in every group by adding a rule for eachBenno Schulenberg2022-02-086-1/+5
| | | | | | | | | | | | In order for an option to override the multiple levels of a key that any of the layouts defined, the option must be applied to each group separately AND the key type must be specified explicitly for group 1. (Also improve a comment and adjust the indentation to match others.) Fixes #90. Reported-by: Oliver Majersky
* Test that each layout has at least one country and language associatedM Hickford2022-01-272-7/+350
|