Skip to contentSkip to conversation

Sanitize Finnish keymaps

kbd Applied Marko Myllynen 2 participants 2 messages Mar 21, 2014 – Mar 23, 2014

lore
Share & tools
lore

Marko Myllynen

author
#0 lore raw

Hi,

please find the attached patch series to sanitize Finnish keymaps:
first, it removes the obsolete fi.map (which doesn't even match keyboard engravings), then introduces a new fi.map which combines fi-latin1 and fi-latin9 and makes it possible to produces bar/less/greater on (virtual) keyboards missing the less/greater key, and finally removes now redundant fi-latin1/fi-latin9 maps. Please see the patches for more detailed description.

Thanks,

Signature · 1 line
Marko Myllynen
Quoted 1 line

From a0b089ed81e90e06c90bd399c52bd3362d4502f0 Mon Sep 17 00:00:00 2001

From: Marko Myllynen <[email protected]>
Date: Thu, 20 Mar 2014 16:41:43 +0200
Subject: [PATCH 1/3] Remove old and obsolete fi.map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fi.map does not match current or past keyboard engravings (for example 'ä' produces '}'), some distributions ship it as fi-old.map, there is no corresponding X keymap, and in general it does not look like a generic purpose map. Its history is a bit hazy but Linus presumes it might be based on a custom keymap variant he was using a long time ago.

Acked-by Linus Torvalds <[email protected]>
---
 data/keymaps/i386/qwerty/fi.map |   90 ---------------------------------------
 1 files changed, 0 insertions(+), 90 deletions(-)
 delete mode 100644 data/keymaps/i386/qwerty/fi.map
data/keymaps/i386/qwerty/fi.map deleted +0 -90
deleted file mode 100644
index 98a2d50..0000000
@@ -1,90 +0,0 @@
-keymaps 0-4,6,8,12
-include "qwerty-layout"
-include "linux-with-alt-and-altgr"
-	plain keycode  83 = KP_Comma
-strings as usual
-
-keycode   1 = Escape
-	alt     keycode   1 = Meta_Escape
-keycode   2 = one              exclam
-	alt     keycode   2 = Meta_one
-keycode   3 = two              quotedbl         at
-	control keycode   3 = nul
-	alt     keycode   3 = Meta_two
-keycode   4 = three            numbersign       sterling
-	control keycode   4 = Escape
-	alt     keycode   4 = Meta_three
-keycode   5 = four             dollar           dollar
-	control keycode   5 = Control_backslash
-	alt     keycode   5 = Meta_four
-keycode   6 = five             percent
-	control keycode   6 = Control_bracketright
-	alt     keycode   6 = Meta_five
-keycode   7 = six              ampersand
-	control keycode   7 = Control_asciicircum
-	alt     keycode   7 = Meta_six
-keycode   8 = seven            slash            braceleft
-	control keycode   8 = Control_underscore
-	alt     keycode   8 = Meta_seven
-keycode   9 = eight            parenleft        bracketleft
-	control keycode   9 = Delete
-	alt     keycode   9 = Meta_eight
-keycode  10 = nine             parenright       bracketright
-	alt     keycode  10 = Meta_nine
-keycode  11 = zero             equal            braceright
-	alt     keycode  11 = Meta_zero
-keycode  12 = plus             question         backslash
-	control keycode  12 = Control_underscore
-	alt     keycode  12 = Meta_minus
-keycode  13 = apostrophe       grave
-	alt     keycode  13 = Meta_equal
-keycode  14 = Delete
-	alt     keycode  14 = Meta_Delete
-keycode  15 = Tab
-	shift	keycode  15 = Meta_Tab
-	alt     keycode  15 = Meta_Tab
-keycode  26 = braceright       bracketright
-	control keycode  26 = Escape
-	alt     keycode  26 = Meta_bracketleft
-	altgr	keycode  26 = aring
-	shift	altgr	keycode  26 = Aring
-keycode  27 =
-	shift   keycode  27 = asciicircum
-	altgr   keycode  27 = asciitilde
-	control keycode  27 = Control_bracketright
-	alt     keycode  27 = Meta_bracketright
-keycode  28 = Return
-	alt     keycode  28 = Meta_Control_m
-keycode  29 = Control
-keycode  39 = bar              backslash
-	alt     keycode  39 = Meta_semicolon
-	altgr	keycode  39 = odiaeresis
-	shift	altgr	keycode  39 = Odiaeresis
-keycode  40 = braceleft        bracketleft
-	control keycode  40 = Control_g
-	alt     keycode  40 = Meta_apostrophe
-	altgr	keycode  40 = adiaeresis
-	shift	altgr	keycode  40 = Adiaeresis
-keycode  41 =
-	control keycode  41 = nul
-	alt     keycode  41 = Meta_grave
-keycode  42 = Shift
-keycode  43 = apostrophe       asterisk
-	control keycode  43 = Control_backslash
-	alt     keycode  43 = Meta_backslash
-keycode  51 = comma            semicolon
-	alt     keycode  51 = Meta_comma
-keycode  52 = period           colon
-	alt     keycode  52 = Meta_period
-keycode  53 = minus            underscore
-	control keycode  53 = Delete
-	alt     keycode  53 = Meta_slash
-keycode  54 = Shift
-keycode  56 = Alt
-keycode  57 = space
-	control keycode  57 = nul
-	alt     keycode  57 = Meta_space
-keycode  58 = Caps_Lock
-keycode  86 = less             greater          bar
-	alt     keycode  86 = Meta_less
-keycode  97 = Control
Signature · 1 line
1.7.1
Quoted 1 line

From 3175ec42e4330fc41e9d75ac835a5d629b400ab4 Mon Sep 17 00:00:00 2001

From: Marko Myllynen <[email protected]>
Date: Thu, 20 Mar 2014 16:53:36 +0200
Subject: [PATCH 2/3] Add new fi.map combining fi-latin1 and fi-latin9

New fi.map which combines all the symbols from fi-latin1 and fi-latin9. Also for (virtual) keyboards missing the less/greater/bar key (between Shift-L and Z) it supports producing bar with Shift+AltGr+i and less/greater with Shift+AltGr+8/9 (as of does the Finnish X keymap).

---
 data/keymaps/i386/qwerty/fi.map |  135 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 135 insertions(+), 0 deletions(-)
 create mode 100644 data/keymaps/i386/qwerty/fi.map
data/keymaps/i386/qwerty/fi.map new file +135 -0

135 lines not on this page · raw message

Signature · 1 line
1.7.1
Quoted 1 line

From ade6a674570ef98062d4e316435f938eae1f21c2 Mon Sep 17 00:00:00 2001

From: Marko Myllynen <[email protected]>
Date: Thu, 20 Mar 2014 16:57:31 +0200
Subject: [PATCH 3/3] Remove now redundant fi-latin1 and fi-latin9 maps

The new fi.map supports all the symbols of these keymaps, they are not meaningful in today's UTF-8 world, and they occasionally cause confusion even among the more seasoned users so let's just remove them.

---
 data/keymaps/i386/qwerty/fi-latin1.map |  111 ------------------------------
 data/keymaps/i386/qwerty/fi-latin9.map |  115 --------------------------------
 2 files changed, 0 insertions(+), 226 deletions(-)
 delete mode 100644 data/keymaps/i386/qwerty/fi-latin1.map
 delete mode 100644 data/keymaps/i386/qwerty/fi-latin9.map
data/keymaps/i386/qwerty/fi-latin1.map deleted +0 -111

111 lines not on this page · raw message

data/keymaps/i386/qwerty/fi-latin9.map deleted +0 -115

115 lines not on this page · raw message

Signature · 1 line
1.7.1
Applied
#1 lore raw
Quoted 9 lines · Marko Myllynen

Hi,

please find the attached patch series to sanitize Finnish keymaps:
first, it removes the obsolete fi.map (which doesn't even match keyboard engravings), then introduces a new fi.map which combines fi-latin1 and fi-latin9 and makes it possible to produces bar/less/greater on (virtual) keyboards missing the less/greater key, and finally removes now redundant fi-latin1/fi-latin9 maps. Please see the patches for more detailed description.

Applied! Thank you!

Signature · 1 line
Rgrds, legion