even better lt kbd map (in the best .su tradition ); from vld@vic.lt

1 files changed, 212 insertions, 194 deletions

diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c
index dd9d58462a5..13fd4fe2103 100644
--- a/sys/dev/pckbc/wskbdmap_mfii.c
+++ b/sys/dev/pckbc/wskbdmap_mfii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wskbdmap_mfii.c,v 1.16 2002/04/09 19:07:14 mickey Exp $ */
+/*	$OpenBSD: wskbdmap_mfii.c,v 1.17 2002/04/22 07:44:16 mickey Exp $ */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*-
@@ -47,63 +47,63 @@
 static const keysym_t pckbd_keydesc_us[] = {
 /*  pos      command		normal		shifted */
     KC(1),   KS_Cmd_Debugger,	KS_Escape,
-    KC(2),  			KS_1,		KS_exclam,
-    KC(3),  			KS_2,		KS_at,
-    KC(4),  			KS_3,		KS_numbersign,
-    KC(5),  			KS_4,		KS_dollar,
-    KC(6),  			KS_5,		KS_percent,
-    KC(7),  			KS_6,		KS_asciicircum,
-    KC(8),  			KS_7,		KS_ampersand,
-    KC(9),  			KS_8,		KS_asterisk,
-    KC(10), 			KS_9,		KS_parenleft,
-    KC(11), 			KS_0,		KS_parenright,
-    KC(12), 			KS_minus,	KS_underscore,
-    KC(13), 			KS_equal,	KS_plus,
+    KC(2),			KS_1,		KS_exclam,
+    KC(3),			KS_2,		KS_at,
+    KC(4),			KS_3,		KS_numbersign,
+    KC(5),			KS_4,		KS_dollar,
+    KC(6),			KS_5,		KS_percent,
+    KC(7),			KS_6,		KS_asciicircum,
+    KC(8),			KS_7,		KS_ampersand,
+    KC(9),			KS_8,		KS_asterisk,
+    KC(10),			KS_9,		KS_parenleft,
+    KC(11),			KS_0,		KS_parenright,
+    KC(12),			KS_minus,	KS_underscore,
+    KC(13),			KS_equal,	KS_plus,
     KC(14),  KS_Cmd_ResetEmul,	KS_Delete,
-    KC(15), 			KS_Tab,
-    KC(16), 			KS_q,
-    KC(17), 			KS_w,
-    KC(18), 			KS_e,
-    KC(19), 			KS_r,
-    KC(20), 			KS_t,
-    KC(21), 			KS_y,
-    KC(22), 			KS_u,
-    KC(23), 			KS_i,
-    KC(24), 			KS_o,
-    KC(25), 			KS_p,
-    KC(26), 			KS_bracketleft,	KS_braceleft,
-    KC(27), 			KS_bracketright, KS_braceright,
-    KC(28), 			KS_Return,
+    KC(15),			KS_Tab,
+    KC(16),			KS_q,
+    KC(17),			KS_w,
+    KC(18),			KS_e,
+    KC(19),			KS_r,
+    KC(20),			KS_t,
+    KC(21),			KS_y,
+    KC(22),			KS_u,
+    KC(23),			KS_i,
+    KC(24),			KS_o,
+    KC(25),			KS_p,
+    KC(26),			KS_bracketleft,	KS_braceleft,
+    KC(27),			KS_bracketright, KS_braceright,
+    KC(28),			KS_Return,
     KC(29),  KS_Cmd1,		KS_Control_L,
-    KC(30), 			KS_a,
-    KC(31), 			KS_s,
-    KC(32), 			KS_d,
-    KC(33), 			KS_f,
-    KC(34), 			KS_g,
-    KC(35), 			KS_h,
-    KC(36), 			KS_j,
-    KC(37), 			KS_k,
-    KC(38), 			KS_l,
-    KC(39), 			KS_semicolon,	KS_colon,
-    KC(40), 			KS_apostrophe,	KS_quotedbl,
-    KC(41), 			KS_grave,	KS_asciitilde,
-    KC(42), 			KS_Shift_L,
-    KC(43), 			KS_backslash,	KS_bar,
-    KC(44), 			KS_z,
-    KC(45), 			KS_x,
-    KC(46), 			KS_c,
-    KC(47), 			KS_v,
-    KC(48), 			KS_b,
-    KC(49), 			KS_n,
-    KC(50), 			KS_m,
-    KC(51), 			KS_comma,	KS_less,
-    KC(52), 			KS_period,	KS_greater,
-    KC(53), 			KS_slash,	KS_question,
-    KC(54), 			KS_Shift_R,
-    KC(55), 			KS_KP_Multiply,
+    KC(30),			KS_a,
+    KC(31),			KS_s,
+    KC(32),			KS_d,
+    KC(33),			KS_f,
+    KC(34),			KS_g,
+    KC(35),			KS_h,
+    KC(36),			KS_j,
+    KC(37),			KS_k,
+    KC(38),			KS_l,
+    KC(39),			KS_semicolon,	KS_colon,
+    KC(40),			KS_apostrophe,	KS_quotedbl,
+    KC(41),			KS_grave,	KS_asciitilde,
+    KC(42),			KS_Shift_L,
+    KC(43),			KS_backslash,	KS_bar,
+    KC(44),			KS_z,
+    KC(45),			KS_x,
+    KC(46),			KS_c,
+    KC(47),			KS_v,
+    KC(48),			KS_b,
+    KC(49),			KS_n,
+    KC(50),			KS_m,
+    KC(51),			KS_comma,	KS_less,
+    KC(52),			KS_period,	KS_greater,
+    KC(53),			KS_slash,	KS_question,
+    KC(54),			KS_Shift_R,
+    KC(55),			KS_KP_Multiply,
     KC(56),  KS_Cmd2,		KS_Alt_L,
-    KC(57), 			KS_space,
-    KC(58), 			KS_Caps_Lock,
+    KC(57),			KS_space,
+    KC(58),			KS_Caps_Lock,
     KC(59),  KS_Cmd_Screen0,	KS_f1,
     KC(60),  KS_Cmd_Screen1,	KS_f2,
     KC(61),  KS_Cmd_Screen2,	KS_f3,
@@ -114,21 +114,21 @@ static const keysym_t pckbd_keydesc_us[] = {
     KC(66),  KS_Cmd_Screen7,	KS_f8,
     KC(67),  KS_Cmd_Screen8,	KS_f9,
     KC(68),  KS_Cmd_Screen9,	KS_f10,
-    KC(69), 			KS_Num_Lock,
-    KC(70), 			KS_Hold_Screen,
-    KC(71), 			KS_KP_Home,	KS_KP_7,
-    KC(72), 			KS_KP_Up,	KS_KP_8,
-    KC(73), 			KS_KP_Prior,	KS_KP_9,
-    KC(74), 			KS_KP_Subtract,
-    KC(75), 			KS_KP_Left,	KS_KP_4,
-    KC(76), 			KS_KP_Begin,	KS_KP_5,
-    KC(77), 			KS_KP_Right,	KS_KP_6,
-    KC(78), 			KS_KP_Add,
-    KC(79), 			KS_KP_End,	KS_KP_1,
-    KC(80), 			KS_KP_Down,	KS_KP_2,
-    KC(81), 			KS_KP_Next,	KS_KP_3,
-    KC(82), 			KS_KP_Insert,	KS_KP_0,
-    KC(83), 			KS_KP_Delete,	KS_KP_Decimal,
+    KC(69),			KS_Num_Lock,
+    KC(70),			KS_Hold_Screen,
+    KC(71),			KS_KP_Home,	KS_KP_7,
+    KC(72),			KS_KP_Up,	KS_KP_8,
+    KC(73),			KS_KP_Prior,	KS_KP_9,
+    KC(74),			KS_KP_Subtract,
+    KC(75),			KS_KP_Left,	KS_KP_4,
+    KC(76),			KS_KP_Begin,	KS_KP_5,
+    KC(77),			KS_KP_Right,	KS_KP_6,
+    KC(78),			KS_KP_Add,
+    KC(79),			KS_KP_End,	KS_KP_1,
+    KC(80),			KS_KP_Down,	KS_KP_2,
+    KC(81),			KS_KP_Next,	KS_KP_3,
+    KC(82),			KS_KP_Insert,	KS_KP_0,
+    KC(83),			KS_KP_Delete,	KS_KP_Decimal,
     KC(87),  KS_Cmd_Screen10,	KS_f11,
     KC(88),  KS_Cmd_Screen11,	KS_f12,
     KC(127),			KS_Pause, /* Break */
@@ -271,7 +271,7 @@ static const keysym_t pckbd_keydesc_fr[] = {
     KC(13),  KS_equal,		KS_plus,	KS_braceright,
     KC(16),  KS_a,
     KC(17),  KS_z,
-    KC(26),  KS_dead_circumflex, KS_dead_diaeresis, 
+    KC(26),  KS_dead_circumflex, KS_dead_diaeresis,
     KC(27),  KS_dollar,		KS_sterling,	KS_currency,
     KC(30),  KS_q,
     KC(39),  KS_m,
@@ -289,17 +289,17 @@ static const keysym_t pckbd_keydesc_fr[] = {
 
 static const keysym_t pckbd_keydesc_it[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
-    KC(3),   KS_2,	    	KS_quotedbl,	KS_twosuperior,
-    KC(4),   KS_3,	    	KS_sterling,	KS_threesuperior,
-    KC(5),   KS_4,	    	KS_dollar,
-    KC(6),   KS_5,	    	KS_percent,
-    KC(7),   KS_6,	    	KS_ampersand,
-    KC(8),   KS_7,	    	KS_slash,
-    KC(9),   KS_8,	    	KS_parenleft,
-    KC(10),  KS_9,	    	KS_parenright,
-    KC(11),  KS_0,	    	KS_equal,
+    KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
+    KC(4),   KS_3,		KS_sterling,	KS_threesuperior,
+    KC(5),   KS_4,		KS_dollar,
+    KC(6),   KS_5,		KS_percent,
+    KC(7),   KS_6,		KS_ampersand,
+    KC(8),   KS_7,		KS_slash,
+    KC(9),   KS_8,		KS_parenleft,
+    KC(10),  KS_9,		KS_parenright,
+    KC(11),  KS_0,		KS_equal,
     KC(12),  KS_apostrophe,	KS_question,
-    KC(13),  KS_igrave,	    	KS_asciicircum,
+    KC(13),  KS_igrave,		KS_asciicircum,
     KC(26),  KS_egrave,		KS_eacute,	KS_braceleft,	KS_bracketleft,
     KC(27),  KS_plus,		KS_asterisk,	KS_braceright,	KS_bracketright,
     KC(39),  KS_ograve,		KS_Ccedilla,	KS_at,
@@ -314,46 +314,46 @@ static const keysym_t pckbd_keydesc_it[] = {
 };
 
 static const keysym_t pckbd_keydesc_uk[] = {
-/*  pos      normal             shifted         altgr           shift-altgr */
-    KC(2),   KS_1,              KS_exclam,      KS_plusminus,   KS_exclamdown,
-    KC(3),   KS_2,              KS_quotedbl,    KS_twosuperior, KS_cent,
-    KC(4),   KS_3,              KS_sterling,    KS_threesuperior,
-    KC(5),   KS_4,              KS_dollar,      KS_acute,       KS_currency,
-    KC(6),   KS_5,              KS_percent,     KS_mu,          KS_yen,
-    KC(7),   KS_6,              KS_asciicircum, KS_paragraph,
-    KC(8),   KS_7,              KS_ampersand,   KS_periodcentered, KS_brokenbar,
-    KC(9),   KS_8,              KS_asterisk,    KS_cedilla,     KS_ordfeminine,
-    KC(10),  KS_9,              KS_parenleft,   KS_onesuperior, KS_diaeresis,
-    KC(11),  KS_0,              KS_parenright,  KS_masculine,   KS_copyright,
-    KC(12),  KS_minus,          KS_underscore,  KS_hyphen,      KS_ssharp,
-    KC(13),  KS_equal,          KS_plus,        KS_onehalf,    KS_guillemotleft,
-    KC(40),  KS_apostrophe,     KS_at,          KS_section,     KS_Agrave,
-    KC(41),  KS_grave,          KS_grave,       KS_agrave,      KS_agrave,
-    KC(43),  KS_numbersign,     KS_asciitilde,  KS_sterling,    KS_thorn,
-    KC(86),  KS_backslash,      KS_bar,         KS_Udiaeresis,
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(2),   KS_1,		KS_exclam,	KS_plusminus,	KS_exclamdown,
+    KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,	KS_cent,
+    KC(4),   KS_3,		KS_sterling,	KS_threesuperior,
+    KC(5),   KS_4,		KS_dollar,	KS_acute,	KS_currency,
+    KC(6),   KS_5,		KS_percent,	KS_mu,		KS_yen,
+    KC(7),   KS_6,		KS_asciicircum,	KS_paragraph,
+    KC(8),   KS_7,		KS_ampersand,	KS_periodcentered, KS_brokenbar,
+    KC(9),   KS_8,		KS_asterisk,	KS_cedilla,	KS_ordfeminine,
+    KC(10),  KS_9,		KS_parenleft,	KS_onesuperior,	KS_diaeresis,
+    KC(11),  KS_0,		KS_parenright,	KS_masculine,	KS_copyright,
+    KC(12),  KS_minus,		KS_underscore,	KS_hyphen,	KS_ssharp,
+    KC(13),  KS_equal,		KS_plus,	KS_onehalf,    KS_guillemotleft,
+    KC(40),  KS_apostrophe,	KS_at,		KS_section,	KS_Agrave,
+    KC(41),  KS_grave,		KS_grave,	KS_agrave,	KS_agrave,
+    KC(43),  KS_numbersign,	KS_asciitilde,  KS_sterling,	KS_thorn,
+    KC(86),  KS_backslash,	KS_bar,		KS_Udiaeresis,
 };
 
 static const keysym_t pckbd_keydesc_jp[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
-    KC(3),   KS_2,              KS_quotedbl,
-    KC(7),   KS_6,              KS_ampersand,
-    KC(8),   KS_7,              KS_apostrophe,
-    KC(9),   KS_8,              KS_parenleft,
-    KC(10),  KS_9,              KS_parenright,
+    KC(3),   KS_2,		KS_quotedbl,
+    KC(7),   KS_6,		KS_ampersand,
+    KC(8),   KS_7,		KS_apostrophe,
+    KC(9),   KS_8,		KS_parenleft,
+    KC(10),  KS_9,		KS_parenright,
     KC(11),  KS_0,
-    KC(12),  KS_minus,          KS_equal,
-    KC(13),  KS_asciicircum,    KS_asciitilde,
-    KC(26),  KS_at,             KS_grave,
-    KC(27),  KS_bracketleft,    KS_braceleft,
-    KC(39),  KS_semicolon,      KS_plus,
-    KC(40),  KS_colon,          KS_asterisk,
+    KC(12),  KS_minus,		KS_equal,
+    KC(13),  KS_asciicircum,	KS_asciitilde,
+    KC(26),  KS_at,		KS_grave,
+    KC(27),  KS_bracketleft,	KS_braceleft,
+    KC(39),  KS_semicolon,	KS_plus,
+    KC(40),  KS_colon,		KS_asterisk,
     KC(41),  KS_Zenkaku_Hankaku, /* replace grave/tilde */
-    KC(43),  KS_bracketright,   KS_braceright,
+    KC(43),  KS_bracketright,	KS_braceright,
     KC(112), KS_Hiragana_Katakana,
-    KC(115), KS_backslash,      KS_underscore,
+    KC(115), KS_backslash,	KS_underscore,
     KC(121), KS_Henkan,
     KC(123), KS_Muhenkan,
-    KC(125), KS_backslash,      KS_bar,
+    KC(125), KS_backslash,	KS_bar,
 };
 
 static const keysym_t pckbd_keydesc_es[] = {
@@ -384,15 +384,33 @@ static const keysym_t pckbd_keydesc_es[] = {
 
 static const keysym_t pckbd_keydesc_lt[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
-    KC(2),   KS_1,		KS_exclam,	KS_L7_aogonek,	KS_L7_Aogonek,
-    KC(3),   KS_2,		KS_at,		KS_L7_ccaron,	KS_L7_Ccaron,
-    KC(4),   KS_3,		KS_numbersign,	KS_L7_eogonek,	KS_L7_Eogonek,
-    KC(5),   KS_4,		KS_dollar,	KS_L7_edot,	KS_L7_Edot,
-    KC(6),   KS_5,		KS_percent,	KS_L7_iogonek,	KS_L7_Iogonek,
-    KC(7),   KS_6,		KS_asciicircum,	KS_L7_scaron,	KS_L7_Scaron,
-    KC(8),   KS_7,		KS_ampersand,	KS_L7_uogonek,	KS_L7_Uogonek,
-    KC(9),   KS_8,		KS_asterisk,	KS_L7_umacron,	KS_L7_Umacron,
-    KC(13),  KS_equal,		KS_plus,	KS_L7_zcaron,	KS_L7_Zcaron,
+    KC(2),   KS_exclam,		KS_1,		KS_at,
+    KC(3),   KS_minus,		KS_2,		KS_underscore,
+    KC(4),   KS_slash,		KS_3,		KS_numbersign,
+    KC(5),   KS_semicolon,	KS_4,		KS_dollar,
+    KC(6),   KS_colon,		KS_5,		KS_paragraph,
+    KC(7),   KS_comma,		KS_6,		KS_asciicircum,
+    KC(8),   KS_period,		KS_7,		KS_ampersand,
+    KC(9),   KS_equal,		KS_8,		KS_asterisk,
+    KC(10),  KS_bracketleft,	KS_9,		KS_parenleft,
+    KC(11),  KS_bracketright,	KS_0,		KS_parenright,
+    KC(12),  KS_question,	KS_plus,	KS_apostrophe,
+    KC(13),  KS_x,		KS_X,		KS_percent,
+    KC(16),  KS_L7_aogonek,	KS_L7_Aogonek,
+    KC(17),  KS_L7_zcaron,	KS_L7_Zcaron,
+    KC(18),  KS_e,		KS_E,		KS_currency,
+    KC(26),  KS_L7_iogonek,	KS_L7_Iogonek,	KS_braceleft,
+    KC(27),  KS_w,		KS_W,		KS_braceright,
+    KC(33),  KS_L7_scaron,	KS_L7_Scaron,
+    KC(39),  KS_L7_uogonek,	KS_L7_Uogonek,
+    KC(40),  KS_L7_edot,	KS_L7_Edot,	KS_quotedbl,
+    KC(41),  KS_grave,		KS_asciitilde,
+    KC(43),  KS_q,		KS_Q,		KS_bar,
+    KC(45),  KS_L7_umacron,	KS_L7_Umacron,
+    KC(51),  KS_L7_ccaron,	KS_L7_Ccaron,	KS_L7_dbllow9quot,
+    KC(52),  KS_f,		KS_F,		KS_L7_leftdblquot,
+    KC(53),  KS_L7_eogonek,	KS_L7_Eogonek,	KS_backslash,
+    KC(57),  KS_space,		KS_space,	KS_nobreakspace,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
@@ -449,17 +467,17 @@ static const keysym_t pckbd_keydesc_us_declk[] = {
     KC(74),	KS_KP_F4, /* replace subtract */
 
     /* keypad is numbers only - no num lock */
-    KC(71), 	KS_KP_7,
-    KC(72), 	KS_KP_8,
-    KC(73), 	KS_KP_9,
-    KC(75), 	KS_KP_4,
-    KC(76), 	KS_KP_5,
-    KC(77), 	KS_KP_6,
-    KC(79), 	KS_KP_1,
-    KC(80), 	KS_KP_2,
-    KC(81), 	KS_KP_3,
-    KC(82), 	KS_KP_0,
-    KC(83), 	KS_KP_Decimal,
+    KC(71),	KS_KP_7,
+    KC(72),	KS_KP_8,
+    KC(73),	KS_KP_9,
+    KC(75),	KS_KP_4,
+    KC(76),	KS_KP_5,
+    KC(77),	KS_KP_6,
+    KC(79),	KS_KP_1,
+    KC(80),	KS_KP_2,
+    KC(81),	KS_KP_3,
+    KC(82),	KS_KP_0,
+    KC(83),	KS_KP_Decimal,
 
     KC(206),	KS_KP_Subtract,
     KC(78),	KS_KP_Separator, /* replace add */
@@ -469,44 +487,44 @@ static const keysym_t pckbd_keydesc_us_declk[] = {
 
 static const keysym_t pckbd_keydesc_us_dvorak[] = {
 /*  pos      command		normal		shifted */
-    KC(12), 			KS_bracketleft,	KS_braceleft,
-    KC(13), 			KS_bracketright, KS_braceright,
-    KC(16), 			KS_apostrophe, KS_quotedbl,
-    KC(17), 			KS_comma, KS_less,
-    KC(18), 			KS_period, KS_greater,
-    KC(19), 			KS_p,
-    KC(20), 			KS_y,
-    KC(21), 			KS_f,
-    KC(22), 			KS_g,
-    KC(23), 			KS_c,
-    KC(24), 			KS_r,
-    KC(25), 			KS_l,
-    KC(26), 			KS_slash, KS_question,
-    KC(27), 			KS_equal, KS_plus,
-    KC(31), 			KS_o,
-    KC(32), 			KS_e,
-    KC(33), 			KS_u,
-    KC(34), 			KS_i,
-    KC(35), 			KS_d,
-    KC(36), 			KS_h,
-    KC(37), 			KS_t,
-    KC(38), 			KS_n,
-    KC(39), 			KS_s,
-    KC(40), 			KS_minus, KS_underscore,
-    KC(44), 			KS_semicolon, KS_colon,
-    KC(45), 			KS_q,
-    KC(46), 			KS_j,
-    KC(47), 			KS_k,
-    KC(48), 			KS_x,
-    KC(49), 			KS_b,
-    KC(51), 			KS_w,
-    KC(52), 			KS_v,
-    KC(53), 			KS_z,
+    KC(12),			KS_bracketleft,	KS_braceleft,
+    KC(13),			KS_bracketright, KS_braceright,
+    KC(16),			KS_apostrophe, KS_quotedbl,
+    KC(17),			KS_comma, KS_less,
+    KC(18),			KS_period, KS_greater,
+    KC(19),			KS_p,
+    KC(20),			KS_y,
+    KC(21),			KS_f,
+    KC(22),			KS_g,
+    KC(23),			KS_c,
+    KC(24),			KS_r,
+    KC(25),			KS_l,
+    KC(26),			KS_slash, KS_question,
+    KC(27),			KS_equal, KS_plus,
+    KC(31),			KS_o,
+    KC(32),			KS_e,
+    KC(33),			KS_u,
+    KC(34),			KS_i,
+    KC(35),			KS_d,
+    KC(36),			KS_h,
+    KC(37),			KS_t,
+    KC(38),			KS_n,
+    KC(39),			KS_s,
+    KC(40),			KS_minus, KS_underscore,
+    KC(44),			KS_semicolon, KS_colon,
+    KC(45),			KS_q,
+    KC(46),			KS_j,
+    KC(47),			KS_k,
+    KC(48),			KS_x,
+    KC(49),			KS_b,
+    KC(51),			KS_w,
+    KC(52),			KS_v,
+    KC(53),			KS_z,
 };
 
 static const keysym_t pckbd_keydesc_swapctrlcaps[] = {
 /*  pos      command		normal		shifted */
-    KC(29), 			KS_Caps_Lock,
+    KC(29),			KS_Caps_Lock,
     KC(58),  KS_Cmd1,		KS_Control_L,
 };
 
@@ -523,7 +541,7 @@ static const keysym_t pckbd_keydesc_iopener[] = {
     KC(67),  KS_Cmd_Screen7,	KS_f8,
     KC(68),  KS_Cmd_Screen8,	KS_f9,
     KC(87),  KS_Cmd_Screen9,	KS_f10,
-    KC(88), 			KS_f11,
+    KC(88),			KS_f11,
 };
 
 static const keysym_t pckbd_keydesc_ru[] = {
@@ -647,35 +665,35 @@ static const keysym_t pckbd_keydesc_sg_nodead[] = {
 };
 
 static const keysym_t pckbd_keydesc_sf[] = {
-/*  pos      normal            shifted         altgr           shift-altgr */
-    KC(26),  KS_egrave,        KS_udiaeresis,  KS_bracketleft,
-    KC(39),  KS_eacute,        KS_odiaeresis,
-    KC(40),  KS_agrave,        KS_adiaeresis,  KS_braceleft
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(26),  KS_egrave,		KS_udiaeresis,	KS_bracketleft,
+    KC(39),  KS_eacute,		KS_odiaeresis,
+    KC(40),  KS_agrave,		KS_adiaeresis,	KS_braceleft
 };
 
 static const keysym_t pckbd_keydesc_pt[] = {
-/*  pos      normal            shifted         altgr           shift-altgr */
-    KC(3),   KS_2,             KS_quotedbl,    KS_at,
-    KC(4),   KS_3,             KS_numbersign,  KS_sterling,
-    KC(5),   KS_4,             KS_dollar,
-    KC(7),   KS_6,             KS_ampersand,
-    KC(8),   KS_7,             KS_slash,       KS_braceleft,
-    KC(9),   KS_8,             KS_parenleft,   KS_bracketleft,
-    KC(10),  KS_9,             KS_parenright,  KS_bracketright,
-    KC(11),  KS_0,             KS_equal,       KS_braceright,
-    KC(12),  KS_apostrophe,    KS_question,
-    KC(13),  KS_less,          KS_greater,
-    KC(26),  KS_plus,          KS_asterisk,
-    KC(27),  KS_dead_acute,    KS_dead_grave,
-    KC(39),  KS_ccedilla,      KS_Ccedilla,
-    KC(40),  KS_masculine,     KS_ordfeminine,
-    KC(41),  KS_backslash,     KS_bar,
-    KC(43),  KS_dead_tilde,    KS_dead_circumflex,
-    KC(51),  KS_comma,         KS_semicolon,
-    KC(52),  KS_period,        KS_colon,
-    KC(53),  KS_minus,         KS_underscore,
-    KC(86),  KS_less,          KS_greater,
-    KC(184), KS_Mode_switch,   KS_Multi_key,
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(3),   KS_2,		KS_quotedbl,	KS_at,
+    KC(4),   KS_3,		KS_numbersign,	KS_sterling,
+    KC(5),   KS_4,		KS_dollar,
+    KC(7),   KS_6,		KS_ampersand,
+    KC(8),   KS_7,		KS_slash,	KS_braceleft,
+    KC(9),   KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(10),  KS_9,		KS_parenright,	KS_bracketright,
+    KC(11),  KS_0,		KS_equal,	KS_braceright,
+    KC(12),  KS_apostrophe,	KS_question,
+    KC(13),  KS_less,		KS_greater,
+    KC(26),  KS_plus,		KS_asterisk,
+    KC(27),  KS_dead_acute,	KS_dead_grave,
+    KC(39),  KS_ccedilla,	KS_Ccedilla,
+    KC(40),  KS_masculine,	KS_ordfeminine,
+    KC(41),  KS_backslash,	KS_bar,
+    KC(43),  KS_dead_tilde,	KS_dead_circumflex,
+    KC(51),  KS_comma,		KS_semicolon,
+    KC(52),  KS_period,		KS_colon,
+    KC(53),  KS_minus,		KS_underscore,
+    KC(86),  KS_less,		KS_greater,
+    KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
 #define KBD_MAP(name, base, map) \
@@ -685,7 +703,7 @@ const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	pckbd_keydesc_us),
 	KBD_MAP(KB_DE,			KB_US,	pckbd_keydesc_de),
 	KBD_MAP(KB_DE | KB_NODEAD,	KB_DE,	pckbd_keydesc_de_nodead),
-	KBD_MAP(KB_FR,                  KB_US,  pckbd_keydesc_fr),
+	KBD_MAP(KB_FR,			KB_US,  pckbd_keydesc_fr),
 	KBD_MAP(KB_DK,			KB_US,	pckbd_keydesc_dk),
 	KBD_MAP(KB_DK | KB_NODEAD,	KB_DK,	pckbd_keydesc_dk_nodead),
 	KBD_MAP(KB_IT,			KB_US,	pckbd_keydesc_it),