Attachment 4241 Details for Bug 5507 – A patch for xkb/rules/xorg

[patch] A patch for xkb/rules/xorg

xorg.diff (text/plain), 30.56 KB, created by Anton Zinoviev on 2006-01-05 09:02:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Zinoviev

Created: 2006-01-05 09:02:21 UTC

Size: 30.56 KB

patch

obsolete

>--- xorg.old	2006-01-04 22:37:44.000000000 +0200
>+++ xorg.new	2006-01-05 00:03:47.000000000 +0200
>@@ -17,6 +17,8 @@
> ! $maclaptop = ibook powerbook
> ! $mac = macintosh macintosh_old ibook powerbook
> 
>+! $maclayouts = de de_CH dk es fi fr fr_CH gb it nl no pt se us
>+
> ! $azerty = be fr
> ! $qwertz = al cz de hr hu ro si sk 
> 
>@@ -47,6 +49,10 @@
>               sven symplon toshiba_s3000 trust trustda yahoo
> 
> ! model		=	keycodes
>+  amiga		=	amiga(de)
>+  ataritt	=	ataritt(de)
>+  sun4		=	sun(type4_euro)
>+  sun5		=	sun(type5_euro)
>   macintosh_old	=	macintosh
>   powerpcps2	=	powerpcps2
>   pc98		=	xfree98(pc98)
>@@ -83,462 +89,168 @@
>  $mac		=	macintosh(macintosh)
>   *		=       pc(pc104)
> 
>-! model		layout		variant		=	symbols
>-  $pcmodels	ben		basic		=	pc/pc(%m)+pc/in(ben)
>-  *		ben		basic		=	pc/pc(pc105)+pc/in(ben)
>-  $pcmodels	ben		probhat		=	pc/pc(%m)+pc/in(ben_probhat)
>-  *		ben		probhat		=	pc/pc(pc105)+pc/in(ben_probhat)
>-  $pcmodels	dev		basic		=	pc/pc(%m)+pc/in(deva)
>-  *		dev		basic		=	pc/pc(pc105)+pc/in(deva)
>-  $pcmodels	dvorak		gb		=	pc/pc(%m)+pc/gb(dvorak)
>-  *		dvorak		gb		=	pc/pc(pc105)+pc/gb(dvorak)
>-  $pcmodels	dvorak		fr		=	pc/pc(%m)+pc/fr(dvorak)
>-  *		dvorak		fr		=	pc/pc(pc105)+pc/fr(dvorak)
>-  $pcmodels	dvorak		no		=	pc/pc(%m)+pc/no(dvorak)
>-  *		dvorak		no		=	pc/pc(pc105)+pc/no(dvorak)
>-  $pcmodels	dvorak		se		=	pc/pc(%m)+pc/se(dvorak)
>-  *		dvorak		se		=	pc/pc(pc105)+pc/se(dvorak)
>-  $pcmodels	dvorak		basic		=	pc/pc(%m)+pc/us(dvorak)
>-  *		dvorak		basic		=	pc/pc(pc105)+pc/us(dvorak)
>-  $pcmodels	dvorak		pl_basic	=	pc/pc(%m)+pc/pl(dvorak)
>-  *		dvorak		pl_basic	=	pc/pc(pc105)+pc/pl(dvorak)
>-  $pcmodels	dvorak		pl		=	pc/pc(%m)+pc/pl(dvorak_quotes)
>-  *		dvorak		pl		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
>-  $pcmodels	dvorak		pl_altquotes	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
>-  *		dvorak		pl_altquotes	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
>-  $pcmodels	dz		basic		=	pc/pc(%m)+pc/bt(basic)
>-  *		dz		basic		=	pc/pc(pc105)+pc/bt(basic)
>-  $pcmodels	guj		basic		=	pc/pc(%m)+pc/in(guj)
>-  *		guj		basic		=	pc/pc(pc105)+pc/in(guj)
>-  $pcmodels	gur		basic		=	pc/pc(%m)+pc/in(guru)
>-  *		gur		basic		=	pc/pc(pc105)+pc/in(guru)
>-  $pcmodels	ie		laptop		=	pc/pc(%m)+pc/ie(basic)
>-  *		ie		laptop		=	pc/pc(pc105)+pc/ie(basic)
>-  $pcmodels	ie		CloGaelachLaptop		=	pc/pc(%m)+pc/ie(CloGaelach)
>-  *		ie		CloGaelachLaptop		=	pc/pc(pc105)+pc/ie(CloGaelach)
>-  $pcmodels	iu		basic		=	pc/pc(%m)+pc/ca(ike)
>-  *		iu		basic		=	pc/pc(pc105)+pc/ca(ike)
>-  $pcmodels	lo		basic		=	pc/pc(%m)+pc/la(basic)
>-  *		lo		basic		=	pc/pc(pc105)+pc/la(basic)
>-  $pcmodels	kan		basic		=	pc/pc(%m)+pc/in(kan)
>-  *		kan		basic		=	pc/pc(pc105)+pc/in(kan)
>-  $pcmodels	mal		basic		=	pc/pc(%m)+pc/in(mal)
>-  *		mal		basic		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	mal		mlplusnum	=	pc/pc(%m)+pc/in(mal)
>-  *		mal		mlplusnum	=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	ogham		basic		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham		basic		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham		laptop		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham		laptop		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham		is434		=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham		is434		=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ogham		is434laptop	=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham		is434laptop	=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ori		basic		=	pc/pc(%m)+pc/in(ori)
>-  *		ori		basic		=	pc/pc(pc105)+pc/in(ori)
>-  $pcmodels	sapmi		basic		=	pc/pc(%m)+pc/no(smi)
>-  *		sapmi		basic		=	pc/pc(pc105)+pc/no(smi)
>-  $pcmodels	sapmi		nodeadkeys	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
>-  *		sapmi		nodeadkeys	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
>-  $pcmodels	sapmi		sefi		=	pc/pc(%m)+pc/fi(smi)
>-  *		sapmi		sefi		=	pc/pc(pc105)+pc/fi(smi)
>-  $pcmodels	sin		phonetic-static	=	pc/pc(%m)+pc/in(sin_phonetic)
>-  *		sin		phonetic-static	=	pc/pc(pc105)+pc/in(sin_phonetic)
>-  $pcmodels	syr		basic		=	pc/pc(%m)+pc/sy(syc)
>-  *		syr		basic		=	pc/pc(pc105)+pc/sy(syc)
>-  $pcmodels	syr		phonetic	=	pc/pc(%m)+pc/sy(syc_phonetic)
>-  *		syr		phonetic	=	pc/pc(pc105)+pc/sy(syc_phonetic)
>-  $pcmodels	tam		INSCRIPT	=	pc/pc(%m)+pc/in(tam)
>-  *		tam		INSCRIPT	=	pc/pc(pc105)+pc/in(tam)
>-  $pcmodels	tam		UNI		=	pc/pc(%m)+pc/in(tam_unicode)
>-  *		tam		UNI		=	pc/pc(pc105)+pc/in(tam_unicode)
>-  $pcmodels	tam		TAB		=	pc/pc(%m)+pc/in(tam_TAB)
>-  *		tam		TAB		=	pc/pc(pc105)+pc/in(tam_TAB)
>-  $pcmodels	tam		TSCII		=	pc/pc(%m)+pc/in(tam_TSCII)
>-  *		tam		TSCII		=	pc/pc(pc105)+pc/in(tam_TSCII)
>-  $pcmodels	tel		basic		=	pc/pc(%m)+pc/in(tel)
>-  *		tel		basic		=	pc/pc(pc105)+pc/in(tel)
>-  $pcmodels	yu		basic		=	pc/pc(%m)+pc/srp(latin)
>-  *		yu		basic		=	pc/pc(pc105)+pc/srp(latin)
>-  $pcmodels	yu		unicode		=	pc/pc(%m)+pc/srp(latinunicode)
>-  *		yu		unicode		=	pc/pc(pc105)+pc/srp(latinunicode)
>-  $pcmodels	yu		yz		=	pc/pc(%m)+pc/srp(latinyz)
>-  *		yu		yz		=	pc/pc(pc105)+pc/srp(latinyz)
>-  $pcmodels	yu		unicodeyz	=	pc/pc(%m)+pc/srp(latinunicodeyz)
>-  *		yu		unicodeyz	=	pc/pc(pc105)+pc/srp(latinunicodeyz)
>- $maclaptop	*		nodeadkeys	=	macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch)
>- $mac		*		nodeadkeys	=	macintosh/us(extended)+macintosh/%l%(v)
>-
>-! model		layout				=	symbols
>-  $pcmodels	ar			=	pc/pc(%m)+pc/ara
>-  *		ar			=	pc/pc(pc105)+pc/ara
>-  $pcmodels	ben			=	pc/pc(%m)+pc/in(ben)
>-  *		ben			=	pc/pc(pc105)+pc/in(ben)
>-  $pcmodels	bs			=	pc/pc(%m)+pc/ba
>-  *		bs			=	pc/pc(pc105)+pc/ba
>-  $pcmodels	dev			=	pc/pc(%m)+pc/in(deva)
>-  *		dev			=	pc/pc(pc105)+pc/in(deva)
>-  $pcmodels	dvorak			=	pc/pc(%m)+pc/us(dvorak)
>-  *		dvorak			=	pc/pc(pc105)+pc/us(dvorak)
>-  $pcmodels	dz			=	pc/pc(%m)+pc/bt
>-  *		dz			=	pc/pc(pc105)+pc/bt
>-  $pcmodels	el			=	pc/pc(%m)+pc/gr
>-  *		el			=	pc/pc(pc105)+pc/gr
>-  $pcmodels	ge_la			=	pc/pc(%m)+pc/ge
>-  *		ge_la			=	pc/pc(pc105)+pc/ge
>-  $pcmodels	ge_ru			=	pc/pc(%m)+pc/ge(ru)
>-  *		ge_ru			=	pc/pc(pc105)+pc/ge(ru)
>-  $pcmodels	guj			=	pc/pc(%m)+pc/in(guj)
>-  *		guj			=	pc/pc(pc105)+pc/in(guj)
>-  $pcmodels	gur			=	pc/pc(%m)+pc/in(guru)
>-  *		gur			=	pc/pc(pc105)+pc/in(guru)
>-  $pcmodels	iu			=	pc/pc(%m)+pc/ca(ike)
>-  *		iu			=	pc/pc(pc105)+pc/ca(ike)
>-  $pcmodels	lo			=	pc/pc(%m)+pc/la
>-  *		lo			=	pc/pc(pc105)+pc/la
>-  $pcmodels	kan			=	pc/pc(%m)+pc/in(kan)
>-  *		kan			=	pc/pc(pc105)+pc/in(kan)
>-  $pcmodels	mi			=	pc/pc(%m)+pc/mao
>-  *		mi			=	pc/pc(pc105)+pc/mao
>-  $pcmodels	mk			=	pc/pc(%m)+pc/mkd
>-  *		mk			=	pc/pc(pc105)+pc/mkd
>-  $pcmodels	ml			=	pc/pc(%m)+pc/in(mal)
>-  *		ml			=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	ogham			=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham			=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ori			=	pc/pc(%m)+pc/ie(ori)
>-  *		ori			=	pc/pc(pc105)+pc/ie(ori)
>-  $pcmodels	sapmi			=	pc/pc(%m)+pc/no(smi)
>-  *		sapmi			=	pc/pc(pc105)+pc/no(smi)
>-  $pcmodels	sr			=	pc/pc(%m)+pc/srp
>-  *		sr			=	pc/pc(pc105)+pc/srp
>-  $pcmodels	syr			=	pc/pc(%m)+pc/sy(syc)
>-  *		syr			=	pc/pc(pc105)+pc/sy(syc)
>-  $pcmodels	tel			=	pc/pc(%m)+pc/in(tel)
>-  *		tel			=	pc/pc(pc105)+pc/in(tel)
>-  $pcmodels	tml			=	pc/pc(%m)+pc/in(tam)
>-  *		tml			=	pc/pc(pc105)+pc/in(tam)
>-  $pcmodels	yu			=	pc/pc(%m)+pc/srp
>-  *		yu			=	pc/pc(pc105)+pc/srp
>-  $pcmodels	ben(basic)		=	pc/pc(%m)+pc/in(ben)
>-  *		ben(basic)		=	pc/pc(pc105)+pc/in(ben)
>-  $pcmodels	ben(probhat)		=	pc/pc(%m)+pc/in(ben_probhat)
>-  *		ben(probhat)		=	pc/pc(pc105)+pc/in(ben_probhat)
>-  $pcmodels	dev(basic)		=	pc/pc(%m)+pc/in(deva)
>-  *		dev(basic)		=	pc/pc(pc105)+pc/in(deva)
>-  $pcmodels	dvorak(gb)		=	pc/pc(%m)+pc/gb(dvorak)
>-  *		dvorak(gb)		=	pc/pc(pc105)+pc/gb(dvorak)
>-  $pcmodels	dvorak(fr)		=	pc/pc(%m)+pc/fr(dvorak)
>-  *		dvorak(fr)		=	pc/pc(pc105)+pc/fr(dvorak)
>-  $pcmodels	dvorak(no)		=	pc/pc(%m)+pc/no(dvorak)
>-  *		dvorak(no)		=	pc/pc(pc105)+pc/no(dvorak)
>-  $pcmodels	dvorak(se)		=	pc/pc(%m)+pc/se(dvorak)
>-  *		dvorak(se)		=	pc/pc(pc105)+pc/se(dvorak)
>-  $pcmodels	dvorak(basic)		=	pc/pc(%m)+pc/us(dvorak)
>-  *		dvorak(basic)		=	pc/pc(pc105)+pc/us(dvorak)
>-  $pcmodels	dvorak(pl_basic)	=	pc/pc(%m)+pc/pl(dvorak)
>-  *		dvorak(pl_basic)	=	pc/pc(pc105)+pc/pl(dvorak)
>-  $pcmodels	dvorak(pl)		=	pc/pc(%m)+pc/pl(dvorak_quotes)
>-  *		dvorak(pl)		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
>-  $pcmodels	dvorak(pl_altquotes)	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
>-  *		dvorak(pl_altquotes)	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
>-  $pcmodels	dz(basic)		=	pc/pc(%m)+pc/bt(basic)
>-  *		dz(basic)		=	pc/pc(pc105)+pc/bt(basic)
>-  $pcmodels	guj(basic)		=	pc/pc(%m)+pc/in(guj)
>-  *		guj(basic)		=	pc/pc(pc105)+pc/in(guj)
>-  $pcmodels	gur(basic)		=	pc/pc(%m)+pc/in(guru)
>-  *		gur(basic)		=	pc/pc(pc105)+pc/in(guru)
>-  $pcmodels	ie(laptop)		=	pc/pc(%m)+pc/ie(basic)
>-  *		ie(laptop)		=	pc/pc(pc105)+pc/ie(basic)
>-  $pcmodels	ie(CloGaelachLaptop)	=	pc/pc(%m)+pc/ie(CloGaelach)
>-  *		ie(CloGaelachLaptop)	=	pc/pc(pc105)+pc/ie(CloGaelach)
>-  $pcmodels	iu(basic)		=	pc/pc(%m)+pc/ca(ike)
>-  *		iu(basic)		=	pc/pc(pc105)+pc/ca(ike)
>-  $pcmodels	lo(basic)		=	pc/pc(%m)+pc/la(basic)
>-  *		lo(basic)		=	pc/pc(pc105)+pc/la(basic)
>-  $pcmodels	kan(basic)		=	pc/pc(%m)+pc/in(kan)
>-  *		kan(basic)		=	pc/pc(pc105)+pc/in(kan)
>-  $pcmodels	mal(basic)		=	pc/pc(%m)+pc/in(mal)
>-  *		mal(basic)		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	mal(mlplusnum)		=	pc/pc(%m)+pc/in(mal)
>-  *		mal(mlplusnum)		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	ogham(basic)		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham(basic)		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham(laptop)		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham(laptop)		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham(is434)		=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham(is434)		=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ogham(is434laptop)	=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham(is434laptop)	=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ori(basic)		=	pc/pc(%m)+pc/in(ori)
>-  *		ori(basic)		=	pc/pc(pc105)+pc/in(ori)
>-  $pcmodels	sapmi(basic)		=	pc/pc(%m)+pc/no(smi)
>-  *		sapmi(basic)		=	pc/pc(pc105)+pc/no(smi)
>-  $pcmodels	sapmi(nodeadkeys)	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
>-  *		sapmi(nodeadkeys)	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
>-  $pcmodels	sapmi(sefi)		=	pc/pc(%m)+pc/fi(smi)
>-  *		sapmi(sefi)		=	pc/pc(pc105)+pc/fi(smi)
>-  $pcmodels	sin(phonetic-static)	=	pc/pc(%m)+pc/in(sin_phonetic)
>-  *		sin(phonetic-static)	=	pc/pc(pc105)+pc/in(sin_phonetic)
>-  $pcmodels	syr(basic)		=	pc/pc(%m)+pc/sy(syc)
>-  *		syr(basic)		=	pc/pc(pc105)+pc/sy(syc)
>-  $pcmodels	syr(phonetic)		=	pc/pc(%m)+pc/sy(syc_phonetic)
>-  *		syr(phonetic)		=	pc/pc(pc105)+pc/sy(syc_phonetic)
>-  $pcmodels	tam(INSCRIPT)		=	pc/pc(%m)+pc/in(tam)
>-  *		tam(INSCRIPT)		=	pc/pc(pc105)+pc/in(tam)
>-  $pcmodels	tam(UNI)		=	pc/pc(%m)+pc/in(tam_unicode)
>-  *		tam(UNI)		=	pc/pc(pc105)+pc/in(tam_unicode)
>-  $pcmodels	tam(TAB)		=	pc/pc(%m)+pc/in(tam_TAB)
>-  *		tam(TAB)		=	pc/pc(pc105)+pc/in(tam_TAB)
>-  $pcmodels	tam(TSCII)		=	pc/pc(%m)+pc/in(tam_TSCII)
>-  *		tam(TSCII)		=	pc/pc(pc105)+pc/in(tam_TSCII)
>-  $pcmodels	tel(basic)		=	pc/pc(%m)+pc/in(tel)
>-  *		tel(basic)		=	pc/pc(pc105)+pc/in(tel)
>-  $pcmodels	yu(basic)		=	pc/pc(%m)+pc/srp(latin)
>-  *		yu(basic)		=	pc/pc(pc105)+pc/srp(latin)
>-  $pcmodels	yu(unicode)		=	pc/pc(%m)+pc/srp(latinunicode)
>-  *		yu(unicode)		=	pc/pc(pc105)+pc/srp(latinunicode)
>-  $pcmodels	yu(yz)			=	pc/pc(%m)+pc/srp(latinyz)
>-  *		yu(yz)			=	pc/pc(pc105)+pc/srp(latinyz)
>-  $pcmodels	yu(unicodeyz)		=	pc/pc(%m)+pc/srp(latinunicodeyz)
>-  *		yu(unicodeyz)		=	pc/pc(pc105)+pc/srp(latinunicodeyz)
>-  pc98		nec/jp			=	nec/jp(pc98)
>-  abnt2		br			=	pc/pc(pc104)+pc/br
>- $maclaptop	us			=	macintosh/us(extended)+apple(laptop_bad_switch)
>- $maclaptop	en_US			=	macintosh/us(extended)+apple(laptop_bad_switch)
>- $maclaptop	*			=	macintosh/us(extended)+apple(laptop_bad_switch)+macintosh/%l%(v)
>- $mac		us			=	macintosh/us(extended)
>- $mac		en_US			=	macintosh/us(extended)
>- $mac		*			=	macintosh/us(extended)+macintosh/%l%(v)
>- $pcmodels      intl   			=       us(%mcompose)
>-  *		intl			=	us(pc104compose)
>-  *		jp			=	pc/pc(pc102)+pc/jp(latin)+pc/jp:2
>- $pcmodels      ca     			=       pc/pc(%m)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
>-  *             ca     			=       pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
>- $pcmodels $nonlatin			=	pc/pc(%m)+pc/us+pc/%l%(v):2
>- $pcmodels	*			=	pc/pc(%m)+pc/%l%(v)
>-  *	   $nonlatin			=	pc/pc(pc105)+pc/us+pc/%l%(v):2
>-  *		*			=	pc/pc(pc105)+pc/%l%(v)
>-
>-! model		layout[1]			=	symbols
>-  $pcmodels	ar			=	pc/pc(%m)+pc/ara%(v[1])
>-  *		ar			=	pc/pc(pc105)+pc/ara%(v[1])
>-  $pcmodels	ben			=	pc/pc(%m)+pc/in(ben)%(v[1])
>-  *		ben			=	pc/pc(pc105)+pc/in(ben)%(v[1])
>-  $pcmodels	bs			=	pc/pc(%m)+pc/ba%(v[1])
>-  *		bs			=	pc/pc(pc105)+pc/ba%(v[1])
>-  $pcmodels	dev			=	pc/pc(%m)+pc/in(deva)%(v[1])
>-  *		dev			=	pc/pc(pc105)+pc/in(deva)%(v[1])
>-  $pcmodels	dvorak			=	pc/pc(%m)+pc/us(dvorak)%(v[1])
>-  *		dvorak			=	pc/pc(pc105)+pc/us(dvorak)%(v[1])
>-  $pcmodels	dz			=	pc/pc(%m)+pc/bt%(v[1])
>-  *		dz			=	pc/pc(pc105)+pc/bt%(v[1])
>-  $pcmodels	el			=	pc/pc(%m)+pc/gr%(v[1])
>-  *		el			=	pc/pc(pc105)+pc/gr%(v[1])
>-  $pcmodels	ge_la			=	pc/pc(%m)+pc/ge%(v[1])
>-  *		ge_la			=	pc/pc(pc105)+pc/ge%(v[1])
>-  $pcmodels	ge_ru			=	pc/pc(%m)+pc/ge(ru)%(v[1])
>-  *		ge_ru			=	pc/pc(pc105)+pc/ge(ru)%(v[1])
>-  $pcmodels	guj			=	pc/pc(%m)+pc/in(guj)%(v[1])
>-  *		guj			=	pc/pc(pc105)+pc/in(guj)%(v[1])
>-  $pcmodels	gur			=	pc/pc(%m)+pc/in(guru)%(v[1])
>-  *		gur			=	pc/pc(pc105)+pc/in(guru)%(v[1])
>-  $pcmodels	iu			=	pc/pc(%m)+pc/ca(ike)%(v[1])
>-  *		iu			=	pc/pc(pc105)+pc/ca(ike)%(v[1])
>-  $pcmodels	lo			=	pc/pc(%m)+pc/la%(v[1])
>-  *		lo			=	pc/pc(pc105)+pc/la%(v[1])
>-  $pcmodels	kan			=	pc/pc(%m)+pc/in(kan)%(v[1])
>-  *		kan			=	pc/pc(pc105)+pc/in(kan)%(v[1])
>-  $pcmodels	mi			=	pc/pc(%m)+pc/mao%(v[1])
>-  *		mi			=	pc/pc(pc105)+pc/mao%(v[1])
>-  $pcmodels	mk			=	pc/pc(%m)+pc/mkd%(v[1])
>-  *		mk			=	pc/pc(pc105)+pc/mkd%(v[1])
>-  $pcmodels	ml			=	pc/pc(%m)+pc/in(mal)%(v[1])
>-  *		ml			=	pc/pc(pc105)+pc/in(mal)%(v[1])
>-  $pcmodels	ogham			=	pc/pc(%m)+pc/ie(ogam)%(v[1])
>-  *		ogham			=	pc/pc(pc105)+pc/ie(ogam)%(v[1])
>-  $pcmodels	ori			=	pc/pc(%m)+pc/ie(ori)%(v[1])
>-  *		ori			=	pc/pc(pc105)+pc/ie(ori)%(v[1])
>-  $pcmodels	sapmi			=	pc/pc(%m)+pc/no(smi)%(v[1])
>-  *		sapmi			=	pc/pc(pc105)+pc/no(smi)%(v[1])
>-  $pcmodels	sr			=	pc/pc(%m)+pc/srp%(v[1])
>-  *		sr			=	pc/pc(pc105)+pc/srp%(v[1])
>-  $pcmodels	syr			=	pc/pc(%m)+pc/sy(syc)%(v[1])
>-  *		syr			=	pc/pc(pc105)+pc/sy(syc)%(v[1])
>-  $pcmodels	tel			=	pc/pc(%m)+pc/in(tel)%(v[1])
>-  *		tel			=	pc/pc(pc105)+pc/in(tel)%(v[1])
>-  $pcmodels	tml			=	pc/pc(%m)+pc/in(tam)%(v[1])
>-  *		tml			=	pc/pc(pc105)+pc/in(tam)%(v[1])
>-  $pcmodels	yu			=	pc/pc(%m)+pc/srp%(v[1])
>-  *		yu			=	pc/pc(pc105)+pc/srp%(v[1])
>-  $pcmodels	ben(basic)		=	pc/pc(%m)+pc/in(ben)
>-  *		ben(basic)		=	pc/pc(pc105)+pc/in(ben)
>-  $pcmodels	ben(probhat)		=	pc/pc(%m)+pc/in(ben_probhat)
>-  *		ben(probhat)		=	pc/pc(pc105)+pc/in(ben_probhat)
>-  $pcmodels	dev(basic)		=	pc/pc(%m)+pc/in(deva)
>-  *		dev(basic)		=	pc/pc(pc105)+pc/in(deva)
>-  $pcmodels	dvorak(gb)		=	pc/pc(%m)+pc/gb(dvorak)
>-  *		dvorak(gb)		=	pc/pc(pc105)+pc/gb(dvorak)
>-  $pcmodels	dvorak(fr)		=	pc/pc(%m)+pc/fr(dvorak)
>-  *		dvorak(fr)		=	pc/pc(pc105)+pc/fr(dvorak)
>-  $pcmodels	dvorak(no)		=	pc/pc(%m)+pc/no(dvorak)
>-  *		dvorak(no)		=	pc/pc(pc105)+pc/no(dvorak)
>-  $pcmodels	dvorak(se)		=	pc/pc(%m)+pc/se(dvorak)
>-  *		dvorak(se)		=	pc/pc(pc105)+pc/se(dvorak)
>-  $pcmodels	dvorak(basic)		=	pc/pc(%m)+pc/us(dvorak)
>-  *		dvorak(basic)		=	pc/pc(pc105)+pc/us(dvorak)
>-  $pcmodels	dvorak(pl_basic)	=	pc/pc(%m)+pc/pl(dvorak)
>-  *		dvorak(pl_basic)	=	pc/pc(pc105)+pc/pl(dvorak)
>-  $pcmodels	dvorak(pl)		=	pc/pc(%m)+pc/pl(dvorak_quotes)
>-  *		dvorak(pl)		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
>-  $pcmodels	dvorak(pl_altquotes)	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
>-  *		dvorak(pl_altquotes)	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
>-  $pcmodels	dz(basic)		=	pc/pc(%m)+pc/bt(basic)
>-  *		dz(basic)		=	pc/pc(pc105)+pc/bt(basic)
>-  $pcmodels	guj(basic)		=	pc/pc(%m)+pc/in(guj)
>-  *		guj(basic)		=	pc/pc(pc105)+pc/in(guj)
>-  $pcmodels	gur(basic)		=	pc/pc(%m)+pc/in(guru)
>-  *		gur(basic)		=	pc/pc(pc105)+pc/in(guru)
>-  $pcmodels	ie(laptop)		=	pc/pc(%m)+pc/ie(basic)
>-  *		ie(laptop)		=	pc/pc(pc105)+pc/ie(basic)
>-  $pcmodels	ie(CloGaelachLaptop)	=	pc/pc(%m)+pc/ie(CloGaelach)
>-  *		ie(CloGaelachLaptop)	=	pc/pc(pc105)+pc/ie(CloGaelach)
>-  $pcmodels	iu(basic)		=	pc/pc(%m)+pc/ca(ike)
>-  *		iu(basic)		=	pc/pc(pc105)+pc/ca(ike)
>-  $pcmodels	lo(basic)		=	pc/pc(%m)+pc/la(basic)
>-  *		lo(basic)		=	pc/pc(pc105)+pc/la(basic)
>-  $pcmodels	kan(basic)		=	pc/pc(%m)+pc/in(kan)
>-  *		kan(basic)		=	pc/pc(pc105)+pc/in(kan)
>-  $pcmodels	mal(basic)		=	pc/pc(%m)+pc/in(mal)
>-  *		mal(basic)		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	mal(mlplusnum)		=	pc/pc(%m)+pc/in(mal)
>-  *		mal(mlplusnum)		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	ogham(basic)		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham(basic)		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham(laptop)		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham(laptop)		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham(is434)		=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham(is434)		=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ogham(is434laptop)	=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham(is434laptop)	=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ori(basic)		=	pc/pc(%m)+pc/in(ori)
>-  *		ori(basic)		=	pc/pc(pc105)+pc/in(ori)
>-  $pcmodels	sapmi(basic)		=	pc/pc(%m)+pc/no(smi)
>-  *		sapmi(basic)		=	pc/pc(pc105)+pc/no(smi)
>-  $pcmodels	sapmi(nodeadkeys)	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
>-  *		sapmi(nodeadkeys)	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
>-  $pcmodels	sapmi(sefi)		=	pc/pc(%m)+pc/fi(smi)
>-  *		sapmi(sefi)		=	pc/pc(pc105)+pc/fi(smi)
>-  $pcmodels	sin(phonetic-static)	=	pc/pc(%m)+pc/in(sin_phonetic)
>-  *		sin(phonetic-static)	=	pc/pc(pc105)+pc/in(sin_phonetic)
>-  $pcmodels	syr(basic)		=	pc/pc(%m)+pc/sy(syc)
>-  *		syr(basic)		=	pc/pc(pc105)+pc/sy(syc)
>-  $pcmodels	syr(phonetic)		=	pc/pc(%m)+pc/sy(syc_phonetic)
>-  *		syr(phonetic)		=	pc/pc(pc105)+pc/sy(syc_phonetic)
>-  $pcmodels	tam(INSCRIPT)		=	pc/pc(%m)+pc/in(tam)
>-  *		tam(INSCRIPT)		=	pc/pc(pc105)+pc/in(tam)
>-  $pcmodels	tam(UNI)		=	pc/pc(%m)+pc/in(tam_unicode)
>-  *		tam(UNI)		=	pc/pc(pc105)+pc/in(tam_unicode)
>-  $pcmodels	tam(TAB)		=	pc/pc(%m)+pc/in(tam_TAB)
>-  *		tam(TAB)		=	pc/pc(pc105)+pc/in(tam_TAB)
>-  $pcmodels	tam(TSCII)		=	pc/pc(%m)+pc/in(tam_TSCII)
>-  *		tam(TSCII)		=	pc/pc(pc105)+pc/in(tam_TSCII)
>-  $pcmodels	tel(basic)		=	pc/pc(%m)+pc/in(tel)
>-  *		tel(basic)		=	pc/pc(pc105)+pc/in(tel)
>-  $pcmodels	yu(basic)		=	pc/pc(%m)+pc/srp(latin)
>-  *		yu(basic)		=	pc/pc(pc105)+pc/srp(latin)
>-  $pcmodels	yu(unicode)		=	pc/pc(%m)+pc/srp(latinunicode)
>-  *		yu(unicode)		=	pc/pc(pc105)+pc/srp(latinunicode)
>-  $pcmodels	yu(yz)			=	pc/pc(%m)+pc/srp(latinyz)
>-  *		yu(yz)			=	pc/pc(pc105)+pc/srp(latinyz)
>-  $pcmodels	yu(unicodeyz)		=	pc/pc(%m)+pc/srp(latinunicodeyz)
>-  *		yu(unicodeyz)		=	pc/pc(pc105)+pc/srp(latinunicodeyz)
>- $pcmodels	*			=	pc/pc(%m)+pc/%l[1]%(v[1])
>-  *		*			=	pc/pc(pc105)+pc/%l[1]%(v[1])
>-
>-! model		layout[1]	variant[1]	=	symbols
>-  $pcmodels	ben		basic		=	pc/pc(%m)+pc/in(ben)
>-  *		ben		basic		=	pc/pc(pc105)+pc/in(ben)
>-  $pcmodels	ben		probhat		=	pc/pc(%m)+pc/in(ben_probhat)
>-  *		ben		probhat		=	pc/pc(pc105)+pc/in(ben_probhat)
>-  $pcmodels	dev		basic		=	pc/pc(%m)+pc/in(deva)
>-  *		dev		basic		=	pc/pc(pc105)+pc/in(deva)
>-  $pcmodels	dvorak		gb		=	pc/pc(%m)+pc/gb(dvorak)
>-  *		dvorak		gb		=	pc/pc(pc105)+pc/gb(dvorak)
>-  $pcmodels	dvorak		fr		=	pc/pc(%m)+pc/fr(dvorak)
>-  *		dvorak		fr		=	pc/pc(pc105)+pc/fr(dvorak)
>-  $pcmodels	dvorak		no		=	pc/pc(%m)+pc/no(dvorak)
>-  *		dvorak		no		=	pc/pc(pc105)+pc/no(dvorak)
>-  $pcmodels	dvorak		se		=	pc/pc(%m)+pc/se(dvorak)
>-  *		dvorak		se		=	pc/pc(pc105)+pc/se(dvorak)
>-  $pcmodels	dvorak		basic		=	pc/pc(%m)+pc/us(dvorak)
>-  *		dvorak		basic		=	pc/pc(pc105)+pc/us(dvorak)
>-  $pcmodels	dvorak		pl_basic	=	pc/pc(%m)+pc/pl(dvorak)
>-  *		dvorak		pl_basic	=	pc/pc(pc105)+pc/pl(dvorak)
>-  $pcmodels	dvorak		pl		=	pc/pc(%m)+pc/pl(dvorak_quotes)
>-  *		dvorak		pl		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
>-  $pcmodels	dvorak		pl_altquotes	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
>-  *		dvorak		pl_altquotes	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
>-  $pcmodels	dz		basic		=	pc/pc(%m)+pc/bt(basic)
>-  *		dz		basic		=	pc/pc(pc105)+pc/bt(basic)
>-  $pcmodels	guj		basic		=	pc/pc(%m)+pc/in(guj)
>-  *		guj		basic		=	pc/pc(pc105)+pc/in(guj)
>-  $pcmodels	gur		basic		=	pc/pc(%m)+pc/in(guru)
>-  *		gur		basic		=	pc/pc(pc105)+pc/in(guru)
>-  $pcmodels	ie		laptop		=	pc/pc(%m)+pc/ie(basic)
>-  *		ie		laptop		=	pc/pc(pc105)+pc/ie(basic)
>-  $pcmodels	ie		CloGaelachLaptop		=	pc/pc(%m)+pc/ie(CloGaelach)
>-  *		ie		CloGaelachLaptop		=	pc/pc(pc105)+pc/ie(CloGaelach)
>-  $pcmodels	iu		basic		=	pc/pc(%m)+pc/ca(ike)
>-  *		iu		basic		=	pc/pc(pc105)+pc/ca(ike)
>-  $pcmodels	lo		basic		=	pc/pc(%m)+pc/la(basic)
>-  *		lo		basic		=	pc/pc(pc105)+pc/la(basic)
>-  $pcmodels	kan		basic		=	pc/pc(%m)+pc/in(kan)
>-  *		kan		basic		=	pc/pc(pc105)+pc/in(kan)
>-  $pcmodels	mal		basic		=	pc/pc(%m)+pc/in(mal)
>-  *		mal		basic		=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	mal		mlplusnum	=	pc/pc(%m)+pc/in(mal)
>-  *		mal		mlplusnum	=	pc/pc(pc105)+pc/in(mal)
>-  $pcmodels	ogham		basic		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham		basic		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham		laptop		=	pc/pc(%m)+pc/ie(ogam)
>-  *		ogham		laptop		=	pc/pc(pc105)+pc/ie(ogam)
>-  $pcmodels	ogham		is434		=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham		is434		=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ogham		is434laptop	=	pc/pc(%m)+pc/ie(ogam_is434)
>-  *		ogham		is434laptop	=	pc/pc(pc105)+pc/ie(ogam_is434)
>-  $pcmodels	ori		basic		=	pc/pc(%m)+pc/in(ori)
>-  *		ori		basic		=	pc/pc(pc105)+pc/in(ori)
>-  $pcmodels	sapmi		basic		=	pc/pc(%m)+pc/no(smi)
>-  *		sapmi		basic		=	pc/pc(pc105)+pc/no(smi)
>-  $pcmodels	sapmi		nodeadkeys	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
>-  *		sapmi		nodeadkeys	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
>-  $pcmodels	sapmi		sefi		=	pc/pc(%m)+pc/fi(smi)
>-  *		sapmi		sefi		=	pc/pc(pc105)+pc/fi(smi)
>-  $pcmodels	sin		phonetic-static	=	pc/pc(%m)+pc/in(sin_phonetic)
>-  *		sin		phonetic-static	=	pc/pc(pc105)+pc/in(sin_phonetic)
>-  $pcmodels	syr		basic		=	pc/pc(%m)+pc/sy(syc)
>-  *		syr		basic		=	pc/pc(pc105)+pc/sy(syc)
>-  $pcmodels	syr		phonetic	=	pc/pc(%m)+pc/sy(syc_phonetic)
>-  *		syr		phonetic	=	pc/pc(pc105)+pc/sy(syc_phonetic)
>-  $pcmodels	tam		INSCRIPT	=	pc/pc(%m)+pc/in(tam)
>-  *		tam		INSCRIPT	=	pc/pc(pc105)+pc/in(tam)
>-  $pcmodels	tam		UNI		=	pc/pc(%m)+pc/in(tam_unicode)
>-  *		tam		UNI		=	pc/pc(pc105)+pc/in(tam_unicode)
>-  $pcmodels	tam		TAB		=	pc/pc(%m)+pc/in(tam_TAB)
>-  *		tam		TAB		=	pc/pc(pc105)+pc/in(tam_TAB)
>-  $pcmodels	tam		TSCII		=	pc/pc(%m)+pc/in(tam_TSCII)
>-  *		tam		TSCII		=	pc/pc(pc105)+pc/in(tam_TSCII)
>-  $pcmodels	tel		basic		=	pc/pc(%m)+pc/in(tel)
>-  *		tel		basic		=	pc/pc(pc105)+pc/in(tel)
>-  $pcmodels	yu		basic		=	pc/pc(%m)+pc/srp(latin)
>-  *		yu		basic		=	pc/pc(pc105)+pc/srp(latin)
>-  $pcmodels	yu		unicode		=	pc/pc(%m)+pc/srp(latinunicode)
>-  *		yu		unicode		=	pc/pc(pc105)+pc/srp(latinunicode)
>-  $pcmodels	yu		yz		=	pc/pc(%m)+pc/srp(latinyz)
>-  *		yu		yz		=	pc/pc(pc105)+pc/srp(latinyz)
>-  $pcmodels	yu		unicodeyz	=	pc/pc(%m)+pc/srp(latinunicodeyz)
>-  *		yu		unicodeyz	=	pc/pc(pc105)+pc/srp(latinunicodeyz)
>+! model		=	symbols
>+  ataritt	=	xfree68/ataritt
>+  amiga		=	xfree68/amiga
>+  sun4		=	sun/us(sun4)+iso9995-3(basic)
>+  sun5		=	sun/us(sun5)+iso9995-3(basic)
>+ $maclaptop	=	macintosh/us(extended)
>+ $mac		=	macintosh/us(extended)
>+  abnt2		=	pc/pc(pc104)
>+ $pcmodels	=	pc/pc(%m)
>+  *		=	pc/pc(pc105)
>+
>+! model		layout		=	symbols
>+ $pcmodels      intl		=	us(%mcompose)
>+  *		intl		=	us(pc105compose)
>+  pc98		nec/jp		=	nec/jp(pc98)
>+
>+! layout		=	symbols
>+  ar			=	+pc/ara%(v)
>+  ben			=	+pc/in(ben)
>+  bs			=	+pc/ba%(v)
>+  de_CH			=	+pc/ch(de)
>+  dev			=	+pc/in(deva)
>+  dvorak		=	+pc/us(dvorak)
>+  dz			=	+pc/bt%(v)
>+  el			=	+pc/gr%(v)
>+  fr_CH			=	+pc/ch(fr)
>+  ge_la			=	+pc/ge%(v)
>+  ge_ru			=	+pc/ge(ru)
>+  guj			=	+pc/in(guj)
>+  gur			=	+pc/in(guru)
>+  iu			=	+pc/ca(ike)
>+  lo			=	+pc/la%(v)
>+  kan			=	+pc/in(kan)
>+  mi			=	+pc/mao%(v)
>+  mk			=	+pc/mkd%(v)
>+  ml			=	+pc/in(mal)
>+  ogham			=	+pc/ie(ogam)
>+  ori			=	+pc/ie(ori)
>+  sapmi			=	+pc/no(smi)
>+  sr			=	+pc/srp%(v)
>+  syr			=	+pc/sy(syc)
>+  tel			=	+pc/in(tel)
>+  tml			=	+pc/in(tam)
>+  yu			=	+pc/srp%(v)
>+  ben(basic)		=	+pc/in(ben)
>+  ben(probhat)		=	+pc/in(ben_probhat)
>+  dev(basic)		=	+pc/in(deva)
>+  dvorak(gb)		=	+pc/gb(dvorak)
>+  dvorak(fr)		=	+pc/fr(dvorak)
>+  dvorak(no)		=	+pc/no(dvorak)
>+  dvorak(se)		=	+pc/se(dvorak)
>+  dvorak(basic)		=	+pc/us(dvorak)
>+  dvorak(pl_basic)	=	+pc/pl(dvorak)
>+  dvorak(pl)		=	+pc/pl(dvorak_quotes)
>+  dvorak(pl_altquotes)	=	+pc/pl(dvorak_altquotes)
>+  dz(basic)		=	+pc/bt(basic)
>+  guj(basic)		=	+pc/in(guj)
>+  gur(basic)		=	+pc/in(guru)
>+  ie(laptop)		=	+pc/ie(basic)
>+  ie(CloGaelachLaptop)	=	+pc/ie(CloGaelach)
>+  iu(basic)		=	+pc/ca(ike)
>+  lo(basic)		=	+pc/la(basic)
>+  kan(basic)		=	+pc/in(kan)
>+  mal(basic)		=	+pc/in(mal)
>+  mal(mlplusnum)	=	+pc/in(mal)
>+  ogham(basic)		=	+pc/ie(ogam)
>+  ogham(laptop)		=	+pc/ie(ogam)
>+  ogham(is434)		=	+pc/ie(ogam_is434)
>+  ogham(is434laptop)	=	+pc/ie(ogam_is434)
>+  ori(basic)		=	+pc/in(ori)
>+  sapmi(basic)		=	+pc/no(smi)
>+  sapmi(nodeadkeys)	=	+pc/no(smi_nodeadkeys)
>+  sapmi(sefi)		=	+pc/fi(smi)
>+  sin(phonetic-static)	=	+pc/in(sin_phonetic)
>+  syr(basic)		=	+pc/sy(syc)
>+  syr(phonetic)		=	+pc/sy(syc_phonetic)
>+  tam(INSCRIPT)		=	+pc/in(tam)
>+  tam(UNI)		=	+pc/in(tam_unicode)
>+  tam(TAB)		=	+pc/in(tam_TAB)
>+  tam(TSCII)		=	+pc/in(tam_TSCII)
>+  tel(basic)		=	+pc/in(tel)
>+  yu(basic)		=	+pc/srp(latin)
>+  yu(unicode)		=	+pc/srp(latinunicode)
>+  yu(yz)		=	+pc/srp(latinyz)
>+  yu(unicodeyz)		=	+pc/srp(latinunicodeyz)
>+  jp			=	+pc/jp(latin)+pc/jp:2
>+  ca			=	+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
>+  $nonlatin		=	+pc/us+pc/%l%(v):2
>+  *			=	+pc/%l%(v)
>+
>+! model		layout		=	symbols
>+ $maclaptop	$maclayouts	=	+macintosh/%l%(v)
>+ $mac		$maclayouts	=	+macintosh/%l%(v)
>+
>+! layout[1]		=	symbols
>+  ar			=	+pc/ara%(v[1])
>+  ben			=	+pc/in(ben)
>+  bs			=	+pc/ba%(v[1])
>+  dev			=	+pc/in(deva)
>+  dvorak		=	+pc/us(dvorak)
>+  dz			=	+pc/bt%(v[1])
>+  el			=	+pc/gr%(v[1])
>+  ge_la			=	+pc/ge%(v[1])
>+  ge_ru			=	+pc/ge(ru)
>+  guj			=	+pc/in(guj)
>+  gur			=	+pc/in(guru)
>+  iu			=	+pc/ca(ike)
>+  lo			=	+pc/la%(v[1])
>+  kan			=	+pc/in(kan)
>+  mi			=	+pc/mao%(v[1])
>+  mk			=	+pc/mkd%(v[1])
>+  ml			=	+pc/in(mal)
>+  ogham			=	+pc/ie(ogam)
>+  ori			=	+pc/ie(ori)
>+  sapmi			=	+pc/no(smi)
>+  sr			=	+pc/srp%(v[1])
>+  syr			=	+pc/sy(syc)
>+  tel			=	+pc/in(tel)
>+  tml			=	+pc/in(tam)
>+  yu			=	+pc/srp%(v[1])
>+  ben(basic)		=	+pc/in(ben)
>+  ben(probhat)		=	+pc/in(ben_probhat)
>+  dev(basic)		=	+pc/in(deva)
>+  dvorak(gb)		=	+pc/gb(dvorak)
>+  dvorak(fr)		=	+pc/fr(dvorak)
>+  dvorak(no)		=	+pc/no(dvorak)
>+  dvorak(se)		=	+pc/se(dvorak)
>+  dvorak(basic)		=	+pc/us(dvorak)
>+  dvorak(pl_basic)	=	+pc/pl(dvorak)
>+  dvorak(pl)		=	+pc/pl(dvorak_quotes)
>+  dvorak(pl_altquotes)	=	+pc/pl(dvorak_altquotes)
>+  dz(basic)		=	+pc/bt(basic)
>+  guj(basic)		=	+pc/in(guj)
>+  gur(basic)		=	+pc/in(guru)
>+  ie(laptop)		=	+pc/ie(basic)
>+  ie(CloGaelachLaptop)	=	+pc/ie(CloGaelach)
>+  iu(basic)		=	+pc/ca(ike)
>+  lo(basic)		=	+pc/la(basic)
>+  kan(basic)		=	+pc/in(kan)
>+  mal(basic)		=	+pc/in(mal)
>+  mal(mlplusnum)	=	+pc/in(mal)
>+  ogham(basic)		=	+pc/ie(ogam)
>+  ogham(laptop)		=	+pc/ie(ogam)
>+  ogham(is434)		=	+pc/ie(ogam_is434)
>+  ogham(is434laptop)	=	+pc/ie(ogam_is434)
>+  ori(basic)		=	+pc/in(ori)
>+  sapmi(basic)		=	+pc/no(smi)
>+  sapmi(nodeadkeys)	=	+pc/no(smi_nodeadkeys)
>+  sapmi(sefi)		=	+pc/fi(smi)
>+  sin(phonetic-static)	=	+pc/in(sin_phonetic)
>+  syr(basic)		=	+pc/sy(syc)
>+  syr(phonetic)		=	+pc/sy(syc_phonetic)
>+  tam(INSCRIPT)		=	+pc/in(tam)
>+  tam(UNI)		=	+pc/in(tam_unicode)
>+  tam(TAB)		=	+pc/in(tam_TAB)
>+  tam(TSCII)		=	+pc/in(tam_TSCII)
>+  tel(basic)		=	+pc/in(tel)
>+  yu(basic)		=	+pc/srp(latin)
>+  yu(unicode)		=	+pc/srp(latinunicode)
>+  yu(yz)		=	+pc/srp(latinyz)
>+  yu(unicodeyz)		=	+pc/srp(latinunicodeyz)
>+  *			=	+pc/%l[1]%(v[1])
> 
> ! layout[2]		=	symbols
>   ar			=	+pc/ara%(v[2]):2
>@@ -747,6 +459,94 @@
>   yu(unicodeyz)		=	+pc/srp(latinunicodeyz):4
>   *			=	+pc/%l[4]%(v[4]):4
> 
>+! layout		variant		=	symbols
>+  ben		basic		=	+pc/in(ben)
>+  ben		probhat		=	+pc/in(ben_probhat)
>+  de_CH		nodeadkeys	=	+pc/ch(de_nodeadkeys)
>+  dev		basic		=	+pc/in(deva)
>+  dvorak	gb		=	+pc/gb(dvorak)
>+  dvorak	fr		=	+pc/fr(dvorak)
>+  dvorak	no		=	+pc/no(dvorak)
>+  dvorak	se		=	+pc/se(dvorak)
>+  dvorak	basic		=	+pc/us(dvorak)
>+  dvorak	pl_basic	=	+pc/pl(dvorak)
>+  dvorak	pl		=	+pc/pl(dvorak_quotes)
>+  dvorak	pl_altquotes	=	+pc/pl(dvorak_altquotes)
>+  dz		basic		=	+pc/bt(basic)
>+  fr_CH		nodeadkeys	=	+pc/ch(fr_nodeadkeys)
>+  guj		basic		=	+pc/in(guj)
>+  gur		basic		=	+pc/in(guru)
>+  ie		laptop		=	+pc/ie(basic)
>+  ie		CloGaelachLaptop	=	+pc/ie(CloGaelach)
>+  iu		basic		=	+pc/ca(ike)
>+  lo		basic		=	+pc/la(basic)
>+  kan		basic		=	+pc/in(kan)
>+  mal		basic		=	+pc/in(mal)
>+  mal		mlplusnum	=	+pc/in(mal)
>+  ogham		basic		=	+pc/ie(ogam)
>+  ogham		laptop		=	+pc/ie(ogam)
>+  ogham		is434		=	+pc/ie(ogam_is434)
>+  ogham		is434laptop	=	+pc/ie(ogam_is434)
>+  ori		basic		=	+pc/in(ori)
>+  sapmi		basic		=	+pc/no(smi)
>+  sapmi		nodeadkeys	=	+pc/no(smi_nodeadkeys)
>+  sapmi		sefi		=	+pc/fi(smi)
>+  sin		phonetic-static	=	+pc/in(sin_phonetic)
>+  syr		basic		=	+pc/sy(syc)
>+  syr		phonetic	=	+pc/sy(syc_phonetic)
>+  tam		INSCRIPT	=	+pc/in(tam)
>+  tam		UNI		=	+pc/in(tam_unicode)
>+  tam		TAB		=	+pc/in(tam_TAB)
>+  tam		TSCII		=	+pc/in(tam_TSCII)
>+  tel		basic		=	+pc/in(tel)
>+  yu		basic		=	+pc/srp(latin)
>+  yu		unicode		=	+pc/srp(latinunicode)
>+  yu		yz		=	+pc/srp(latinyz)
>+  yu		unicodeyz	=	+pc/srp(latinunicodeyz)
>+
>+! layout[1]	variant[1]	=	symbols
>+  ben		basic		=	+pc/in(ben)
>+  ben		probhat		=	+pc/in(ben_probhat)
>+  dev		basic		=	+pc/in(deva)
>+  dvorak	gb		=	+pc/gb(dvorak)
>+  dvorak	fr		=	+pc/fr(dvorak)
>+  dvorak	no		=	+pc/no(dvorak)
>+  dvorak	se		=	+pc/se(dvorak)
>+  dvorak	basic		=	+pc/us(dvorak)
>+  dvorak	pl_basic	=	+pc/pl(dvorak)
>+  dvorak	pl		=	+pc/pl(dvorak_quotes)
>+  dvorak	pl_altquotes	=	+pc/pl(dvorak_altquotes)
>+  dz		basic		=	+pc/bt(basic)
>+  guj		basic		=	+pc/in(guj)
>+  gur		basic		=	+pc/in(guru)
>+  ie		laptop		=	+pc/ie(basic)
>+  ie		CloGaelachLaptop	=	+pc/ie(CloGaelach)
>+  iu		basic		=	+pc/ca(ike)
>+  lo		basic		=	+pc/la(basic)
>+  kan		basic		=	+pc/in(kan)
>+  mal		basic		=	+pc/in(mal)
>+  mal		mlplusnum	=	+pc/in(mal)
>+  ogham		basic		=	+pc/ie(ogam)
>+  ogham		laptop		=	+pc/ie(ogam)
>+  ogham		is434		=	+pc/ie(ogam_is434)
>+  ogham		is434laptop	=	+pc/ie(ogam_is434)
>+  ori		basic		=	+pc/in(ori)
>+  sapmi		basic		=	+pc/no(smi)
>+  sapmi		nodeadkeys	=	+pc/no(smi_nodeadkeys)
>+  sapmi		sefi		=	+pc/fi(smi)
>+  sin		phonetic-static	=	+pc/in(sin_phonetic)
>+  syr		basic		=	+pc/sy(syc)
>+  syr		phonetic	=	+pc/sy(syc_phonetic)
>+  tam		INSCRIPT	=	+pc/in(tam)
>+  tam		UNI		=	+pc/in(tam_unicode)
>+  tam		TAB		=	+pc/in(tam_TAB)
>+  tam		TSCII		=	+pc/in(tam_TSCII)
>+  tel		basic		=	+pc/in(tel)
>+  yu		basic		=	+pc/srp(latin)
>+  yu		unicode		=	+pc/srp(latinunicode)
>+  yu		yz		=	+pc/srp(latinyz)
>+  yu		unicodeyz	=	+pc/srp(latinunicodeyz)
>+
> ! layout[2]	variant[2]	=	symbols
>   ben		basic		=	+pc/in(ben):2
>   ben		probhat		=	+pc/in(ben_probhat):2
>@@ -877,7 +677,8 @@
>   yu		unicodeyz	=	+pc/srp(latinunicodeyz):4
> 
> ! model		=	symbols
>-  $inetkbds     =       +inet(%m)
>+ $inetkbds	=	+inet(%m)
>+ $maclaptop	=	+apple(laptop_bad_switch)
> 
> ! model		layout		=	compat
>   pc98		nec/jp		=	pc98(basic)

Actions: View | Splinter Review

Attachments on bug 5507: 4241 | 4320

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.