* [PATCH v3] Update Colemak-DH keymaps with upstream changes
@ 2024-09-28 9:53 Callum Andrew
2024-10-01 11:31 ` Alexey Gladkov
0 siblings, 1 reply; 2+ messages in thread
From: Callum Andrew @ 2024-09-28 9:53 UTC (permalink / raw)
To: kbd; +Cc: Callum Andrew
Make Wide Mod mappings consistent with layout specification
Signed-off-by: Callum Andrew <contact@candrew.net>
---
data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map | 4 ++--
data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map | 4 ++--
data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map | 8 ++++----
data/keymaps/i386/colemak/mod-dh-iso-us-wide.map | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-iso-uk-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-us-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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
--
2.45.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] Update Colemak-DH keymaps with upstream changes
2024-09-28 9:53 [PATCH v3] Update Colemak-DH keymaps with upstream changes Callum Andrew
@ 2024-10-01 11:31 ` Alexey Gladkov
0 siblings, 0 replies; 2+ messages in thread
From: Alexey Gladkov @ 2024-10-01 11:31 UTC (permalink / raw)
To: Callum Andrew; +Cc: kbd
On Sat, Sep 28, 2024 at 07:53:26PM +1000, Callum Andrew wrote:
> Make Wide Mod mappings consistent with layout specification
>
> Signed-off-by: Callum Andrew <contact@candrew.net>
I added a link to the upstream Wide Mod keymap and applied. Thanks!
> ---
> data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map | 4 ++--
> data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map | 4 ++--
> data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map | 8 ++++----
> data/keymaps/i386/colemak/mod-dh-iso-us-wide.map | 8 ++++----
> 4 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-iso-uk-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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-us-wide.map b/data/keymaps/i386/colemak/mod-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/mod-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
> --
> 2.45.2
>
>
--
Rgrds, legion
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-01 11:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-28 9:53 [PATCH v3] Update Colemak-DH keymaps with upstream changes Callum Andrew
2024-10-01 11:31 ` Alexey Gladkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox