[Git][xorg-team/data/xkeyboard-config][debian-unstable] 286 commits: Add the Colemak-DH-Wide keyboard layout.

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / data / xkeyboard-config

Commits:

16b8511b
by Killercat103 at 2023-02-04T19:05:25+01:00
```
Add the Colemak-DH-Wide keyboard layout.
```

6d9f17da

by Milos Kozak at 2023-02-05T14:14:42+00:00

Czech layout following to what is actually printed on the keyboard

57894f08

by Wismill at 2023-02-09T05:48:15+00:00

rules: add an option to use custom types & add locale to custom layout

A custom layout may define its own types or a user may want to
overwrite existing types. This option activates the `custom`
types file, which is user-provided.

This is a follow-up to 5ca9f8aea2876fe6926fc27f564d36eaf5ca5c8d.

bc4e4120
by Evandro at 2023-02-16T10:37:38+00:00
```
Added Russian phonetic ABNT2
```

058f3f2b

by Benno Schulenberg at 2023-03-07T16:33:03+01:00

symbols/fr: add a space before combining characters, to align them better

Also, remove a redundant include -- the AFNOR layout defines all keys.

3ab04f15

by Benno Schulenberg at 2023-03-07T16:38:46+01:00

symbols/us: remove a pointless include from the basic Workman layout

All alphanumeric keys in this basic Workman layout are defined with
just two levels, so it makes no sense to include a third-level chooser.
And the one key that had four levels (CAPS) had the same symbols on the
upper levels as on the first, so those levels provided nothing extra,
and are now removed.

This closes issue #362.

Reported-by: Jing Wang

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

43cec619
by jmcwilliams403 at 2023-03-07T16:59:53+00:00
```
Add `trademark` to level4 of two intl variants
```
f2c14935
by 800147 at 2023-03-07T17:08:41+00:00
```
Add Russian-Tatar United keyboard layout
```

50291124

by Benno Schulenberg at 2023-03-10T09:41:26+01:00

symbols/ir: fold one partial keyboard definition into another

The basic part and the extension part were always used together,
so just fold the latter into the former, for clarity.

89a7cd11

by Benno Schulenberg at 2023-03-10T11:54:33+01:00

symbols/ir: elide four includes, for a little more clarity

The several includes obscured what the actual standard Persian layout is
and how the "with keypad" variant differs from the standard.

c280c8ac

by Mujeeb Cpy at 2023-03-10T13:59:37+00:00

Add Malayalam Poorna, extended InScript Layout

Poorna layout includes all Malayalam unicode characters which are not
found in other layouts. One important use case is typesetting an old
book (Malayalam bible for example) that requires characters not present
in the other layouts. This layout also makes it easy to type
punctuations and other special characters without switching layouts.
For more details see https://poorna.smc.org.in

af8512fa

by Benno Schulenberg at 2023-03-13T13:06:46+01:00

symbols/ee: improve the basic Estonian layout

This brings the layout closer to the one that Windows has, and
puts some mildly useful characters in the place of duplicates.

* Replace two copies of the useless `¬` with `•` and `·`.
* Replace the duplicate `½` with the `€` that Windows has.
* Replace the duplicate `'` with a dead cedilla, so that
  four characters from the neighbour Latvia can be typed.
* Replace the useless `ſ` with the German `ß`, and the
  duplicate `§` with `Σ` (because it resembles a `W`).
* Replace the duplicate dead caron with a dead circumflex.
* Replace the duplicate `>` with the missing `«`.
* Replace the useless `˙` with a dead abovedot that can
  be used to type the Polish `ż`.

The duplicate `@`, `₤`, `$`, and `dead_acute` are left
in place, as there are no compelling alternatives.

This addresses and closes issue #340.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

a9f7e474
by Dmytro Poltavchenko at 2023-03-14T11:19:14+00:00
```
Remove obsolete RSTU keyboard layout and rename RUU
```

9f1d607b

