Attachment 6984 Details for Bug 8280 – Convert Mac layouts to use one group

[patch] Convert Mac layouts to use one group

mac_1group.diff (text/plain), 52.46 KB, created by Denis Barbier on 2006-09-14 13:23:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Barbier

Created: 2006-09-14 13:23:34 UTC

Size: 52.46 KB

patch

obsolete

>diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch
>index 815c333..7034746 100644
>--- a/symbols/macintosh_vndr/ch
>+++ b/symbols/macintosh_vndr/ch
>@@ -11,110 +11,61 @@ xkb_symbols "extended" {
> 
>     // Alphanumeric section
> 
>-    key <AE01> { [	1,		plus			],
>-		 [	plusminus,	infinity		]	};
>-    key <AE02> { [	2,		quotedbl		],
>-		 [leftdoublequotemark, rightdoublequotemark 	]	};
>-    key <AE03> { [	3,		asterisk		],
>-		 [	numbersign,	leftcaret		]	};
>+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
>+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
>+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret		]	};
> 					// not displayed here
>-    key <AE04> { [	4,		ccedilla		],
>-   		 [	Ccedilla,	slash			]	};
>-    key <AE05> { [	5,		percent			],
>-    		 [	bracketleft				]	};
>-    key <AE06> { [	6,		ampersand		],
>-		 [	bracketright				]	};
>-    key <AE07> { [	7,		slash			],
>-		 [	bar,		backslash		]	};
>-    key <AE08> { [	8,		parenleft		],
>-		 [	braceleft,	Ograve			]	};
>-    key <AE09> { [	9,		parenright		],
>-    		 [	braceright,	Ocircumflex		]	};
>-    key <AE10> { [	0,		equal			],
>-    		 [	notequal,	Uacute			]	};
>-    key <AE11> { [	apostrophe,	question		],
>-		 [	questiondown, 	NoSymbol		]	};
>-    key <AE12> { [	dead_circumflex,dead_grave		],
>-		 [	dead_acute,	asciicircum		]	};
>-    key <AD01> { [	q,		Q			],
>-		 [	oe,		OE			]	};
>-    key <AD02> { [	w,		W			],
>-		 [	Greek_SIGMA,	Aacute			]	};
>-    key <AD03> { [ 	e,		E			],
>-		 [	EuroSign,	Ediaeresis		]	};
>-    key <AD04> { [ 	r,		R			],
>-		 [	registered,	Egrave			]	};
>-    key <AD05> { [ 	t,		T			],
>-		 [	dagger,		Icircumflex		]	}; 
>-    key <AD06> { [	z,		Z			],
>-		 [	Greek_OMEGA,	Iacute			]	};
>-    key <AD07> { [ 	u,		U			],
>-		 [	degree,		Ugrave			]	};
>-    key <AD08> { [ 	i,		I			],
>-		 [	exclamdown,	idotless		]	};
>-    key <AD09> { [ 	o,		O			],
>-		 [	oslash,		Ooblique		]	};
>-    key <AD10> { [ 	p,		P			],
>-		 [	Greek_pi,	Greek_PI		]	};
>-    key <AD11> { [	udiaeresis,	egrave			],
>-		 [	section,	ydiaeresis		]	};
>-    key <AD12> { [	dead_diaeresis,	exclam			],
>-		 [	grave,		apostrophe		]	};
>-    key <AC01> { [ 	a,		A			],
>-		 [	aring,		Aring			]	};
>-    key <AC02> { [ 	s,		S			],
>-		 [	ssharp, 	NoSymbol		]	}; 
>+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash			]	};
>+    key <AE05> { [	5,	percent, 	bracketleft				]	};
>+    key <AE06> { [	6,	ampersand, 	bracketright				]	};
>+    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
>+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve			]	};
>+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex		]	};
>+    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
>+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
>+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
>+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
>+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
>+    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
>+    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
>+    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
>+    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
>+    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
>+    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
>+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
>+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
>+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
>+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
>+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
>+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
> 					// ligature fl
>-    key <AC03> { [ 	d,		D			],
>-		 [	Greek_sigma,	NoSymbol		]	};
>+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
> 			// partialderivative is not available here att
>-    key <AC04> { [ 	f,		F			],
>-		 [	function,	doubledagger		]	};
>-    key <AC05> { [ 	g,		G			],
>-		 [	at,		comma			]	};
>-    key <AC06> { [ 	h,		H			],
>-		 [	ordfeminine,	periodcentered		]	};
>-    key <AC07> { [ 	j,		J			],
>-		 [ 	masculine,	eth	 		]	};
>-    key <AC08> { [ 	k,		K			],
>-		 [	Greek_DELTA,	macron			]	};
>-    key <AC09> { [ 	l,		L			],
>-    		 [	notsign,	caret			]	};
>-    key <AC10> { [	odiaeresis,	eacute			],
>-    		 [	cent,		breve 			]	};
>-    key <AC11> { [	adiaeresis,	agrave			],
>-		 [	ae,		AE			]	};
>-    key <AB01> { [	y,		Y 			],
>-		 [	yen,		Ydiaeresis		]	};
>-    key <AB02> { [ 	x,		X			],
>-		 [	similarequal,	trademark		]	};
>-    key <AB03> { [ 	c,		C			],
>-		 [	copyright,	NoSymbol		]	};
>-    key <AB04> { [ 	v,		V			],
>-		 [	radical,	diamond			]	};
>-    key <AB05> { [ 	b,		B			],
>-		 [	integral,	NoSymbol		]	};  
>-    key <AB06> { [ 	n,		N			],
>-		 [	dead_tilde, 	enopencircbullet	]       };
>+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
>+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
>+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
>+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
>+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
>+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
>+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve 			]	};
>+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE			]	};
>+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
>+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
>+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
>+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
>+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
>+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
> 					// to be fixed att
>-    key <AB07> { [ 	m,		M			],
>-		 [	mu,		dead_abovering		]       };
>+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
> 					// not sure att
>-    key <AB08> { [	comma,		semicolon		],
>-		 [	guillemotleft,	guillemotright		]	};
>-    key <AB09> { [	period,		colon			],
>-		 [	ellipsis,	division		]	};
>-    key <AB10> { [	minus,		underscore		],
>-		 [	hyphen,		emdash			]	};
>-    key <TLDE> { [	section,	degree			],
>-		 [  	NoSymbol, 	NoSymbol		]	};
>+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright		]	};
>+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
>+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash			]	};
>+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
> 			// ligature fi	// per mille
>-    key <SPCE> { [	space					],
>-		 [	nobreakspace,	nobreakspace		]	};
>-    key <LSGT> { [	less,		greater			],
>-		 [	lessthanequal,	greaterthanequal	]  	};
>-    key <BKSL> { [	dollar,		sterling		],
>-		 [	paragraph,	enfilledcircbullet	]	};
>+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
>+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
>+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
> 
>     include "keypad(comma)"
> };
>@@ -134,15 +85,13 @@ xkb_symbols "fr" {
>     name[Group1]= "Swiss French";
> 
>     override key <AD11> {
>-	[ egrave,	udiaeresis	],
>-	[ bracketleft			]
>+	[ egrave,	udiaeresis,  bracketleft			]
>     };
>     override key <AC10> {
> 	[ eacute,	odiaeresis	]
>     };
>     override key <AC11> {
>-	[ agrave,	adiaeresis	],
>-	[  braceleft			]
>+	[ agrave,	adiaeresis,   braceleft			]
>     };
> };
> 
>diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de
>index b29ba94..a44f8bf 100644
>--- a/symbols/macintosh_vndr/de
>+++ b/symbols/macintosh_vndr/de
>@@ -11,79 +11,46 @@ xkb_symbols "basic" {
> 
>     // Alphanumeric section
>     name[Group1]= "German";
>-    key <TLDE> {	[ dead_circumflex,	degree	],
>-			[   notsign 			]	};
>-    key <AE01> {	[         1,    exclam		],
>-			[ exclamdown,   at		]	};
>-    key <AE02> {	[	  2,	quotedbl	],
>-			[ twosuperior			]	};
>-    key <AE03> {	[	  3,	section		],
>-			[ threesuperior,sterling	]	};
>-    key <AE04> {	[	  4,	dollar		],
>-			[ onequarter,	currency	]	};
>-    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 <AE10> {	[	  0,	equal		],
>-			[ braceright,	degree		]	};
>-    key <AE11> {	[    ssharp,	question	],
>-			[ backslash,	questiondown	]	};
>-    key <AE12> {	[ dead_acute,	dead_grave	],
>-			[ dead_cedilla			]	};
>+    key <TLDE> {	[ dead_circumflex,	degree,    notsign 			]	};
>+    key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
>+    key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
>+    key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};
>+    key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};
>+    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 <AE10> {	[	  0,	equal,  braceright,	degree		]	};
>+    key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};
>+    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla			]	};
> 
>-    key <AD01> {	[	  q,	Q 		],
>-			[guillemotleft,guillemotright	]	};
>-    key <AD03> {	[	  e,	E		],
>-			[  EuroSign			]	};
>-    key <AD04> {	[         r,    R		],
>-			[ registered			]	};
>+    key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};
>+    key <AD03> {	[	  e,	E,   EuroSign			]	};
>+    key <AD04> {	[         r,    R,  registered			]	};
>     key <AD05> {	[	  t,	T		]	};
>     key <AD06> {	[	  z,	Z		]	};
>-    key <AD07> {	[	  u,	U		],
>-			[diaeresis,    Aacute		]	};
>-    key <AD08> {	[	  i,	I		],
>-			[     slash,    Ucircumflex	]	};
>-    key <AD09> {	[         o,    O		],
>-			[     oslash,   Ooblique	]	};
>-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
>-			[ periodcentered, degree	]	};
>-    key <AD12> {	[      plus,	asterisk	],
>-			[ asciitilde			]	}; 
>-    key <AC01> {	[         a,    A		],
>-			[     aring,    Aring		]	};
>+    key <AD07> {	[	  u,	U, diaeresis,    Aacute		]	};
>+    key <AD08> {	[	  i,	I,      slash,    Ucircumflex	]	};
>+    key <AD09> {	[         o,    O,      oslash,   Ooblique	]	};
>+    key <AD11> {	[ udiaeresis,	Udiaeresis,  periodcentered, degree	]	};
>+    key <AD12> {	[      plus,	asterisk,  asciitilde			]	}; 
>+    key <AC01> {	[         a,    A,      aring,    Aring		]	};
>     key <AC04> {	[	  f,	F		]	};
>-    key <AC05> {	[	  g,	G		],
>-			[ copyright			]	};
>-    key <AC06> {	[         h,    H		],
>-			[ ordfeminine			]	};
>-    key <AC09> {	[	  l,    L		],
>-			[	at			]	};
>-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
>-			[ dead_acute			]	};
>-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
>-			[ dead_circumflex		]	};
>+    key <AC05> {	[	  g,	G,  copyright			]	};
>+    key <AC06> {	[         h,    H,  ordfeminine			]	};
>+    key <AC09> {	[	  l,    L, 	at			]	};
>+    key <AC10> {	[ odiaeresis,	Odiaeresis,  dead_acute			]	};
>+    key <AC11> {	[ adiaeresis,	Adiaeresis,  dead_circumflex		]	};
> 
>-    key <LSGT> {	[      less,	greater		],
>-			[       bar			]	};
>-    key <AB01> {	[	  y,	Y 		],
>-			[ guillemotleft,less		]	};
>-    key <AB06> {	[         n,    N		],
>-			[asciitilde			]	};
>-    key <AB07> {	[	  m,	M		],
>-			[	 mu			]	};
>+    key <LSGT> {	[      less,	greater,        bar			]	};
>+    key <AB01> {	[	  y,	Y,  guillemotleft,less		]	};
>+    key <AB06> {	[         n,    N, asciitilde			]	};
>+    key <AB07> {	[	  m,	M, 	 mu			]	};
>     key <AB08> {	[     comma,	semicolon	]	};
>-    key <AB09> {	[    period,	colon		],
>-			[ periodcentered, division	]	};
>+    key <AB09> {	[    period,	colon,  periodcentered, division	]	};
>     key <AB10> {	[     minus,	underscore	]	};
>-    key <BKSL> {	[ numbersign,	apostrophe	],
>-			[ dead_grave			]	};
>+    key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
> 
>     include "keypad(comma)"
> 
>@@ -98,21 +65,14 @@ partial alphanumeric_keys 
> xkb_symbols "Sundeadkeys" {
>     // modify the default German layout to use Sun dead keys
>     include "macintosh_vndr/de(basic)"
>-    key <TLDE> {	[ SunFA_Circum,	degree		],
>-			[   notsign 			]	};
>-    key <AE12> {	[ SunFA_Acute,	SunFA_Grave	],
>-			[ SunFA_Cedilla			]	};
>-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
>-			[ SunFA_Diaeresis		]	};
>-    key <AD12> {	[      plus,	asterisk	],
>-			[ SunFA_Tilde,	dead_macron	]	};
>-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
>-			[ SunFA_Acute			]	};
>-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
>-			[ SunFA_Circum			]	};
>+    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
>+    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
>+    key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
>+    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};
>+    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};
>+    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};
> 
>-    key <BKSL> {	[ numbersign,	acute		],
>-			[ SunFA_Grave			]	};
>+    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};
> };
> 
> partial alphanumeric_keys 
>@@ -124,19 +84,12 @@ partial alphanumeric_keys 
> xkb_symbols "nodeadkeys" {
>     // modify the default German layout to not have any dead keys
>     include "macintosh_vndr/de(basic)"
>-    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,    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 <BKSL> {	[ numbersign,	apostrophe	],
>-			[ grave				]	};
>+    key <BKSL> {	[ numbersign,	apostrophe,  grave				]	};
> };
>diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk
>index 97ef6d6..364453f 100644
>--- a/symbols/macintosh_vndr/dk
>+++ b/symbols/macintosh_vndr/dk
>@@ -9,65 +9,37 @@ xkb_symbols "basic" {
> 
>     name[Group1]= "Danish";
> 
>-    key <TLDE> {	[         onehalf,         section      ],
>-			[   threequarters,       paragraph	]};
>-    key <LSGT> {	[	     less,	   greater	],
>-			[	backslash,         notsign	]};
>-    key <SPCE> {	[	    space,	     space	],
>-			[    nobreakspace,    nobreakspace	]};
>-    key <AE01> {	[               1,          exclam  	],
>-			[      exclamdown,     onesuperior	]};
>-    key <AE02> {	[               2,        quotedbl  	],
>-			[	       at,     twosuperior	]};
>-    key <AE03> {	[              	3,	numbersign	],
>-			[	 sterling,   threesuperior	]};
>-    key <AE04> {	[               4,        currency     	],
>-			[	   dollar,	onequarter	]};
>-    key <AE05> {	[               5,         percent     	],
>-			[        NoSymbol,	      cent	]};
>-    key <AE06> {	[               6,       ampersand     	],
>-			[	      yen,	  NoSymbol	]};
>-    key <AE07> {	[               7,           slash     	],
>-			[       braceleft,        division	]};
>-    key <AE08> {	[               8,       parenleft     	],
>-			[     bracketleft,   guillemotleft	]};
>-    key <AE09> {	[               9,      parenright     	],
>-			[    bracketright,  guillemotright	]};
>-    key <AE10> {	[               0,           equal     	],
>-                        [      braceright,          degree      ]};
>-    key <AB08> {	[           comma,       semicolon     	],
>-			[    dead_cedilla,     dead_ogonek	]};
>-    key <AB09> {	[          period,           colon     	],
>-			[  periodcentered,   dead_abovedot	]};
>-    key <AB03> {        [               c,               C      ],
>-                        [       copyright,        NoSymbol      ]};
>-    key <AB10> {	[           minus,      underscore     	],
>-			[	   hyphen,          macron	]};
>-    key <AC01> {        [               a,               A      ],
>-                        [     ordfeminine,       masculine      ]};
>-    key <AC03> {        [               d,               D      ],
>-                        [             eth,             ETH      ]};
>-    key <AD03> {        [               e,               E      ],
>-                        [        NoSymbol,            cent      ]};
>-    key <AD04> {        [               r,               R      ],
>-                        [      registered,        NoSymbol      ]};
>-    key <AD05> {        [               t,               T      ],
>-                        [           thorn,           THORN      ]};
>-    key <AD08> {        [               i,               I      ],
>-                        [        NoSymbol,        NoSymbol      ]};
>-    key <AD09> {        [               o,               O      ],
>-                        [              oe,              OE      ]};
>-    key	<AC10> {	[	       ae,	        AE	]};
>-    key <AE11> {	[            plus,        question      ],
>-			[       plusminus,    questiondown	]};
>-    key <AC11> {	[	   oslash,        Ooblique 	]};
>-    key <BKSL> {	[      apostrophe,        asterisk	],
>-                 	[dead_doubleacute,        multiply      ]};
>-    key <AD11> {	[	    aring,           Aring 	]};
>-    key <AE12> {   	[      dead_acute,      dead_grave      ],
>-                 	[             bar,       brokenbar      ]};
>-    key <AD12> {   	[  dead_diaeresis, dead_circumflex      ],
>-                 	[      dead_tilde,      dead_caron      ]};
>+    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
>+    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};
>+    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};
>+    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};
>+    key <AE02> {	[        2,        quotedbl,               at,     twosuperior	]};
>+    key <AE03> {	[        3,      numbersign,         sterling,   threesuperior	]};
>+    key <AE04> {	[        4,        currency,           dollar,      onequarter	]};
>+    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};
>+    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};
>+    key <AE07> {	[        7,           slash,        braceleft,        division	]};
>+    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
>+    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
>+    key <AE10> {	[        0,           equal,       braceright,          degree	]};
>+    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
>+    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
>+    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
>+    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
>+    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
>+    key <AC03> {        [        d,               D,              eth,             ETH      ]};
>+    key <AD03> {        [        e,               E,         NoSymbol,            cent      ]};
>+    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
>+    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
>+    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
>+    key <AD09> {        [        o,               O,               oe,              OE      ]};
>+    key	<AC10> {	[	ae,               AE	]};
>+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
>+    key <AC11> {	[   oslash,        Ooblique 	]};
>+    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
>+    key <AD11> {	[    aring,           Aring 	]};
>+    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
>+    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
> 
> 
>     // End alphanumeric section
>@@ -85,8 +57,6 @@ xkb_symbols "full" {
> partial alphanumeric_keys 
> xkb_symbols "nodeadkeys" {
>     include "macintosh_vndr/dk(basic)"
>-    key <AE12> {	[	    acute,	     grave	],	
>-			[	      bar,	    ogonek	]	};
>-    key <AD12> {	[       diaeresis,     asciicircum     	],	
>-			[      asciitilde,     dead_macron     	]      	};
>+    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
>+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
> };
>diff --git a/symbols/macintosh_vndr/es b/symbols/macintosh_vndr/es
>index 4d9f288..ce789cd 100644
>--- a/symbols/macintosh_vndr/es
>+++ b/symbols/macintosh_vndr/es
>@@ -7,39 +7,27 @@ xkb_symbols "basic" {
> 
>     name[Group1]= "Spanish";
> 
>-    key <TLDE> {	[     bracketleft,    bracketright	],	
>-    			[       braceleft,      braceright	]	};
>-    key <LSGT> {	[	     less,	   greater	],
>-			[     bracketleft,       braceleft	]	};
>-    key <AE01> {	[         	1,	exclam 		]	};
>-    key <AE02> {	[               2,      exclamdown     	],	
>-			[	       at,	 oneeighth	]	};
>-    key <AE03> {	[               3,      numbersign     	],
>-			[   guillemotleft,  guillemotright	]	};
>-    key <AE04> {	[               4,          dollar     	],	
>-			[	      yen,     Icircumflex	]	};
>-    key <AE05> {	[		5,         percent	]	};
>-    key <AE06> {	[               6,           slash     	],	
>-			[	backslash,      Idiaeresis	]	};
>-    key <AE07> {	[               7,       ampersand     	],
>-			[	      bar,          Iacute	]	};
>-    key <AE08> {	[               8,        asterisk     	],
>-			[		degree			]	};
>-    key <AE09> {	[               9,       parenleft     	],
>-			[	 sterling,     Ocircumflex	]	};
>+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
>+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
>+    key <AE01> {	[               1,          exclam 	]	};
>+    key <AE02> {	[               2,      exclamdown,               at,       oneeighth	]	};
>+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
>+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
>+    key <AE05> {	[               5,         percent	]	};
>+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
>+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
>+    key <AE08> {	[               8,        asterisk,           degree	]	};
>+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
>     key <AE10> {	[               0,      parenright     	]	};
>     key <AE11> {	[           minus,      underscore	]	};
>-    key <AE12> {	[           equal,            plus	],
>-			[               plusminus		]	};
>+    key <AE12> {	[           equal,            plus,        plusminus	]	};
>     key <AD11> {	[      dead_grave,          degree 	]	};
>-    key <AD12> {	[      dead_acute,   dead_diaeresis    	],
>-			[               bar			]	};
>+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
> 
>     key <AB08> {	[           comma,    questiondown   	]	};
>     key <AB09> {	[          period,        question     	]	};
>     key <AB10> {	[        ccedilla,        Ccedilla     	]	};
>-    key	<AC10> {	[	   ntilde,          Ntilde  	],	
>-			[      asciitilde,dead_doubleacute	]	};
>+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
>     key <AC11> {	[       semicolon,    	     colon 	]	};
>     key <BKSL> {	[      apostrophe,        quotedbl	]	};
> 
>diff --git a/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr
>index d23cd86..88c9089 100644
>--- a/symbols/macintosh_vndr/fr
>+++ b/symbols/macintosh_vndr/fr
>@@ -26,114 +26,65 @@ xkb_symbols "extended" {
>     key <ESC>  {	[ Escape			]	};
> 
>     // Alphanumeric section
>-    key <TLDE> {	[	   at,	  numbersign	],
>-			[periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
>+    key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
>     key <ENTR> {        [    KP_Enter                   ]       };
>-    key <AE01> {	[   ampersand,	  1		],
>-			[  VoidSymbol,	  dead_acute	]	}; // MISSING: Apple
>-    key <AE02> {	[      eacute,	  2		],
>-			[  ediaeresis,	  Eacute	]	};
>-    key <AE03> {	[    quotedbl,	  3		],
>-			[  VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
>-    key <AE04> {	[  apostrophe,	  4		],
>-			[  VoidSymbol,	  VoidSymbol	] 	};
>-    key <AE05> {	[   parenleft,	  5		],
>-			[   braceleft,	  bracketleft	]	};
>-    key <AE06> {	[     section,	  6		],	// CHECK section
>-			[   paragraph,	  aring		]	};
>-    key <AE07> {	[      egrave,	  7		],
>-			[guillemotleft,	  guillemotright]	};
>-    key <AE08> {	[      exclam,	  8		],
>-			[  exclamdown,	  Ucircumflex	]	};
>-    key <AE09> {	[    ccedilla,	  9		],
>-			[    Ccedilla,	  Aacute	]	};
>-    key <AE10> {	[      agrave,	  0		],
>-			[      oslash,	  VoidSymbol	]	}; // MISSING: Oslash
>-    key <AE11> {	[  parenright,	  degree	],
>-			[  braceright,	  bracketright	]	};
>-    key <AE12> {	[	minus,	  underscore	],
>-			[      emdash,	  endash	]	}; // CHECK dashes
>-    key <BKSP> {	[   BackSpace,    VoidSymbol	],
>-			[      Delete,	  VoidSymbol	]	};
>+    key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
>+    key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
>+    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
>+    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};
>+    key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};
>+ // CHECK section
>+    key <AE06> {	[     section,    6,    paragraph,         aring	]	};
>+    key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};
>+    key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};
>+    key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};
>+    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
>+    key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
>+    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
>+    key <BKSP> {	[   BackSpace,    VoidSymbol,       Delete,	  VoidSymbol	]	};
> 
>     key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
>-    key <AD01> {	[	    a,	A		],
>-			[	   ae,	AE		]	};
>-    key <AD02> {	[	    z,	Z		],
>-			[ Acircumflex,	Aring		]	};
>-    key <AD03> {	[	    e,	E		],
>-			[ ecircumflex,	Ecircumflex	]	};
>-    key <AD04> {	[	    r,	R		],
>-			[  registered,	currency	]	};
>-    key <AD05> {	[	    t,	T		],
>-			[  VoidSymbol,	VoidSymbol	]	};
>-    key <AD06> {	[	    y,	Y		],
>-			[      Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
>-    key <AD07> {	[	    u,	U		],
>-			[  VoidSymbol,	ordfeminine	]	}; // MISSING: ordmasculine?
>-    key <AD08> {	[	    i,	I		],
>-			[ icircumflex,	idiaeresis	]	};
>-    key <AD09> {	[	    o,	O		],
>-			[          oe,	OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
>-    key <AD10> {	[	    p,	P		],
>-			[  VoidSymbol,  VoidSymbol	]	};
>-    key <AD11> {	[dead_circumflex,dead_diaeresis	],
>-			[ ocircumflex, Ocircumflex	]	};
>-    key <AD12> {	[      dollar,	asterisk	],
>-			[  EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
>+    key <AD01> {	[           a,  A,           ae,          AE	]	};
>+    key <AD02> {	[           z,  Z,  Acircumflex,       Aring		]	};
>+    key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};
>+    key <AD04> {	[           r,  R,   registered,    currency	]	};
>+    key <AD05> {	[           t,  T,   VoidSymbol,  VoidSymbol	]	};
>+    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
>+    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?
>+    key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};
>+    key <AD09> {	[           o,  O,           oe,          OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
>+    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};
>+    key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
>+    key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
> 
>     key <CAPS> {	[	Caps_Lock		]	};
>-    key <AC01> {	[	  q,	Q		],
>-			[acircumflex,	Agrave		]	};
>-    key <AC02> {	[	  s,	S		],
>-			[    Ograve,	VoidSymbol	]	};
>-    key <AC03> {	[	  d,	D		],
>-			[VoidSymbol,	VoidSymbol	]	};
>-    key <AC04> {	[	  f,	F		],
>-			[VoidSymbol,	periodcentered	]	}; // MISSING: oblong script f??
>-    key <AC05> {	[	  g,	G		],
>-			[VoidSymbol,	VoidSymbol	]	}; // MISSING: kerned fi, fl
>-    key <AC06> {	[	  h,	H		],
>-			[    Igrave,	Icircumflex	]	};
>-    key <AC07> {	[	  j,	J		],
>-			[Idiaeresis,	Iacute		]	};
>-    key <AC08> {	[	  k,	K		],
>-			[   Egrave,	Ediaeresis	]	};
>-    key <AC09> {	[	  l,	L		],
>-			[   notsign,	bar		]	};
>-    key <AC10> {	[	  m,	M		],
>-			[  	 mu,	Oacute		]	};
>-    key <AC11> {	[    ugrave,	percent		],
>-			[    Ugrave,	ucircumflex	]	}; // MISSING: per-mille
>-    key <BKSL> {	[ dead_grave,	sterling	],
>-			[	 at,	numbersign	]	};
>+    key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};
>+    key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
>+    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
>+    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??
>+    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl
>+    key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};
>+    key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};
>+    key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};
>+    key <AC09> {	[         l, L,     notsign,            bar	]	};
>+    key <AC10> {	[         m, M,          mu,         Oacute	]	};
>+    key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
>+    key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
>     key <RTRN> {	[    Return			]	};
> 
>-    key <LSGT> {	[	 less,	  greater	],
>-			[VoidSymbol, 	VoidSymbol	]	};
>-    key <AB01> {	[	  w,	W		],
>-			[VoidSymbol,	VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
>-    key <AB02> {	[	  x,	X		],
>-			[VoidSymbol,	VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
>-    key <AB03> {	[	  c,	C		],
>-			[ copyright,	cent		]	};
>-    key <AB04> {	[	  v,	V		],
>-			[   diamond,	leftradical	]	}; // CHECK diamond, leftradical
>-    key <AB05> {	[	  b,	B		],
>-			[    ssharp,    VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
>-    key <AB06> {	[	  n,	N		],
>-			[ dead_tilde,	asciitilde	]	};
>-    key <AB07> {	[     comma,	question	],
>-			[VoidSymbol,	questiondown	]	};
>-    key <AB08> {	[ semicolon,	period		],
>-			[VoidSymbol,	periodcentered	]	};
>-    key <AB09> {	[     colon,	slash		],
>-			[  division,	backslash	]	};
>-    key <AB10> {	[     equal,	plus		],
>-			[VoidSymbol,	plusminus	]	};
>-
>-    key <SPCE> {	[     space,	space		],
>-			[nobreakspace,	nobreakspace	]	};
>+    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
>+    key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
>+    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
>+    key <AB03> {	[         c, C,  copyright,         cent	]	};
>+    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical
>+    key <AB05> {	[         b, B,     ssharp,   VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
>+    key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};
>+    key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};
>+    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};
>+    key <AB09> {	[     colon,  slash,   division,        backslash	]	};
>+    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};
>+
>+    key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
>     // End alphanumeric section
> 
>     // Begin modifier mappings
>diff --git a/symbols/macintosh_vndr/gb b/symbols/macintosh_vndr/gb
>index 29a27f8..faa12d2 100644
>--- a/symbols/macintosh_vndr/gb
>+++ b/symbols/macintosh_vndr/gb
>@@ -9,8 +9,7 @@ xkb_symbols "basic" {
> 
>     name[Group1]= "Great Britain";
> 
>-    key <AE03> {	[               3,        sterling     	],
>-			[      numbersign			]	};
>+    key <AE03> {	[	3,	sterling,	numbersign ]	};
> 
>     // End alphanumeric section
>     
>diff --git a/symbols/macintosh_vndr/is b/symbols/macintosh_vndr/is
>index 7186565..e4e8548 100644
>--- a/symbols/macintosh_vndr/is
>+++ b/symbols/macintosh_vndr/is
>@@ -60,111 +60,63 @@ xkb_symbols "basic" {
>     name[Group1]= "Icelandic";
> 
> 	//-- Row 5 (E) --//
>-	key <TLDE> {	[	sterling,	section		],
>-			[	UF8FF,		apostrophe	]	};
>-	key <AE01> {	[	1,		exclam		],
>-			[	exclamdown,	VoidSymbol	]	};
>-	key <AE02> {	[	2,		quotedbl	],
>-			[	at,		VoidSymbol	]	};
>-	key <AE03> {	[	3,		numbersign	],
>-			[	U2122,		sterling	]	};
>-	key <AE04> {	[	4,		dollar		],
>-			[	U00A2,		EuroSign	]	};
>-	key <AE05> {	[	5,		percent		],
>-			[	U2030,		infinity	]	};
>-	key <AE06> {	[	6,		ampersand	],
>-			[	asciicircum,	U2044		]	};
>-	key <AE07> {	[	7,		slash		],
>-			[	backslash,	U00F7		]	};
>-	key <AE08> {	[	8,		parenleft	],
>-			[	bracketleft,	braceleft	]	};
>-	key <AE09> {	[	9,		parenright	],
>-			[	bracketright,	braceright	]	};
>-	key <AE10> {	[	0,		equal		],
>-			[	U2260,		U2248		]	};
>-	key <AE11> {	[	odiaeresis,	Odiaeresis	],
>-			[	oslash,		Ooblique	]	};
>-	key <AE12> {	[	minus,		underscore	],
>-			[	endash,		emdash		]	};
>+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
>+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
>+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
>+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
>+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
>+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
>+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
>+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
>+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
>+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
>+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
>+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
>+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
> 
> 	
> 	//-- Row 4 (D) --//
>-	key <AD01> {	[	q,		Q		],
>-			[	paragraph,	VoidSymbol	]	};
>-	key <AD02> {	[	w,		W		],
>-			[	U2211,		VoidSymbol	]	};
>-	key <AD03> {	[	e,		E		],
>-			[	dead_grave,	VoidSymbol	]	};
>-	key <AD04> {	[	r,		R		],
>-			[	registered,	VoidSymbol	]	};
>-	key <AD05> {	[	t,		T		],
>-			[	degree,		VoidSymbol	]	};
>-	key <AD06> {	[	y,		Y		],
>-			[	yen,		VoidSymbol	]	};
>-	key <AD07> {	[	u,		U		],
>-			[	dead_diaeresis,	VoidSymbol	]	};
>-	key <AD08> {	[	i,		I		],
>-			[	U0131,		U00AA		]	};
>-	key <AD09> {	[	o,		O		],
>-			[	dead_circumflex,U00BA		]	};
>-	key <AD10> {	[	p,		P		],
>-			[	Greek_pi,	Greek_PI	]	};
>-	key <AD11> {	[	eth,		Eth		],
>-			[	U201e,		U201c		]	};
>-	key <AD12> {	[	apostrophe,	question	],
>-			[	questiondown,	U00B7		]	};
>+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
>+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
>+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
>+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
>+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
>+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
>+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
>+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
>+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
>+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
>+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
>+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
> 	
> 	
> 	//-- Row 3 (C) --//
>-	key <AC01> {	[	a,		A		],
>-			[	aring,		Aring		]	};
>-	key <AC02> {	[	s,		S		],
>-			[	ssharp,		abovedot	]	};
>-	key <AC03> {	[	d,		D		],
>-			[	U2202,		U2DA		]	};
>-	key <AC04> {	[	f,		F		],
>-			[	U192,		macron		]	};
>-	key <AC05> {	[	g,		G		],
>-			[	copyright,	breve		]	};
>-	key <AC06> {	[	h,		H		],
>-			[	bar,		VoidSymbol	]	};
>-	key <AC07> {	[	j,		J		],
>-			[	U2206,		U2dd		]	};
>-	key <AC08> {	[	k,		K		],
>-			[	U00AC,		VoidSymbol	]	};
>-	key <AC09> {	[	l,		L		],
>-			[	U2026,		caron		]	};
>-	key <AC10> {	[	ae,		AE		],
>-			[	oe,		OE		]	};
>-	key <AC11> {	[	dead_acute,	dead_diaeresis	],
>-			[	U201A,		U2018		]	};
>-	key <BKSL> {	[	plus,		asterisk	],
>-			[	U2022,		plusminus	]	};
>+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
>+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
>+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
>+	key <AC04> {	[	f,		F, 	U192,		macron		]	};
>+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
>+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
>+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
>+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
>+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
>+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
>+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
>+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
> 	
> 	
> 	//-- Row 2  (B) --//
>-	key <LSGT> {	[	less,		greater		],
>-			[	section,	UF8FF		]	};
>-	key <AB01> {	[	z,		Z		],
>-			[	U3A9,		VoidSymbol	]	};
>-	key <AB02> {	[	x,		X		],
>-			[	asciitilde,	VoidSymbol	]	};
>-	key <AB03> {	[	c,		C		],
>-			[	ccedilla,	Ccedilla	]	};
>-	key <AB04> {	[	v,		V		],
>-			[	U221A,		U25CA		]	};
>-	key <AB05> {	[	b,		B		],
>-			[	U222B,		VoidSymbol	]	};
>-	key <AB06> {	[	n,		N		],
>-			[	dead_tilde,	VoidSymbol	]	};
>-	key <AB07> {	[	m,		M		],
>-			[	U00B5,		VoidSymbol	]	};
>-	key <AB08> {	[	comma,		semicolon	],
>-			[	lessthanequal,	guillemotleft	]	};
>-	key <AB09> {	[	period,		colon		],
>-			[	greaterthanequal,guillemotright	]	};
>-	key <AB10> {	[	thorn,		Thorn		],
>-			[	U2019,		U201d		]	};
>+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
>+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
>+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
>+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
>+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
>+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
>+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
>+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
>+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
>+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
>+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
> 
> 	// Special keys and modifiers
> 	key <LWIN> {	[	Alt_L,		Meta_L		]	};
>diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it
>index 1e861ea..d7e6ba2 100644
>--- a/symbols/macintosh_vndr/it
>+++ b/symbols/macintosh_vndr/it
>@@ -4,84 +4,57 @@ xkb_symbols "extended" {
>     name[Group1]= "italian";
> 
>     // Alphanumeric section
>-    key <LSGT> {	[        less,	  greater   	]	};
>-    key <TLDE> {        [        at,    numbersign      ],
>-                        [   periodcentered              ]	};
>-    key <AE01> {	[   ampersand,	  1    		],
>-			[guillemotleft,guillemotright	]	};
>-    key <AE02> {	[    quotedbl,	  2 		]	};
>-    key <AE03> {	[  apostrophe,	  3         	]	};
>-    key <AE04> {	[   parenleft,	  4    		],
>-                        [   braceleft,    bracketleft	]	};
>-    key <AE05> {	[    ccedilla,	  5    		],
>-              	        [    Ccedilla,    Iacute	]	};
>-    key <AE06> {	[      egrave,	  6          	],
>-                        [   paragraph,    periodcentered]	};
>-    key <AE07> {	[  parenright,	  7        	],
>-                        [  braceright,	  bracketright	]	};
>-    key <AE08> {	[    sterling,	  8       	],
>-                        [  infinity			]	};
>-    key <AE09> {	[      agrave,    9        	],
>-                        [       acute,    Ocircumflex	]	};
>-    key <AE10> {	[      eacute,	  0         	],
>-                        [       grave,    Oacute	]	};
>-    key <AE11> {	[       minus,	  underscore	]	};
>-    key <AE12> {	[       equal, 	  plus		],
>-			[    notequal,    plusminus	]	};
>+    key <LSGT> {	[        less,  greater   	]	};
>+    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
>+    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
>+    key <AE02> {	[    quotedbl,    2 		]	};
>+    key <AE03> {	[  apostrophe,    3         	]	};
>+    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
>+    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
>+    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
>+    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
>+    key <AE08> {	[    sterling,    8,   infinity			]	};
>+    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
>+    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
>+    key <AE11> {	[       minus,    underscore	]	};
>+    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
> 
>-    key <AD01> {	[           q,	Q 		]	};
>-    key <AD02> {	[	    z,	Z		]	};
>-    key <AD03> {	[	    e,	E		]	};
>-    key <AD04> {	[	    r,	R		],
>-                	[  registered			] 	};
>-    key <AD05> {	[	    t,	T		]	};
>-    key <AD06> {	[	    y,	Y		],
>-                	[      Uacute,	ydiaeresis      ] 	};
>-    key <AD07> {	[	    u,	U		]	};
>-    key <AD08> {	[	    i,	I		],
>-                	[ icircumflex,	idiaeresis      ] 	};
>-    key <AD09> {	[	    o,	O		]	};
>-    key <AD10> {	[	    p,	P		]	};
>+    key <AD01> {	[           q,  Q 		]	};
>+    key <AD02> {	[	    z,  Z		]	};
>+    key <AD03> {	[	    e,  E		]	};
>+    key <AD04> {	[	    r,  R,   registered			] 	};
>+    key <AD05> {	[	    t,  T		]	};
>+    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
>+    key <AD07> {	[	    u,  U		]	};
>+    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
>+    key <AD09> {	[	    o,  O		]	};
>+    key <AD10> {	[	    p,  P		]	};
>     key <AD11> {	[      igrave,  asciicircum     ]	};
>     key <AD12> {	[      dollar,	asterisk        ]	};
>-    key <BKSL> {	[     section,  degree		],
>-			[          at,  numbersign      ]	};
>+    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
> 
>-    key <AC01> {	[	  a,	A 		]	,
>-                	[     aring,   Aring		] 	};
>-    key <AC02> {	[	  s,	S		],
>-			[    ssharp			]	};
>+    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
>+    key <AC02> {	[	  s,	S,     ssharp			]	};
>     key <AC03> {	[	  d,	D		]	};
>     key <AC04> {	[	  f,	F		]	};
>     key <AC05> {	[	  g,	G		]	};
>-    key <AC06> {	[	  h,	H		],
>-			[    Igrave,    Icircumflex     ]	};
>-    key <AC07> {	[	  j,	J		],
>-			[ Idiaeresis,   Iacute          ]	};
>-    key <AC08> {	[	  k,	K		],
>-			[    Egrave,    Ediaeresis      ]	};
>-    key <AC09> {	[	  l,	L		],
>-			[    ssharp,    bar		]	};
>-    key <AC10> {	[         m,	M    		],
>-			[        mu,    Oacute		]	};
>-    key <AC11> {	[    ugrave,	percent 	],
>-			[        ae,    AE		]	};
>+    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
>+    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
>+    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
>+    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
>+    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
>+    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
> 
>     key <AB01> {	[	  w,	W 		]	};
>     key <AB02> {	[	  x,	X		]	};
>-    key <AB03> {	[	  c,	C		],
>-			[ copyright,    copyright	]	};
>+    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
>     key <AB04> {	[	  v,	V		]	};
>     key <AB05> {	[	  b,	B		]	};
>-    key <AB06> {	[	  n,	N		],
>-                        [ dead_tilde                    ]       };
>-    key <AB07> {	[     comma,	question	],
>-			[         questiondown		]	};
>+    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
>+    key <AB07> {	[     comma,	question,          questiondown		]	};
>     key <AB08> {	[ semicolon,	period          ]	};
>-    key <AB09> {	[     colon,	slash  		],
>-			[       bar,    backslash	]	};
>-    key <AB10> {	[    ograve,	exclam    	],
>-			[    exclamdown			]	};
>+    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
>+    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
> 
>     // End alphanumeric section
> 
>diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no
>index 4fc2e8b..85e5f69 100644
>--- a/symbols/macintosh_vndr/no
>+++ b/symbols/macintosh_vndr/no
>@@ -9,33 +9,24 @@ xkb_symbols "basic" {
>     name[Group1]= "Norwegian";
> 
>     key <TLDE> {	[             bar,         section      ]	};
>-    key <AE02> {	[               2,        quotedbl     	],	
>-			[	       at,	 oneeighth	]	};
>-    key <AE04> {	[	        4,        currency	],
>-			[	   dollar,	    dollar	]	};
>-    key <AE03> {	[               3,	numbersign 	],
>-			[        sterling,        sterling	]	};
>+    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 <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	<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 <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
>+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
>     key <BKSL> {	[              at,        asterisk	]	};
>     key <LSGT> {	[            less,         greater	]	};
> 
>@@ -50,9 +41,7 @@ xkb_symbols "nodeadkeys" {
>     // Modifies the basic Norwegian layout to eliminate dead keys
> 
>     include "macintosh_vndr/no(basic)"
>-    key <AE12> {	[           grave,           acute	],
>-			[	    acute,          ogonek 	]	};
>-    key <AD12> {	[       diaeresis,     asciicircum     	],	
>-			[      asciitilde,          macron     	]      	};
>+    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
>+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
> 
> };
>diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt
>index f0019d0..6c4553a 100644
>--- a/symbols/macintosh_vndr/pt
>+++ b/symbols/macintosh_vndr/pt
>@@ -10,24 +10,17 @@ xkb_symbols "basic" {
> 
>     name[Group1]= "Portuguese";
> 
>-    key <LSGT> {	[	     less,	   greater	],
>-			[	      bar,       brokenbar	]	};
>-    key <AE02> {	[               2,	  quotedbl    	],	
>-			[	       at,       oneeighth	]	};
>-    key <AE04> {	[               4,	    dollar     	],
>-			[         section,          dollar	]	};
>-    key <AE03> {	[               3,	numbersign     	],
>-			[        sterling,        sterling     	]	};
>+    key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
>+    key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
>+    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};
>+    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};
>     key <AE06> {	[               6,       ampersand     	]	};
>     key <AE07> {	[               7,           slash     	]	};
>-    key <AE08> {	[               8,       parenleft     	],
>-			[     bracketleft,       braceleft     	]	};
>-    key <AE09> {	[               9,      parenright      ],
>-			[    bracketright,      braceright     	]	};
>+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};
>+    key <AE09> {	[               9,      parenright,     bracketright,      braceright     	]	};
>     key <AE10> {	[               0,           equal      ]	};
>     key <AE11> {	[      apostrophe,        question      ]	};
>-    key <AE12> {	[	     plus,        asterisk 	],
>-    			[            dead_diaeresis             ]	};
>+    key <AE12> {	[	     plus,        asterisk,             dead_diaeresis             ]	};
>     key <AB08> {	[           comma,       semicolon     	]	};
>     key <AB09> {	[          period,           colon      ]	};
>     key <AB10> {	[           minus,      underscore      ]	};
>@@ -44,8 +37,7 @@ partial alphanumeric_keys 
> xkb_symbols "Sundeadkeys" {
>     include "macintosh_vndr/pt(basic)" // for consistent naming
>     
>-    key <AE12> {	[	     plus,        asterisk 	],
>-			[ SunFA_Diaeresis, SunFA_Diaeresis      ]	};
>+    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
>     key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
>     key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
> };
>@@ -59,8 +51,7 @@ partial alphanumeric_keys 
> xkb_symbols "nodeadkeys" {
>     include "macintosh_vndr/pt(basic)" // for consistent naming
> 
>-    key <AE12> {	[	     plus,        asterisk 	],
>-			[	 quotedbl,        quotedbl      ]	};
>+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
>     key <AC11> {	[      asciitilde,     asciicircum	]	};
>     key <AD12> {	[	    acute,           grave 	]	};
> };
>diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se
>index 897f0dd..37d1fc8 100644
>--- a/symbols/macintosh_vndr/se
>+++ b/symbols/macintosh_vndr/se
>@@ -10,38 +10,26 @@ xkb_symbols "basic" {
> 
>     key <TLDE> {	[         section,         degree	]	};
> 
>-    key <AE01> {	[               1,          exclam	],
>-			[       copyright,      exclamdown	]	};
>-    key <AE02> {	[               2,        quotedbl     	],	
>-			[	       at,	 oneeighth	]	};
>-    key <AE03> {	[               3,      numbersign      ],	
>-			[        sterling,             yen	]	};
>-    key <AE04> {	[               4,        currency     	],	
>-			[	   dollar,	      cent	]	};
>+    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
>+    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
>+    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
>+    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
>     key <AE06> {	[               6,       ampersand     	]	};
>-    key <AE07> {	[               7,           slash     	],
>-			[	      bar,       backslash	]	};
>-    key <AE08> {	[               8,       parenleft     	],
>-			[     bracketleft,       braceleft	]	};
>-    key <AE09> {	[               9,      parenright	],
>-			[    bracketright,      braceright	]	};
>+    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
>+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
>+    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
>     key <AB08> {	[           comma,       semicolon     	]	};
>     key <AE10> {	[               0,           equal     	]	};
>     key <AB09> {	[          period,           colon     	]	};
>     key <AB10> {	[           minus,      underscore     	]	};
>-    key	<AC10> {	[      odiaeresis,      Odiaeresis     	],
>-			[	   oslash,	    Ooblique	]	};
>+    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
>     key <AE11> {	[            plus,        question      ]	};
>-    key <AC11> {	[      adiaeresis,      Adiaeresis 	],
>-			[              ae,		AE	]	};
>+    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
>     key <AD11> {	[	    aring,           Aring     	]	};
>     key <AE12> {	[           acute,           grave	]	};
>-    key <AD12> {	[       diaeresis,     asciicircum     	],
>-    			[	asciitilde			]	};
>-    key <BKSL> {	[      apostrophe,        asterisk	],
>-			[              at			]	};
>-    key <LSGT> {        [            less,         greater      ],
>-                        [             bar,       brokenbar      ]       };
>+    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
>+    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
>+    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
> 
>     include "keypad(comma)"
> };

Actions: View | Splinter Review

Attachments on bug 8280: 6984 | 6985 | 6986 | 6996 | 6997

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.