wscons: aufgeräumt und Ebene 3 zu grossen teilen drin

git-svn-id: https://svn.neo-layout.org@1785 b9310e46-f624-0410-8ea1-cfbb3a30dc96

1 files changed, 57 insertions, 57 deletions

diff --git a/unix/openbsd/wskbdmap_mfii.c b/unix/openbsd/wskbdmap_mfii.c
index ba80310..0dd2674 100644
--- a/unix/openbsd/wskbdmap_mfii.c
+++ b/unix/openbsd/wskbdmap_mfii.c
@@ -199,66 +199,66 @@ static const keysym_t pckbd_keydesc_neo[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(1),   KS_Escape,
     KC(2),   KS_1,		KS_exclam,
-    KC(3),	KS_2,		KS_at,
-    KC(4),		KS_3,		KS_numbersign,
+    KC(3),   KS_2,		KS_paragraph,
+    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_Delete,
-    KC(15),			KS_Tab,
-    KC(16),			KS_x,
-    KC(17),			KS_v,
-    KC(18),			KS_l,
-    KC(19),			KS_c,
-    KC(20),			KS_w,
-    KC(21),			KS_k,
-    KC(22),			KS_h,
-    KC(23),			KS_g,
-    KC(24),			KS_f,
-    KC(25),			KS_q,
-    KC(26),			KS_ssharp,
-    KC(27),			KS_bracketright,
-    KC(28),			KS_Return,
+    KC(8),   KS_7,		KS_dollar,
+    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_Delete,
+    KC(15),  KS_Tab,
+    KC(16),  KS_x,		KS_X,		/* un */
+    KC(17),  KS_v,		KS_V,		KS_underscore,
+    KC(18),  KS_l,		KS_L,		KS_bracketleft,
+    KC(19),  KS_c,		KS_C,		KS_bracketright,
+    KC(20),  KS_w,		KS_W,		KS_dead_circumflex, /*falsch*/
+    KC(21),  KS_k,		KS_K,		KS_exclam,
+    KC(22),  KS_h,		KS_H,		KS_less,
+    KC(23),  KS_g,		KS_G,		KS_greater,
+    KC(24),  KS_f,		KS_F,		KS_equal,
+    KC(25),  KS_q,		KS_Q,		KS_ampersand,
+    KC(26),  KS_ssharp,
+    KC(27),  KS_bracketright,
+    KC(28),  KS_Return,
     KC(29),  KS_Control_L,
-    KC(30),			KS_u,
-    KC(31),			KS_i,
-    KC(32),			KS_a,
-    KC(33),			KS_e,
-    KC(34),			KS_o,
-    KC(35),			KS_s,
-    KC(36),			KS_n,
-    KC(37),			KS_r,
-    KC(38),			KS_t, KS_T, KS_colon,
-    KC(39),			KS_y,	KS_Y, KS_at,
-    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_Alt_L,
-    KC(57),			KS_space,
-    KC(58),			KS_Caps_Lock,
-    KC(157), 	KS_Control_R,
-    KC(184), 		KS_Alt_R,	KS_Multi_key,
-    KC(219),			KS_Meta_L,
-    KC(220),			KS_Meta_R,
+    KC(30),  KS_u,		KS_U,		KS_backslash,
+    KC(31),  KS_i,		KS_I,		KS_slash,
+    KC(32),  KS_a,		KS_A,		KS_braceleft,
+    KC(33),  KS_e,		KS_E,		KS_braceright,
+    KC(34),  KS_o,		KS_O,		KS_asterisk,
+    KC(35),  KS_s,		KS_S,		KS_question,
+    KC(36),  KS_n,		KS_N,		KS_parenleft,
+    KC(37),  KS_r,		KS_R,		KS_parenright,
+    KC(38),  KS_t,		KS_T,		KS_colon,
+    KC(39),  KS_y,		KS_Y,		KS_at,
+    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_udiaeresis,
+    KC(45),  KS_odiaeresis,         /* what are capital values? */
+    KC(46),  KS_adiaeresis,
+    KC(47),  KS_p,		KS_P,
+    KC(48),  KS_z,		KS_Z,		KS_asciitilde,
+    KC(49),  KS_b,		KS_B,		KS_plus,
+    KC(50),  KS_m,		KS_M,		KS_percent,
+    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_Alt_L,
+    KC(57),  KS_space,
+    KC(58),  KS_Caps_Lock,
+    KC(157), KS_Control_R,
+    KC(184), KS_Alt_R,	KS_Multi_key,
+    KC(219), KS_Meta_L,
+    KC(220), KS_Meta_R,
 };
 
 static const keysym_t pckbd_keydesc_dk[] = {
@@ -924,7 +924,7 @@ static const keysym_t pckbd_keydesc_si[]=
     KC(34),  KS_g,		KS_G,		KS_bracketright,
     KC(37),  KS_k,		KS_K,		KS_L2_lstroke,
     KC(38),  KS_l,		KS_L,		KS_L2_Lstroke,
-    KC(39),  KS_L2_ccaron,	KS_L2_Ccaron,	
+    KC(39),  KS_L2_ccaron,	KS_L2_Ccaron,
     KC(40),  KS_L2_cacute,	KS_L2_Cacute,	KS_ssharp,
     KC(41),  KS_cedilla,	KS_diaeresis,
     KC(43),  KS_L2_zcaron,	KS_L2_Zcaron,	KS_currency,