by Benno Schulenberg at 2023-03-14T13:27:54+01:00

symbols/by: add the Ukrainian ghe_with_upturn to the upper levels of GHE

If the user wishes to type this character, however, they will
have to configure a level3 chooser themselves.

This kind-of addresses issue #99.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

1bb09834

by Benno Schulenberg at 2023-03-14T16:50:50+01:00

move two names to after an include, to override the latter's name

Also, remove some redundant includes (that are redundant because the
other include already includes it) and some superfluous blank lines,
and properly align a few key definitions.

75c3e615

by Benno Schulenberg at 2023-03-14T16:50:51+01:00

symbols/cm: use two includes instead of respecifying two existing layouts

735909e1

by Benno Schulenberg at 2023-03-14T17:21:17+01:00

symbols: replace some mistaken keypad keysyms with the intended symbols

The KP_n symbols on the second level in the 'azerty' layout for Cameroon
still make some sense: the keys get the type FOUR_LEVEL_KEYPAD so that
the digits will be produced when NumLock is engaged.  But in the 'dvorak'
layout the KP_n symbols were on the first level, which would lead to the
symbols from the second level to be produced when NumLock is engaged --
which is not what NumLock is supposed to do.  (Truly, NumLock is meant
only for the numeric keypad, but... let's not disturb current users.)

561998a8

by Benno Schulenberg at 2023-03-14T17:22:46+01:00

symbols/cm: rewrap some overlong comments to fit within 140 columns

Also trim some verbosity (changelogs should be in commit messages),
reshuffle comments to be closer to what they apply to, remove an
unneeded include, and trim some unneeded key-definition details.

5025f957

by Benno Schulenberg at 2023-03-14T17:22:46+01:00

symbols/dz: harmonize whitespace and transform to Uxxxx codes

Also reshuffle some comments and complete the "graphic layout".

08fd8228

by Benno Schulenberg at 2023-03-15T12:37:02+01:00

revert commit a9f7e47487, in order to redo it with a full commit message

b896a52c

by Dmytro Poltavchenko at 2023-03-17T09:02:17+01:00

Remove the obsolete RSTU keyboard layout, fix the name of RUU

* The RSTU 2019-91 standard was developed in the Ukrainian SSR back in 1991
in consideration of electronic typewriters and therefore was not officially
used in computer technology. After the collapse of the Soviet Union,
in independent Ukraine in 1996, the DSTU 3470-96 standard has been adopted.
Despite the fact that the RSTU layout was added to this repository in 2004,
officially this standard has been dead since 1991. Also, it is almost
impossible to connect old keyboards with 5-pin DIN connectors to modern
computers.

* The RUU layout is slightly renamed, as the official name of the country
is Belarus, not Belorussia.

73b3e33c

by jmcwilliams403 at 2023-03-17T08:22:00+00:00

symbols/us: add remaining diaeresis vowels to intl

Adds `ediaeresis` to the AltGr levels of F and
`idiaeresis` to the AltGr levels of J, which are
the nearest unbound keys to E and I on a QWERTY
layout.

4611e2e4

by Benno Schulenberg at 2023-03-20T09:17:15+01:00

symbols/ca: fix the key type of the top row in multix, to ignore CapsLock

CapsLock should affect only keys with letters (alphabetic characters),
not keys with only symbols or digits.  In other words: it should not
behave like ShiftLock.  So the key type for those top thirteen keys
should be EIGHT_LEVEL, not EIGHT_LEVEL_SEMIALPHABETIC.

Also looking at the Canadian Multilingual layout in Windows [1][2],
it is clear that the digits row should not be affected by CapsLock.

  [1] https://kbdlayout.info/kbdcan
  [2] https://kbdlayout.info/kbdcan/download/cldr

Problem existed since the CSA layout was added in commit 075eed027d,
eighteen years ago.  (It could have been fixed last year, by commit
16b9510f49, which fixed the key type for AB08 and AB09, but... it
escaped me.)

This fixes issue #369.

Reported-by: Jérémie Galarneau

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

e1893452
by cs127 at 2023-03-20T09:55:43+00:00
```
Add Microsoft Windows variant for Persian
```

aab23529

by Benno Schulenberg at 2023-03-20T12:08:16+01:00

hide the Czech typographic layout, as it is useless on its own

The layout assigns characters only to the third and fourth levels,
so it is useful only when combined with a proper, normal layout.

This addresses and closes issue #368.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

f9f8a7f3

by Fabio Tomat at 2023-03-20T20:48:05+00:00

Add left/right quotation marks for Friulian layout

e09f9f53

by jmcwilliams403 at 2023-03-21T09:51:36+00:00

symbols/us: add `plusminus` to level4 of M on us-intl + variants

The `plusminus` keysym is the last Latin-1 mathematical operator left
unbound on the standard us-intl layout, and likewise, M is the last
key position whose level4 shift state is the same as its level3 shift
state. This patch binds `plusminus` to the level4 shift state of M,
to go with a plausible phonetic nomenclature of plus«M»inus going on
M for Minus, just as how «m»icro is bound.

eb3d0dae

by cs127 at 2023-03-21T10:08:03+00:00

Add Persian digits to the Windows Persian variant

In Windows, the Persian layout has Latin (ASCII) digits only, and
some programs convert them to Persian digits as they are typed.
This type of conversion does not exist on most systems, including
freedesktop-based systems, making it impossible to type Persian digits
when using the Windows variant of the Persian keyboard layout.
This commit adds Persian digits to the third level of the number keys
on row E (AE01 - AE10).

a5f8db4e

by Benno Schulenberg at 2023-03-21T16:41:47+01:00

symbols/ir: replace 0x100nnnn with Unnnn, and add some comments for these

Also harmonize some whitespace, and replace "VoidSymbol" with "none".

c89e1f37

by Benno Schulenberg at 2023-03-22T12:24:49+01:00

symbols/us: use an include for Colemak DH, instead of a full definition

67160d2c

by Benno Schulenberg at 2023-03-22T12:24:49+01:00

symbols: mention the target country at the top of most layout files

Also replace some 0x100nnnn codes with Unnnn, and tweak some comments.

ff1e32b3

by Benno Schulenberg at 2023-03-22T12:30:17+01:00

symbols/ru: fix the names of two niche layouts

The name "Russian (typographic)" made it sound as if the layout was
useful only for a very neat, typographical kind of Russian.

The word "layout" in the other name was copied from the mistaken name
of the RUU layout, which was corrected last week in commit b896a52c55.

07bcda33

by Benno Schulenberg at 2023-03-22T12:30:17+01:00

correct the name of the basic Australian layout

Between the parenthesis after the language name should be either
a country name or the name of a specific type of layout.

(Also correct the comment for the 'en' short code.)

76a152fc

by Benno Schulenberg at 2023-03-22T12:31:48+01:00

drop the Spanish 'mac' variant that is exactly the same as the basic one

When something isn't actually a variant, there is no point in offering
it as a choice.

3dac4290

by Benno Schulenberg at 2023-03-22T17:14:01+01:00

rules: normalize some indentation, and swap two choices for consistency

82f54da0

by Benno Schulenberg at 2023-03-23T09:30:36+01:00

symbols: replace some 0x10000nn codes with their symbolic name

35dfe517

by Benno Schulenberg at 2023-03-24T12:33:05+01:00

symbols/gr: harmonize and condense whitespace, unwrap some definitions

Also, remove the marker `alternate_group` -- a leftover from the time
that the upper levels were meant to be accessed in a subsequent group
via `Mode_switch`.

Furthermore, replace `NoSymbol` with `any`, and amend the graphical
depiction of the Extended layout (which, by the way, is less extended
than the basic layout).

7943adb7

by Benno Schulenberg at 2023-03-24T12:44:27+01:00

symbols/de: correct the key type of the letter keys in the E1 layout

In the E1 layout, the keys with letters on the first two levels
contain symbols (not letters) on the third level, and nothing on
the fourth level.  So, CapsLock should not affect the third level,
otherwise AltGr plus a letter key would do nothing when CapsLock
is engaged.

This fixes issue #333.

Problem existed since the E1 layout was introduced three years ago
in commit b9063591ec.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

30cb97fd

by Benno Schulenberg at 2023-03-24T19:02:18+01:00

symbols/de: condense some comments, and provide a better E1 reference URL

Also, replace "NoSymbol" with the equivalent but shorter "any",
and reshuffle the LSGT key into its usual place.

67a3e8a9

by Benno Schulenberg at 2023-03-24T19:02:24+01:00

symbols/gr: condense some comments, and reshuffle keys into normal order

Also, elide a "hidden" include that is used just once --
includes that just make things harder to grasp are not useful.

28169a24

by Benno Schulenberg at 2023-03-26T18:01:58+02:00

force the CAPS key to have one level (for options that affect that key)

In olden times, there were no layouts that redefined the CAPS key,
so having options that overwrote the single symbol that it contained
worked fine.  However, some modern layouts, like Colemak and Workman,
define the CAPS key to have multiple levels, which causes some of the
XKB options to fail to overwrite the upper levels of that key.

Indirectly-reported-by: Vinícius dos Santos Oliveira

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

6581270f

by Benno Schulenberg at 2023-03-28T16:52:32+02:00

symbols/ctrl: specify CAPS precisely, trim redundant modifier mappings

70ac6953

by Benno Schulenberg at 2023-03-28T17:09:02+02:00

symbols/nbsp: condense definitions onto single lines, improve comments

54a5aeb0

by Benno Schulenberg at 2023-03-28T17:42:17+02:00

elide an unexposed non-breaking-space option that was used just once

The option 'nb2zwnj3s' was added twelve years ago in commit 0a247a4cdd,
for the sole benefit of the Sri Lankan phonetic layout.  But using an
include does not make things clearer, especially not when its name is
hard to grasp.  Also, the option was never exposed in any rules file,
and was thus not really accessible for anyone.  So: just drop it.

f54b3279

by Benno Schulenberg at 2023-03-28T17:42:25+02:00

symbols/lk: improve some comments, and reshuffle keys into normal order

6605bb67

by Benno Schulenberg at 2023-03-30T12:00:03+02:00

symbols/pk: replace mistaken 'any' with 'none' in the "Navees" layout

Last year, commit 57e35d41d8 mistakenly replaced 'VoidSymbol' with 'any'
instead of with 'none', causing for example Shift+AC09 and AltGr+AC09
to produce a symbol when those combinations should produce nothing.
(In practice, though, this was more or less harmless.)

Reported-by: Harshula Jayasuriya

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

669688a2

by Benno Schulenberg at 2023-03-30T12:03:59+02:00

symbols/cz: replace mistaken 'none' with 'any' in the typographic overlay

Last year, commit 1bf140a683 mistakenly replaced 'NoSymbol' with 'none'
instead of with 'any', blanking out the first two levels of some twenty
keys, making the 'prog_typo' layout completely unusable.  Oops!  :|

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

9e2b1483

by Harshula Jayasuriya at 2023-03-30T12:18:55+02:00

symbols/lk: fix incorrect use of "NoSymbol" by replacing with "none"

The intention was for the relevant levels to produce no symbol at all.

This fixes issue #374.

Signed-off-by: Harshula Jayasuriya <harshula@hj.id.au>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

b7553bb8

by Benno Schulenberg at 2023-04-02T11:59:13+02:00

symbols/ru: harmonize some whitespace, and replace some codes with names

72c1b0d3

by Benno Schulenberg at 2023-04-02T11:59:20+02:00

symbols/fr: align some columns, trim comments, condense whitespace

Also drop a pointless include, as the 'oss' layout defines all keys.

dfb4c6e1

by Benno Schulenberg at 2023-04-02T11:59:20+02:00

symbols/ara: condense whitespace, and improve some column alignment

6b94eea1

by Benno Schulenberg at 2023-04-02T11:59:20+02:00

symbols/ara: add Persian digits on fourth level of Arabic keypad

The fourth level (reached with Shift+AltGr) was empty, so this
gives it some marginal usefulness.  Also, it allows eliding a
hidden partial variant.

2dadc751

by Benno Schulenberg at 2023-04-02T11:59:20+02:00

symbols/az: remove three redundant definitions

The definitions are the same as the ones in the included layout.

(The level3 switch is redundant too, but it will be needed again later.)

6fe79e67

by Benno Schulenberg at 2023-04-02T11:59:20+02:00

symbols/az: shrink and harmonize some whitespace, and reorder a line

e31cff1a

by Benno Schulenberg at 2023-04-02T17:01:36+02:00

symbols/az: add four missing key definitions to the Cyrillic layout

Also, add `@` on AltGr+2 and `₼` on AltGr+4, to match what Windows has.

(Not that it matters much, because Azerbaijani is written with the
Latin alphabet nowadays, but it's nice to have things working right.)

This fixes issue #376.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

476b32cf

by Benno Schulenberg at 2023-04-03T08:39:04+00:00

rules: add two missing codes (ng, pk) for files that have OLPC layouts

Sixteen years ago commit a8551efb70 added OLPC layouts
for nine countries but added just seven country codes.

Also, sort the code for India alphabetically.

cef0994b

by Benno Schulenberg at 2023-04-04T17:09:27+02:00

types: improve the naming of the levels, distinguishing AltGr from Alt

Types like "CTRL+ALT" and "FOUR_LEVEL_X" use both AltGr and Alt
as modifiers -- it is then confusing to refer to both as "Alt".

Also, using the word "Base" in the name for any level above the
base level is not helpful, so drop those.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

1b7d667a

by Benno Schulenberg at 2023-04-04T17:55:18+02:00

symbols/ng: shorten Unicode codes, add comments, improve alignment

23e76bd3

by Benno Schulenberg at 2023-04-05T11:33:40+02:00

symbols/be: shrink whitespace, improve alignment, trim redundant comments

31c0b37d

by Benno Schulenberg at 2023-04-05T16:27:36+02:00

symbols/ua: shrink whitespace, improve alignment, trim a redundant line

The 'phonetic' layout does not need to define AB10, as the 'include'
already does.  The 'homophonic' layout lacked just one definition to
be complete in itself and not need an 'include'.

920d23c0

by Benno Schulenberg at 2023-04-06T16:28:26+02:00

CI: allow "Group1" to be spelt with a lowercase "g"

Also improve a comment, trim a trailing space, and update the legend.

5d75d2ae

by Benno Schulenberg at 2023-04-09T09:36:22+02:00

symbols/az: fix the numerosign (№) on Shift+3, and add two other symbols

The U2166 (Ⅶ ) was a mistyping of U2116 (№) that has existed since
the original commit d8181925b2 from nineteen years ago.

Also add the @ and the ₼ (manat sign) that Windows has on level 3
of the two neighbour keys.

This fixes issue #375.

Acked-by: Adil Aliyev

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

29e88019

by Benno Schulenberg at 2023-04-10T11:57:39+02:00

types: group the basic four-level keypad type next to its sister

Seventeen years ago, commit e3a93b0f51 wanted to distinguish between
a normal keypad and a Mac keypad by redefining the FOUR_LEVEL_KEYPAD
type when a Mac was used.  Five years later, commit 566b887f8e removed
this tweaked type again, causing the types in types/numpad to always
include 'extra(keypad)'.  Avoid these repetitive includes and group
the FOUR_LEVEL_KEYPAD type (which, by the way, is not used anywhere)
before its FOUR_LEVEL_MIXED_KEYPAD variant.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

afe56408

by Benno Schulenberg at 2023-04-10T11:58:54+02:00

types/level5: drop the Lock modifier when it does nothing

When a modifier should not have any effect on which level is chosen
by the other modifiers, then the easiest way is to not mention this
modifier amongst the modifiers that the type uses -- see for example
the various non-alphabetic four-level types.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

fa7f8eb5

by Benno Schulenberg at 2023-04-10T12:12:23+02:00

rename two eight-level types to be more readable

The "EIGHT_LEVEL_LEVEL_FIVE_LOCK" name was too condensed to make sense.
With "EIGHT_LEVEL_WITH_LEVEL5_LOCK" the reader has at least a chance
of understanding it.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

28c542c1

by Benno Schulenberg at 2023-04-10T12:26:59+02:00

types: sort the includes mostly according to increasing number of levels

This looks better when doing `xkbcomp :0 - | less`.

The 'mousekeys' is placed last because the type is rather special
and irrelevant (used only in three vendor layouts) and related to
the numeric keypad.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

ccd00929

by Benno Schulenberg at 2023-04-10T12:39:53+02:00

types: move an 8-level type to the file with the other 8-level types

Also rename it, so that the name is more descriptive.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

5e97fe10

by Benno Schulenberg at 2023-04-10T17:06:23+02:00

symbols/ro: improve some comments, and tighten the alignment a bit

54457f7b

by Benno Schulenberg at 2023-04-10T17:10:30+02:00

symbols/level*: contract each key definition onto one line, when possible

This makes it easier to see where which symbols are assigned to a key
when grepping for its code.

Also improve a couple of comments.

b518555e

by Benno Schulenberg at 2023-04-11T13:23:47+02:00

compat,types: harmonize some whitespace, and reshuffle some lines

Also, add some level specifications for clarity, although unneeded.

c1d3ff4b

by Benno Schulenberg at 2023-04-12T16:07:24+02:00

symbols/jp: improve comments, unwrap key definitions, harmonize blanks

9d55d7e7

by Benno Schulenberg at 2023-04-12T16:22:18+02:00

symbols/jp: order the two main layouts first, the three options last

cc916a73

by Benno Schulenberg at 2023-04-12T16:50:41+02:00

symbols/tj: condense comments, reshuffle keys into their normal order

1cb71819

by Benno Schulenberg at 2023-04-18T11:54:00+02:00

symbols/pc: map the Super modifier to the LWIN/RWIN keys, not to symbols

When a modifier is mapped to a symbol, then it will effectively be
mapped to the first-found key that contains the relevant symbol,
and that key might not be the key that the modifier is usually
mapped to, leaving this latter key without a mapping.

So, map the Super modifier to `<LWIN>` and `<RWIN>` instead of to
`Super_L` and `Super_R` -- the Windows keys will then not lack their
Super modifier when some other key is made into a Super key too.

This fixes issue #81.

Reported-by: Josh Triplett

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

a1d41a4e

by Benno Schulenberg at 2023-04-18T11:59:29+02:00

symbols: map three real modifiers to keys instead of to symbols

Mapping a modifier to a symbol had the tiny advantage of not needing
to explicitly specify a modifier mapping when putting the symbol onto
some other key through some option.  But it had the disadvantage of
risking to lose the modifier mapping for the original key when the
other key was just an addition and not a replacement.

This generalizes the fix from the previous commit.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

43a35342

by cs127 at 2023-04-18T10:11:54+00:00

Add U+06C0 to the Persian layout

In Persian, an isolated form of the letter Ye is added after nouns
that are connected to adjectives, and if the noun ends with the
letter He, it is often merged with the following Ye, into the letter
He with Ye above (U+06C0).
This character exists on the second level of AC05 in the Persian
layout of Microsoft Windows, but not in the standard layout.
This commit extends the standard layout to include U+06C0 on the
third level of AC05.

e66a0ed3

by Benno Schulenberg at 2023-04-20T16:20:58+02:00

rules: put the `grp:` rules last, as they should have the last word

When using a `grp:` option, one doesn't want other options to interfere
with this option, so the rules for `grp:` options should come last in
the list.

This fixes issue #383.

Reported-by: Sergey Stolyarov

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

265a9bfd

by Benno Schulenberg at 2023-04-21T16:46:19+02:00

revert commit 1cb7181936 plus the offending part of a1d41a4ef6

Mapping modifiers to keys instead of to symbols causes problems when
those keys carry symbols that are associated with *other* modifiers,
as this leads to two or more modifiers getting linked together and
thus activated in unison -- which one normally doesn't want.

This fixes issue #382.

(Issue #81 will have to be addressed in some other way.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

a8dc5635

by Benno Schulenberg at 2023-04-23T08:55:20+02:00

rules: put also the general `grp:` rules last, so they overrule others

Arguably, when options conflict, the group-switching options should
overrule others, because when one has multiple groups one definitely
wants to be able to switch.

This fixes issue #384.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

5076a469

by Benno Schulenberg at 2023-04-23T10:46:58+02:00

rules: group the options for level3, keypad, and sundry things together

This looks better and should mostly have no effect as the options are
largely independent.  Only the moved `lv3:` options will now overrule
some of the `caps:`, `ctrl:` and `compose:` options, instead of being
overruled by them.  In my opinion this is more consistent: all level3
options overrule most other options.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

aca77abb

by Benno Schulenberg at 2023-04-23T11:50:17+02:00

rules: harmonize whitespace to tabs and improve alignment

dfce90b2

by Benno Schulenberg at 2023-04-24T08:11:05+00:00

symbols/group: leave two first levels undefined, to allow combining

Many people do not need the CapsLock functionality, so leaving the
first level of the `<CAPS>` key undefined in these two options allows
users to combine `grp:shift_caps_toggle` or `grp:alt_caps_toggle` with
most of the one-level `caps:` options, for more versatility.

(Because of the order of the rules, any `caps:` option will be applied
first, and then the `grp:` option will add a second level.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

8877d052

by Benno Schulenberg at 2023-04-24T11:46:16+02:00

rules: make the `Shifts` group toggle override any layout's Shift keys

In order to make the option `grp:shifts_toggle` effective also with
the few layouts that define the Shift keys too, the option should be
applied to each group separately, and the option should specify the
key type explicitly.

This fixes issue #380.

Problem existed since the T3 layout was added in 2013,
and worsened when the E1 layout was added in 2020.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

d2d2b7ba

by Benno Schulenberg at 2023-04-25T08:55:37+02:00

improve the names of two Czech and two Slovak variants

Nineteen years ago, commit 8e1e2d8195 baptized these four variants with
the words "extended backslash".  Nine months later, commit 999e981f4c
synced these names to the relevant symbol files.

But just two days later, commit 3ad7cee7c5 changed one of the names to
read "with <\|> key", in response to https://bugs.freedesktop.org/2319.
(A week later, commit 1b8556fe6f synced this name to the XML file.)
This gave one of the four very similar variants a deviant name.

The string "with <\|> key" is difficult for translators.  For a long
time I have thought that "<" and ">" were the relevant symbols, and
that the "|" was an OR symbol, escaped by the "\".  In other words:
I thought that the string referred to the LSGT key.  :/

What the four variants actually do is: put the backslash and vertical
bar characters on the BKSL key (replacing the dead diaeresis and the
apostrophe), for those keyboards that lack the LSGT key, to make typing
"\" and "|" more straightforward -- these symbols are present also on
the third level of the Q and W keys.  So what those variants do is:
add an *extra* backslash and vertical bar character to the layout,
for easier access, at the cost of having the apostrophe accessible
only via AltGr and the dead diaeresis only via Shift+AltGr.

So... name all four variants more fittingly and in the same manner.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

662c8721