* [PATCH v2] Update Colemak-DH keymaps with upstream changes
@ 2024-09-28 1:29 Callum Andrew
2024-09-28 8:48 ` Alexey Gladkov
0 siblings, 1 reply; 3+ messages in thread
From: Callum Andrew @ 2024-09-28 1:29 UTC (permalink / raw)
To: kbd; +Cc: Callum Andrew
- Make Wide Mod mappings consistent with specification
- Rename from mod-dh (the name of the project) to colemak-dh (the name
of the layout)
Signed-off-by: Callum Andrew <contact@candrew.net>
---
...-dh-ansi-us-awing.map => colemak-dh-ansi-us-awing.map} | 0
...-us-fatz-wide.map => colemak-dh-ansi-us-fatz-wide.map} | 4 ++--
...od-dh-ansi-us-fatz.map => colemak-dh-ansi-us-fatz.map} | 0
...od-dh-ansi-us-wide.map => colemak-dh-ansi-us-wide.map} | 4 ++--
.../{mod-dh-ansi-us.map => colemak-dh-ansi-us.map} | 0
...{mod-dh-iso-uk-wide.map => colemak-dh-iso-uk-wide.map} | 8 ++++----
.../colemak/{mod-dh-iso-uk.map => colemak-dh-iso-uk.map} | 0
...{mod-dh-iso-us-wide.map => colemak-dh-iso-us-wide.map} | 8 ++++----
.../colemak/{mod-dh-iso-us.map => colemak-dh-iso-us.map} | 0
.../{mod-dh-matrix-us.map => colemak-dh-matrix-us.map} | 0
10 files changed, 12 insertions(+), 12 deletions(-)
rename data/keymaps/i386/colemak/{mod-dh-ansi-us-awing.map => colemak-dh-ansi-us-awing.map} (100%)
rename data/keymaps/i386/colemak/{mod-dh-ansi-us-fatz-wide.map => colemak-dh-ansi-us-fatz-wide.map} (97%)
rename data/keymaps/i386/colemak/{mod-dh-ansi-us-fatz.map => colemak-dh-ansi-us-fatz.map} (100%)
rename data/keymaps/i386/colemak/{mod-dh-ansi-us-wide.map => colemak-dh-ansi-us-wide.map} (97%)
rename data/keymaps/i386/colemak/{mod-dh-ansi-us.map => colemak-dh-ansi-us.map} (100%)
rename data/keymaps/i386/colemak/{mod-dh-iso-uk-wide.map => colemak-dh-iso-uk-wide.map} (94%)
rename data/keymaps/i386/colemak/{mod-dh-iso-uk.map => colemak-dh-iso-uk.map} (100%)
rename data/keymaps/i386/colemak/{mod-dh-iso-us-wide.map => colemak-dh-iso-us-wide.map} (94%)
rename data/keymaps/i386/colemak/{mod-dh-iso-us.map => colemak-dh-iso-us.map} (100%)
rename data/keymaps/i386/colemak/{mod-dh-matrix-us.map => colemak-dh-matrix-us.map} (100%)
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-awing.map b/data/keymaps/i386/colemak/colemak-dh-ansi-us-awing.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-ansi-us-awing.map
rename to data/keymaps/i386/colemak/colemak-dh-ansi-us-awing.map
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map b/data/keymaps/i386/colemak/colemak-dh-ansi-us-fatz-wide.map
similarity index 97%
rename from data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map
rename to data/keymaps/i386/colemak/colemak-dh-ansi-us-fatz-wide.map
index d77bde0..0dae32b 100644
--- a/data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map
+++ b/data/keymaps/i386/colemak/colemak-dh-ansi-us-fatz-wide.map
@@ -15,8 +15,8 @@ keycode 3 = two at masculine twosuperior nul
keycode 4 = three numbersign ordfeminine threesuperior Escape
keycode 5 = four dollar cent sterling Control_backslash
keycode 6 = five percent euro yen Control_bracketright
-keycode 7 = equal plus multiply division
-keycode 8 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 7 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 8 = equal plus multiply division
keycode 9 = seven ampersand eth ETH Control_underscore
keycode 10 = eight asterisk thorn THORN Delete
keycode 11 = nine parenleft asciitilde asciitilde
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-fatz.map b/data/keymaps/i386/colemak/colemak-dh-ansi-us-fatz.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-ansi-us-fatz.map
rename to data/keymaps/i386/colemak/colemak-dh-ansi-us-fatz.map
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map b/data/keymaps/i386/colemak/colemak-dh-ansi-us-wide.map
similarity index 97%
rename from data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map
rename to data/keymaps/i386/colemak/colemak-dh-ansi-us-wide.map
index 34cd97a..ea8d47c 100644
--- a/data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map
+++ b/data/keymaps/i386/colemak/colemak-dh-ansi-us-wide.map
@@ -15,8 +15,8 @@ keycode 3 = two at masculine twosuperior nul
keycode 4 = three numbersign ordfeminine threesuperior Escape
keycode 5 = four dollar cent sterling Control_backslash
keycode 6 = five percent euro yen Control_bracketright
-keycode 7 = equal plus multiply division
-keycode 8 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 7 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 8 = equal plus multiply division
keycode 9 = seven ampersand eth ETH Control_underscore
keycode 10 = eight asterisk thorn THORN Delete
keycode 11 = nine parenleft asciitilde asciitilde
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us.map b/data/keymaps/i386/colemak/colemak-dh-ansi-us.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-ansi-us.map
rename to data/keymaps/i386/colemak/colemak-dh-ansi-us.map
diff --git a/data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map b/data/keymaps/i386/colemak/colemak-dh-iso-uk-wide.map
similarity index 94%
rename from data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map
rename to data/keymaps/i386/colemak/colemak-dh-iso-uk-wide.map
index c3879e6..2b89894 100644
--- a/data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map
+++ b/data/keymaps/i386/colemak/colemak-dh-iso-uk-wide.map
@@ -15,8 +15,8 @@ keycode 3 = two quotedbl masculine twosuperior nul
keycode 4 = three sterling ordfeminine threesuperior Escape
keycode 5 = four dollar cent sterling Control_backslash
keycode 6 = five percent euro yen Control_bracketright
-keycode 7 = equal plus multiply division
-keycode 8 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 7 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 8 = equal plus multiply division
keycode 9 = seven ampersand eth ETH Control_underscore
keycode 10 = eight asterisk thorn THORN Delete
keycode 11 = nine parenleft asciitilde asciitilde
@@ -34,7 +34,7 @@ keycode 23 = l L asciitilde asciitilde Contr
keycode 24 = u U uacute Uacute Control_u
keycode 25 = y Y udiaeresis Udiaeresis Control_y
keycode 26 = semicolon colon odiaeresis Odiaeresis
-keycode 27 = numbersign asciitilde dead_circumflex asciitilde
+keycode 27 = slash question questiondown asciitilde
keycode 43 = apostrophe at otilde Otilde
keycode 30 = a A aacute Aacute Control_a
@@ -55,7 +55,7 @@ keycode 45 = c C ccedilla Ccedilla Contr
keycode 46 = d D dead_diaeresis asciitilde Control_d
keycode 47 = v V oe OE Control_v
keycode 48 = backslash bar asciitilde asciitilde Control_backslash
-keycode 49 = slash question questiondown asciitilde Delete
+keycode 49 = numbersign asciitilde dead_circumflex asciitilde
keycode 50 = k K asciitilde asciitilde Control_k
keycode 51 = h H asciitilde asciitilde Control_h
keycode 52 = comma less dead_cedilla asciitilde
diff --git a/data/keymaps/i386/colemak/mod-dh-iso-uk.map b/data/keymaps/i386/colemak/colemak-dh-iso-uk.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-iso-uk.map
rename to data/keymaps/i386/colemak/colemak-dh-iso-uk.map
diff --git a/data/keymaps/i386/colemak/mod-dh-iso-us-wide.map b/data/keymaps/i386/colemak/colemak-dh-iso-us-wide.map
similarity index 94%
rename from data/keymaps/i386/colemak/mod-dh-iso-us-wide.map
rename to data/keymaps/i386/colemak/colemak-dh-iso-us-wide.map
index 1bf157b..5058603 100644
--- a/data/keymaps/i386/colemak/mod-dh-iso-us-wide.map
+++ b/data/keymaps/i386/colemak/colemak-dh-iso-us-wide.map
@@ -15,8 +15,8 @@ keycode 3 = two at masculine twosuperior nul
keycode 4 = three numbersign ordfeminine threesuperior Escape
keycode 5 = four dollar cent sterling Control_backslash
keycode 6 = five percent euro yen Control_bracketright
-keycode 7 = equal plus multiply division
-keycode 8 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 7 = six asciicircum hstroke Hstroke Control_asciicircum
+keycode 8 = equal plus multiply division
keycode 9 = seven ampersand eth ETH Control_underscore
keycode 10 = eight asterisk thorn THORN Delete
keycode 11 = nine parenleft asciitilde asciitilde
@@ -34,7 +34,7 @@ keycode 23 = l L asciitilde asciitilde Contr
keycode 24 = u U uacute Uacute Control_u
keycode 25 = y Y udiaeresis Udiaeresis Control_y
keycode 26 = semicolon colon odiaeresis Odiaeresis
-keycode 27 = numbersign asciitilde dead_circumflex asciitilde
+keycode 27 = slash question questiondown asciitilde
keycode 43 = apostrophe quotedbl otilde Otilde
keycode 30 = a A aacute Aacute Control_a
@@ -55,7 +55,7 @@ keycode 45 = c C ccedilla Ccedilla Contr
keycode 46 = d D dead_diaeresis asciitilde Control_d
keycode 47 = v V oe OE Control_v
keycode 48 = backslash bar asciitilde asciitilde Control_backslash
-keycode 49 = slash question questiondown asciitilde Delete
+keycode 49 = numbersign asciitilde dead_circumflex asciitilde
keycode 50 = k K asciitilde asciitilde Control_k
keycode 51 = h H asciitilde asciitilde Control_h
keycode 52 = comma less dead_cedilla asciitilde
diff --git a/data/keymaps/i386/colemak/mod-dh-iso-us.map b/data/keymaps/i386/colemak/colemak-dh-iso-us.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-iso-us.map
rename to data/keymaps/i386/colemak/colemak-dh-iso-us.map
diff --git a/data/keymaps/i386/colemak/mod-dh-matrix-us.map b/data/keymaps/i386/colemak/colemak-dh-matrix-us.map
similarity index 100%
rename from data/keymaps/i386/colemak/mod-dh-matrix-us.map
rename to data/keymaps/i386/colemak/colemak-dh-matrix-us.map
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] Update Colemak-DH keymaps with upstream changes
2024-09-28 1:29 [PATCH v2] Update Colemak-DH keymaps with upstream changes Callum Andrew
@ 2024-09-28 8:48 ` Alexey Gladkov
2024-09-28 9:47 ` Callum Andrew
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Gladkov @ 2024-09-28 8:48 UTC (permalink / raw)
To: Callum Andrew; +Cc: kbd
On Sat, Sep 28, 2024 at 11:29:34AM +1000, Callum Andrew wrote:
> - Make Wide Mod mappings consistent with specification
Don't mix file modifications and file renaming.
> - Rename from mod-dh (the name of the project) to colemak-dh (the name
> of the layout)
This renaming looks useless to me. The "colemak" is already present in
the path. You can always do that:
loadkeys colemak/mod-dh-ansi-us
in the same way as
loadkeys qwerty/cz
This is how keymaps search has been working for a very long time.
Duplicating the architecture, keymaps family, and everything else (in most
cases) but the language is bad practice.
I can understand why the author of colemak keymaps named them that in his
standalone project. But in kbd such naming does not seem correct to me.
> Signed-off-by: Callum Andrew <contact@candrew.net>
> ---
> ...-dh-ansi-us-awing.map => colemak-dh-ansi-us-awing.map} | 0
> ...-us-fatz-wide.map => colemak-dh-ansi-us-fatz-wide.map} | 4 ++--
> ...od-dh-ansi-us-fatz.map => colemak-dh-ansi-us-fatz.map} | 0
> ...od-dh-ansi-us-wide.map => colemak-dh-ansi-us-wide.map} | 4 ++--
> .../{mod-dh-ansi-us.map => colemak-dh-ansi-us.map} | 0
> ...{mod-dh-iso-uk-wide.map => colemak-dh-iso-uk-wide.map} | 8 ++++----
> .../colemak/{mod-dh-iso-uk.map => colemak-dh-iso-uk.map} | 0
> ...{mod-dh-iso-us-wide.map => colemak-dh-iso-us-wide.map} | 8 ++++----
> .../colemak/{mod-dh-iso-us.map => colemak-dh-iso-us.map} | 0
> .../{mod-dh-matrix-us.map => colemak-dh-matrix-us.map} | 0
> 10 files changed, 12 insertions(+), 12 deletions(-)
> rename data/keymaps/i386/colemak/{mod-dh-ansi-us-awing.map => colemak-dh-ansi-us-awing.map} (100%)
> rename data/keymaps/i386/colemak/{mod-dh-ansi-us-fatz-wide.map => colemak-dh-ansi-us-fatz-wide.map} (97%)
> rename data/keymaps/i386/colemak/{mod-dh-ansi-us-fatz.map => colemak-dh-ansi-us-fatz.map} (100%)
> rename data/keymaps/i386/colemak/{mod-dh-ansi-us-wide.map => colemak-dh-ansi-us-wide.map} (97%)
> rename data/keymaps/i386/colemak/{mod-dh-ansi-us.map => colemak-dh-ansi-us.map} (100%)
> rename data/keymaps/i386/colemak/{mod-dh-iso-uk-wide.map => colemak-dh-iso-uk-wide.map} (94%)
> rename data/keymaps/i386/colemak/{mod-dh-iso-uk.map => colemak-dh-iso-uk.map} (100%)
> rename data/keymaps/i386/colemak/{mod-dh-iso-us-wide.map => colemak-dh-iso-us-wide.map} (94%)
> rename data/keymaps/i386/colemak/{mod-dh-iso-us.map => colemak-dh-iso-us.map} (100%)
> rename data/keymaps/i386/colemak/{mod-dh-matrix-us.map => colemak-dh-matrix-us.map} (100%)
--
Rgrds, legion
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] Update Colemak-DH keymaps with upstream changes
2024-09-28 8:48 ` Alexey Gladkov
@ 2024-09-28 9:47 ` Callum Andrew
0 siblings, 0 replies; 3+ messages in thread
From: Callum Andrew @ 2024-09-28 9:47 UTC (permalink / raw)
To: Alexey Gladkov; +Cc: kbd
On Sat Sep 28, 2024 at 6:48 PM AEST, Alexey Gladkov wrote:
> Don't mix file modifications and file renaming.
Sorry about that, I'll submit a revised patch with just the keymap changes.
> This renaming looks useless to me. The "colemak" is already present in
> the path. You can always do that:
>
> loadkeys colemak/mod-dh-ansi-us
>
> in the same way as
>
> loadkeys qwerty/cz
>
> This is how keymaps search has been working for a very long time.
> Duplicating the architecture, keymaps family, and everything else (in most
> cases) but the language is bad practice.
Yeah, that does make more sense.
Regards,
Callum :)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-28 9:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-28 1:29 [PATCH v2] Update Colemak-DH keymaps with upstream changes Callum Andrew
2024-09-28 8:48 ` Alexey Gladkov
2024-09-28 9:47 ` Callum Andrew
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.