improving mac variants, overwriting de and ch mac variants, b.fd.o#8491

1 files changed, 17 insertions, 30 deletions

diff --git a/symbols/no b/symbols/no
index 515868a..06a053e 100644
--- a/symbols/no
+++ b/symbols/no
@@ -190,35 +190,23 @@ xkb_symbols "mac" {
     // Describes the differences between a very simple en_US
     // keyboard and a very simple Norwegian keybaord
 
-    include "latin"
-
+    include "latin(type4)"
     name[Group1]= "Norway - Macintosh";
 
-    key <TLDE> {	[             bar,         section      ]	};
-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
-    key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};
-    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
-    key <AE10> {	[               0,           equal     	]	};
-
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AC11> {	[              ae,              AE 	]	};
-    key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
-    key <BKSL> {	[              at,        asterisk	]	};
-    key <LSGT> {	[            less,         greater	]	};
-
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
+    key <TLDE>	{ [       bar,    section     ]	};
+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
+    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
+    key <AE11>	{ [      plus,   question     ]	};
+    key <AC11>	{ [        ae,         AE     ]	};
+    key <AD11>	{ [     aring,      Aring     ]	};
+    key <AE12>	{ [ dead_grave, dead_acute,       acute,  dead_ogonek ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,  dead_macron ]	};
+    key <BKSL>	{ [        at,   asterisk     ]	};
 };
 
 
@@ -229,7 +217,6 @@ xkb_symbols "mac_nodeadkeys" {
     include "no(mac)"
     name[Group1]= "Norway - Macintosh, eliminate dead keys";
 
-    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
-
+    key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};
+    key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};
 };