From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.2.5 Message-ID: <532BFF14.4000708@redhat.com> Date: Fri, 21 Mar 2014 10:57:56 +0200 From: Marko Myllynen Organization: Red Hat User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131028 Thunderbird/17.0.10 MIME-Version: 1.0 To: kbd@lists.altlinux.org Content-Type: multipart/mixed; boundary="------------050402070200070801000303" X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Subject: [kbd] Sanitize Finnish keymaps X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: myllynen@redhat.com, Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Mar 2014 08:58:09 -0000 Archived-At: List-Archive: This is a multi-part message in MIME format. --------------050402070200070801000303 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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, -- Marko Myllynen --------------050402070200070801000303 Content-Type: text/plain; charset=UTF-8; name="0001-Remove-obsolete-fi.map.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-Remove-obsolete-fi.map.patch" >>From a0b089ed81e90e06c90bd399c52bd3362d4502f0 Mon Sep 17 00:00:00 2001 From: Marko Myllynen 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 --- data/keymaps/i386/qwerty/fi.map | 90 --------------------------------------- 1 files changed, 0 insertions(+), 90 deletions(-) delete mode 100644 data/keymaps/i386/qwerty/fi.map diff --git a/data/keymaps/i386/qwerty/fi.map b/data/keymaps/i386/qwerty/fi.map deleted file mode 100644 index 98a2d50..0000000 --- a/data/keymaps/i386/qwerty/fi.map +++ /dev/null @@ -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 -- 1.7.1 --------------050402070200070801000303 Content-Type: text/plain; charset=UTF-8; name="0002-Add-new-fi.map-combining-fi-latin1-and-fi-latin9.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename*0="0002-Add-new-fi.map-combining-fi-latin1-and-fi-latin9.patch" >>From 3175ec42e4330fc41e9d75ac835a5d629b400ab4 Mon Sep 17 00:00:00 2001 From: Marko Myllynen 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 diff --git a/data/keymaps/i386/qwerty/fi.map b/data/keymaps/i386/qwerty/fi.map new file mode 100644 index 0000000..0cf8665 --- /dev/null +++ b/data/keymaps/i386/qwerty/fi.map @@ -0,0 +1,135 @@ +# fi.map: Classic Finnish keymap with ISO-8859-1/ISO-8859-15 symbols +# Changes by Johan Myréen 1997 +# Changes by Marko Myllynen 2001, 2002, 2014 + +keymaps 0-6,8-10,12-14 +alt_is_meta +include "qwerty-layout" + altgr keycode 18 = U+20AC + altgr shift keycode 18 = cent + altgr keycode 19 = registered + altgr shift keycode 19 = VoidSymbol + altgr keycode 20 = +thorn + altgr shift keycode 20 = +THORN + altgr keycode 23 = U+0131 + altgr shift keycode 23 = bar + altgr keycode 25 = paragraph + altgr shift keycode 25 = VoidSymbol + altgr keycode 30 = U+0259 + altgr shift keycode 30 = U+018F + altgr keycode 31 = U+0161 + altgr shift keycode 31 = U+0160 + altgr control keycode 31 = ssharp + altgr keycode 32 = +eth + altgr shift keycode 32 = +ETH + altgr keycode 34 = U+014B + altgr shift keycode 34 = U+014A + altgr keycode 37 = U+0138 + altgr shift keycode 37 = VoidSymbol + altgr keycode 44 = U+017E + altgr shift keycode 44 = U+017D + altgr keycode 45 = multiply + shift altgr keycode 45 = division + altgr keycode 46 = copyright + altgr shift keycode 46 = cent + altgr keycode 48 = ssharp + altgr shift keycode 48 = VoidSymbol + altgr keycode 49 = +ntilde + altgr shift keycode 49 = +Ntilde + altgr keycode 50 = mu + altgr shift keycode 50 = VoidSymbol +include "linux-with-alt-and-altgr" + plain keycode 83 = KP_Comma +strings as usual + +keycode 1 = Escape +keycode 2 = one exclam exclamdown + altgr shift keycode 2 = onesuperior +keycode 3 = two quotedbl at + control keycode 3 = nul + control altgr keycode 3 = nul + altgr shift keycode 3 = twosuperior +keycode 4 = three numbersign sterling + control keycode 4 = Escape + altgr shift keycode 4 = threesuperior +keycode 5 = four currency dollar + control keycode 5 = Control_backslash + altgr shift keycode 5 = cent +keycode 6 = five percent U+20AC + control keycode 6 = Control_bracketright + altgr shift keycode 6 = masculine +keycode 7 = six ampersand yen + control keycode 7 = Control_asciicircum + altgr shift keycode 7 = ordfeminine +keycode 8 = seven slash braceleft + control keycode 8 = Control_underscore + altgr shift keycode 8 = plusminus +keycode 9 = eight parenleft bracketleft + control keycode 9 = Delete + control altgr keycode 9 = Escape + altgr shift keycode 9 = less + altgr control keycode 9 = guillemotleft +keycode 10 = nine parenright bracketright + control altgr keycode 10 = Control_bracketright + altgr shift keycode 10 = greater + altgr control keycode 10 = guillemotright +keycode 11 = zero equal braceright + altgr shift keycode 11 = degree +keycode 12 = plus question backslash + control keycode 12 = Control_underscore + control altgr keycode 12 = Control_backslash + altgr shift keycode 12 = questiondown +keycode 13 = dead_acute dead_grave dead_cedilla + alt keycode 13 = Meta_equal + alt shift keycode 13 = Meta_grave + altgr shift keycode 13 = dead_ogonek +keycode 14 = Delete +keycode 15 = Tab + shift keycode 15 = Meta_Tab +keycode 26 = +aring +Aring U+0153 + control keycode 26 = Escape + alt keycode 26 = Meta_bracketleft + altgr shift keycode 26 = U+0152 +keycode 27 = dead_diaeresis dead_circumflex dead_tilde + control keycode 27 = Control_bracketright + control shift keycode 27 = Control_asciicircum + alt keycode 27 = Meta_bracketright + alt shift keycode 27 = Meta_asciicircum + alt altgr keycode 27 = Meta_asciitilde + altgr shift keycode 27 = dead_caron +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 39 = +odiaeresis +Odiaeresis +oslash + alt keycode 39 = Meta_semicolon + altgr shift keycode 39 = +Oslash +keycode 40 = +adiaeresis +Adiaeresis +ae + alt keycode 40 = Meta_apostrophe + altgr shift keycode 40 = +AE +keycode 41 = section onehalf onequarter + control keycode 41 = nul + alt keycode 41 = Meta_grave + altgr shift keycode 41 = threequarters +keycode 42 = Shift +keycode 43 = apostrophe asterisk dead_caron + control keycode 43 = Control_backslash + altgr shift keycode 43 = dead_breve +keycode 51 = comma semicolon dead_cedilla + altgr shift keycode 51 = dead_ogonek +keycode 52 = period colon periodcentered + altgr shift keycode 52 = notsign +keycode 53 = minus underscore hyphen + control keycode 53 = Control_underscore + control shift keycode 53 = Control_underscore + control alt shift keycode 53 = Meta_Control_underscore + altgr shift keycode 53 = macron +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space space space + control keycode 57 = nul + altgr shift keycode 57 = nobreakspace +keycode 58 = Caps_Lock +keycode 86 = less greater bar + alt altgr keycode 86 = Meta_bar + altgr shift keycode 86 = brokenbar +keycode 97 = Control -- 1.7.1 --------------050402070200070801000303 Content-Type: text/plain; charset=UTF-8; name="0003-Remove-now-redundant-fi-latin1-and-fi-latin9-maps.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename*0="0003-Remove-now-redundant-fi-latin1-and-fi-latin9-maps.patch" >>From ade6a674570ef98062d4e316435f938eae1f21c2 Mon Sep 17 00:00:00 2001 From: Marko Myllynen 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 diff --git a/data/keymaps/i386/qwerty/fi-latin1.map b/data/keymaps/i386/qwerty/fi-latin1.map deleted file mode 100644 index 98f5d15..0000000 --- a/data/keymaps/i386/qwerty/fi-latin1.map +++ /dev/null @@ -1,111 +0,0 @@ -# fi-latin1.map: Finnish keymap with ISO-8859-1 symbols -# Changes by Johan Myréen 1997-08-19 -# Changes by Marko Myllynen 2001-04-05, 2002-01-16 - -charset "iso-8859-1" -keymaps 0-6,8-10,12-14 -alt_is_meta -include "qwerty-layout" - altgr keycode 18 = currency - altgr keycode 19 = registered - altgr keycode 20 = +thorn - altgr shift keycode 20 = +THORN - altgr keycode 25 = paragraph - altgr control keycode 31 = ssharp - altgr keycode 32 = +eth - altgr shift keycode 32 = +ETH - altgr keycode 45 = multiply - shift altgr keycode 45 = division - altgr keycode 46 = copyright - altgr shift keycode 46 = cent - altgr keycode 49 = +ntilde - altgr shift keycode 49 = +Ntilde - altgr keycode 50 = mu -include "linux-with-alt-and-altgr" - plain keycode 83 = KP_Comma -strings as usual - -keycode 1 = Escape -keycode 2 = one exclam exclamdown - altgr shift keycode 2 = onesuperior -keycode 3 = two quotedbl at - control keycode 3 = nul - control altgr keycode 3 = nul - altgr shift keycode 3 = twosuperior -keycode 4 = three numbersign sterling - control keycode 4 = Escape - altgr shift keycode 4 = threesuperior -keycode 5 = four currency dollar - control keycode 5 = Control_backslash - altgr shift keycode 5 = cent -keycode 6 = five percent currency - control keycode 6 = Control_bracketright - altgr shift keycode 6 = masculine -keycode 7 = six ampersand yen - control keycode 7 = Control_asciicircum - altgr shift keycode 7 = ordfeminine -keycode 8 = seven slash braceleft - control keycode 8 = Control_underscore - altgr shift keycode 8 = plusminus -keycode 9 = eight parenleft bracketleft - control keycode 9 = Delete - control altgr keycode 9 = Escape - altgr shift keycode 9 = guillemotleft -keycode 10 = nine parenright bracketright - control altgr keycode 10 = Control_bracketright - altgr shift keycode 10 = guillemotright -keycode 11 = zero equal braceright - altgr shift keycode 11 = degree -keycode 12 = plus question backslash - control keycode 12 = Control_underscore - control altgr keycode 12 = Control_backslash - altgr shift keycode 12 = questiondown -keycode 13 = dead_acute dead_grave - alt keycode 13 = Meta_equal - alt shift keycode 13 = Meta_grave -keycode 14 = Delete -keycode 15 = Tab - shift keycode 15 = Meta_Tab -keycode 26 = +aring +Aring - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -keycode 27 = dead_diaeresis dead_circumflex dead_tilde - control keycode 27 = Control_bracketright - control shift keycode 27 = Control_asciicircum - alt keycode 27 = Meta_bracketright - alt shift keycode 27 = Meta_asciicircum - alt altgr keycode 27 = Meta_asciitilde -keycode 28 = Return - alt keycode 28 = Meta_Control_m -keycode 29 = Control -keycode 39 = +odiaeresis +Odiaeresis +oslash - alt keycode 39 = Meta_semicolon - altgr shift keycode 39 = +Oslash -keycode 40 = +adiaeresis +Adiaeresis +ae - alt keycode 40 = Meta_apostrophe - altgr shift keycode 40 = +AE -keycode 41 = section onehalf onequarter - control keycode 41 = nul - alt keycode 41 = Meta_grave - altgr shift keycode 41 = threequarters -keycode 42 = Shift -keycode 43 = apostrophe asterisk - control keycode 43 = Control_backslash -keycode 51 = comma semicolon dead_cedilla -keycode 52 = period colon periodcentered - altgr shift keycode 52 = notsign -keycode 53 = minus underscore hyphen - control keycode 53 = Control_underscore - control shift keycode 53 = Control_underscore - control alt shift keycode 53 = Meta_Control_underscore - altgr shift keycode 53 = macron -keycode 54 = Shift -keycode 56 = Alt -keycode 57 = space - control keycode 57 = nul - altgr shift keycode 57 = nobreakspace -keycode 58 = Caps_Lock -keycode 86 = less greater bar - alt altgr keycode 86 = Meta_bar - altgr shift keycode 86 = brokenbar -keycode 97 = Control diff --git a/data/keymaps/i386/qwerty/fi-latin9.map b/data/keymaps/i386/qwerty/fi-latin9.map deleted file mode 100644 index 06bc52b..0000000 --- a/data/keymaps/i386/qwerty/fi-latin9.map +++ /dev/null @@ -1,115 +0,0 @@ -# fi-latin9.map: Finnish keymap with ISO-8859-15 symbols -# Marko Myllynen 2002-01-16 -# Based on fi-latin1.map by Johan Myréen - -charset "iso-8859-15" -keymaps 0-6,8-10,12-14 -alt_is_meta -include "qwerty-layout" - altgr keycode 18 = euro - altgr keycode 19 = registered - altgr keycode 20 = +thorn - altgr shift keycode 20 = +THORN - altgr keycode 25 = paragraph - altgr keycode 31 = +scaron - altgr shift keycode 31 = +Scaron - altgr control keycode 31 = ssharp - altgr keycode 32 = +eth - altgr shift keycode 32 = +ETH - altgr keycode 44 = +zcaron - altgr shift keycode 44 = +Zcaron - altgr keycode 45 = multiply - shift altgr keycode 45 = division - altgr keycode 46 = copyright - altgr shift keycode 46 = cent - altgr keycode 49 = +ntilde - altgr shift keycode 49 = +Ntilde - altgr keycode 50 = mu -include "linux-with-alt-and-altgr" - plain keycode 83 = KP_Comma -strings as usual - -keycode 1 = Escape -keycode 2 = one exclam exclamdown - altgr shift keycode 2 = onesuperior -keycode 3 = two quotedbl at - control keycode 3 = nul - control altgr keycode 3 = nul - altgr shift keycode 3 = twosuperior -keycode 4 = three numbersign sterling - control keycode 4 = Escape - altgr shift keycode 4 = threesuperior -keycode 5 = four VoidSymbol dollar - control keycode 5 = Control_backslash - altgr shift keycode 5 = cent -keycode 6 = five percent euro - control keycode 6 = Control_bracketright - altgr shift keycode 6 = masculine -keycode 7 = six ampersand yen - control keycode 7 = Control_asciicircum - altgr shift keycode 7 = ordfeminine -keycode 8 = seven slash braceleft - control keycode 8 = Control_underscore - altgr shift keycode 8 = plusminus -keycode 9 = eight parenleft bracketleft - control keycode 9 = Delete - control altgr keycode 9 = Escape - altgr shift keycode 9 = guillemotleft -keycode 10 = nine parenright bracketright - control altgr keycode 10 = Control_bracketright - altgr shift keycode 10 = guillemotright -keycode 11 = zero equal braceright - altgr shift keycode 11 = degree -keycode 12 = plus question backslash - control keycode 12 = Control_underscore - control altgr keycode 12 = Control_backslash - altgr shift keycode 12 = questiondown -keycode 13 = dead_acute dead_grave - alt keycode 13 = Meta_equal - alt shift keycode 13 = Meta_grave -keycode 14 = Delete -keycode 15 = Tab - shift keycode 15 = Meta_Tab -keycode 26 = +aring +Aring +oe - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft - altgr shift keycode 26 = +OE -keycode 27 = dead_diaeresis dead_circumflex dead_tilde - control keycode 27 = Control_bracketright - control shift keycode 27 = Control_asciicircum - alt keycode 27 = Meta_bracketright - alt shift keycode 27 = Meta_asciicircum - alt altgr keycode 27 = Meta_asciitilde - altgr shift keycode 27 = dead_caron -keycode 28 = Return - alt keycode 28 = Meta_Control_m -keycode 29 = Control -keycode 39 = +odiaeresis +Odiaeresis +oslash - alt keycode 39 = Meta_semicolon - altgr shift keycode 39 = +Oslash -keycode 40 = +adiaeresis +Adiaeresis +ae - alt keycode 40 = Meta_apostrophe - altgr shift keycode 40 = +AE -keycode 41 = section - control keycode 41 = nul - alt keycode 41 = Meta_grave -keycode 42 = Shift -keycode 43 = apostrophe asterisk - control keycode 43 = Control_backslash -keycode 51 = comma semicolon dead_cedilla -keycode 52 = period colon periodcentered - altgr shift keycode 52 = notsign -keycode 53 = minus underscore hyphen - control keycode 53 = Control_underscore - control shift keycode 53 = Control_underscore - control alt shift keycode 53 = Meta_Control_underscore - altgr shift keycode 53 = macron -keycode 54 = Shift -keycode 56 = Alt -keycode 57 = space - control keycode 57 = nul - altgr shift keycode 57 = nobreakspace -keycode 58 = Caps_Lock -keycode 86 = less greater bar - alt altgr keycode 86 = Meta_bar -keycode 97 = Control -- 1.7.1 --------------050402070200070801000303--