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

1 files changed, 33 insertions, 69 deletions

diff --git a/symbols/de b/symbols/de
index d0585e61..aca4469d 100644
--- a/symbols/de
+++ b/symbols/de
@@ -84,7 +84,7 @@ partial alphanumeric_keys
 xkb_symbols "ro" {
     // add romanian-specific letters to the basic German layout.
     // Romanian symbols are accessible with combination of <AltGr> and
-    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).
+    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).
     // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
     // or "export LC_CTYPE=de_DE.utf8" to your .profile.
 
@@ -297,86 +297,50 @@ xkb_symbols "neo" {
     include "level3(ralt_switch)"
 };
  
-// Macintosh layout (german)
+// Copied from macintosh_vndr/de
+// olh@suse.de   very close to MacOS map
 
 partial alphanumeric_keys 
 xkb_symbols "mac" {
 
-    // Alphanumeric section
+    include "de"
     name[Group1]= "Germany - Macintosh";
 
-    key <TLDE> { [ dead_circumflex,	degree,   doublelowquotemark,	leftdoublequotemark	] };
-    key <AE01> { [ 1,	exclam,		exclamdown,	notsign	] };
-    key <AE02> { [ 2,	quotedbl,	leftdoublequotemark,	rightdoublequotemark	] };
-    key <AE03> { [ 3,	section,	paragraph,	numbersign	] };
-    key <AE04> { [ 4,	dollar,		cent,	sterling	] };
-    key <AE05> { [ 5,	percent,	bracketleft,	VoidSymbol	] };
-    key <AE06> { [ 6,	ampersand,	bracketright,	asciicircum	] };
-    key <AE07> { [ 7,	slash,		bar,	backslash	] };
-    key <AE08> { [ 8,	parenleft,	braceleft,	asciitilde	] };
-    key <AE09> { [ 9,	parenright,	braceright,	periodcentered	] };
-    key <AE10> { [ 0,	equal,		notequal,	overbar	] };
-    key <AE11> { [ ssharp,	question,	questiondown,	dead_abovedot	] };
-    key <AE12> { [ dead_acute,	dead_grave,	apostrophe,	dead_abovering	] };
-
-    key <AD01> { [ q,	Q,	guillemotleft,	guillemotright	] };
-    key <AD02> { [ w,	W,	Greek_SIGMA,	doublelowquotemark	] };
-    key <AD03> { [ e,	E,	EuroSign,	VoidSymbol	] };
-    key <AD04> { [ r,	R,	registered,	dead_cedilla	] };
-    key <AD05> { [ t,	T,	dagger,	dead_doubleacute	] };
-    key <AD06> { [ z,	Z,	Greek_OMEGA,	dead_caron	] };
-    key <AD07> { [ u,	U,	dead_diaeresis,	Aacute	] };
-    key <AD08> { [ i,	I,	slash,	Ucircumflex	] };
-    key <AD09> { [ o,	O,	oslash,	Oslash	] };
-    key <AD10> { [ p,	P,	Greek_pi,	Greek_PI	] };
-    key <AD11> { [ udiaeresis,	Udiaeresis,	enfilledcircbullet,	degree	] };
-    key <AD12> { [ plus,	asterisk,	plusminus,	VoidSymbol	] }; 
-    key <AC01> { [ a,	A,	aring,	Aring	] };
-    key <AC02> { [ s,	S,	singlelowquotemark,	Iacute	] };
-    key <AC03> { [ d,	D,	partialderivative,       trademark	] };
-    key <AC04> { [ f,	F,	function,	Idiaeresis	] };
-    key <AC05> { [ g,	G,	copyright,	Igrave	] };
-    key <AC06> { [ h,	H,	ordfeminine,	Oacute	] };
-    key <AC07> { [ j,	J,	masculine,	idotless	] };
-    key <AC08> { [ k,	K,	Greek_DELTA,	VoidSymbol	] };
-    key <AC09> { [ l,	L,	at,	VoidSymbol	] };
-    key <AC10> { [ odiaeresis,	Odiaeresis,	oe,	OE	] };
-    key <AC11> { [ adiaeresis,	Adiaeresis,	ae,	AE	] };
-
-    key <LSGT> { [ less,	greater,	lessthanequal,	greaterthanequal	] };
-    key <AB01> { [ y,	Y,	yen,	doubledagger	] };
-    key <AB02> { [ x,	X,	approxeq,	Ugrave	] };
-    key <AB03> { [ c,	C,	ccedilla,	Ccedilla	] };
-    key <AB04> { [ v,	V,	radical,	diamond	] };
-    key <AB05> { [ b,	B,	integral,	leftanglebracket	] };
-    key <AB06> { [ n,	N,	dead_tilde,	rightanglebracket	] };
-    key <AB07> { [ m,	M,	mu,	dead_breve	] };
-    key <AB08> { [ comma,	semicolon,	infinity,	dead_ogonek	] };
-    key <AB09> { [ period,	colon,	ellipsis,	division	] };
-    key <AB10> { [ minus,	underscore,	endash,	emdash	] };
-    key <BKSL> { [ numbersign,	apostrophe,	leftsinglequotemark,	rightsinglequotemark	] };
-
-    // End alphanumeric section
+    // Alphanumeric section
+    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
+    key <AE05>	{ [         5,    percent,  bracketleft       ]	};
+    key <AE06>	{ [         6,  ampersand, bracketright       ]	};
+    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};
+    key <AE09>	{ [         9, parenright,   braceright       ]	};
+    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
+    key <AD04>	{ [         r,          R,   registered       ]	};
+    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
+    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
+    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
+    key <AC05>	{ [         g,          G,    copyright       ]	};
+    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
+    key <AC09>	{ [         l,          L,           at       ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
+    key <AB06>	{ [         n,          N,   asciitilde       ]	};
 
-    include "keypad(comma)"
 };
 
-// modify the basic German macintosh layout to not have any dead keys
 partial alphanumeric_keys 
 xkb_symbols "mac_nodeadkeys" {
-
+    // modify the default German layout to not have any dead keys
     include "de(mac)"
-
     name[Group1]= "Germany - Macintosh, eliminate dead keys";
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <TLDE>	{ [ asciicircum,    degree,     notsign       ]	};
+    key <AE12>	{ [      acute,      grave,     cedilla       ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis,   diaeresis       ]	};
+    key <AD12>	{ [       plus,   asterisk,  asciitilde,       macron ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,       acute       ]	};
+    key <AC11>	{ [ adiaeresis, Adiaeresis, asciicircum       ]	};
 
-    key <TLDE> { [ asciicircum,	degree,   doublelowquotemark,	leftdoublequotemark	] };
-    key <AE11> { [ ssharp,	question,	questiondown,	abovedot	] };
-    key <AE12> { [ acute,	grave,	apostrophe,	degree	] };
-    key <AD04> { [ r,	R,	registered,	cedilla	] };
-    key <AD05> { [ t,	T,	dagger,	doubleacute	] };
-    key <AD06> { [ z,	Z,	Greek_OMEGA,	caron	] };
-    key <AD07> { [ u,	U,	diaeresis,	Aacute	] };
-    key <AB06> { [ n,	N,	asciitilde,	rightanglebracket	] };
-    key <AB07> { [ m,	M,	mu,	breve	] };
-    key <AB08> { [ comma,	semicolon,	infinity,	ogonek	] };
+    key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};
 };