summaryrefslogtreecommitdiff
path: root/types
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@telfort.nl>2022-05-27 11:30:35 +0200
committerBenno Schulenberg <bensberg@telfort.nl>2022-05-27 12:08:37 +0200
commit872813d6f14d13f883f440d599dcf77f34b7c80a (patch)
treee36bfa3193d80fe2dc80d2a04619028be7ec2a61 /types
parentfd3884261cd223f160ec49c77c156e8d461b187d (diff)
downloadxkeyboard-config-872813d6f14d13f883f440d599dcf77f34b7c80a.tar.gz
types/extra: condense and improve an obsolete comment, and re-indent
Fifteen years ago, commit 12a470d288 added U+1E9E on the fifth level of AE11 of the basic German layout, but the compose sequence that was needed for the intended effect (<U1E9E>: "SS") never materialized in libX11 -- understandably, because it would have made it impossible to type an U+1E9E into a document. Since 2017 (see https://en.wikipedia.org/wiki/Eszet) it is permissible to use the capital form ẞ instead of SS, so there is no longer any need for transforming U+1E9E to "SS" -- and it would have been imperfect anyway, because sometimes "SZ" would be required instead. So, remove any mention of SS and sharp s from the description of the special FOUR_LEVEL_PLUS_LOCK type. (The sister comment in symbols/de was removed five years ago in commit de13d5ab2f.) Also, indent the comment and another to better show what they apply to.
Diffstat (limited to 'types')
-rw-r--r--types/extra29
1 files changed, 8 insertions, 21 deletions
diff --git a/types/extra b/types/extra
index 3f1e48d..156b8e5 100644
--- a/types/extra
+++ b/types/extra
@@ -81,11 +81,10 @@ default partial xkb_types "default" {
level_name[Level4] = "Ctrl+Alt";
};
-// A special type for keys used in the Serbian Latin Unicode keymap.
-// It makes it possible to use all three forms of latin letters
-// present in Unicode that are made up of two separate letters
-// (forms like LJ, Lj, and lj; NJ, Nj, and nj; etcetera).
-
+ // A special type for keys used in the Serbian Latin Unicode keymap.
+ // It makes it possible to use all three forms of latin letters
+ // present in Unicode that are made up of two separate letters
+ // (forms like LJ, Lj, and lj; NJ, Nj, and nj; etcetera).
type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
modifiers = Shift+Lock+LevelThree;
map[None] = Level1;
@@ -103,28 +102,16 @@ default partial xkb_types "default" {
level_name[Level4] = "Shift AltGr";
};
-// A key type for the German ssharp (for example), which is capitalized as SS.
-// CHARACTERISTICS:
-// It is FOUR_LEVEL with the exception that the fifth level is mapped to the
-// Lock modifier. If other modifiers are used, the Lock state is ignored.
-// DETAILS ABOUT GERMAN:
-// The capital form of ssharp (called sharp s) only exists for completely
-// capitalized text, not for words at the beginning of sentences nor for
-// nouns (nouns in German normally start with a captial letter).
-// The ssharp key, to the right of the zero key, takes this into account
-// and has a questionmark mapped to Shift-ssharp since normally no capital
-// version is needed.
-// When typing with active CapsLock, this key type is needed to
-// output two capital letters S because this is the only German key
-// whose capital letter is not the same as the one typed with Shift.
-
+ // Five levels: the normal four levels with Shift and LevelThree,
+ // plus a fifth level when CapsLock (and only CapsLock) is active
+ // -- CapsLock is ignored when Shift and/or LevelThree is held.
type "FOUR_LEVEL_PLUS_LOCK" {
modifiers = Shift+Lock+LevelThree;
map[None] = Level1;
map[Shift] = Level2;
map[LevelThree] = Level3;
map[Shift+LevelThree] = Level4;
- map[Lock] = Level5;
+ map[Lock] = Level5;
map[Lock+Shift] = Level2;
map[Lock+LevelThree] = Level3;
map[Lock+Shift+LevelThree] = Level4;