Makefiles added for xkbdata

1 files changed, 624 insertions, 632 deletions

diff --git a/xorg-server/xkbdata.src/rules/base b/xorg-server/xkbdata.src/rules/base
index 66f484a6c..f226b3b54 100644
--- a/xorg-server/xkbdata.src/rules/base
+++ b/xorg-server/xkbdata.src/rules/base
@@ -1,4 +1,3 @@
-// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
 // $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
 
 //
@@ -128,13 +127,9 @@
   *             =       +aliases(qwerty)
 
 ! option	=	keycodes
-  apple:badmap		=	+macintosh(badmap)
-  apple:goodmap		=	+macintosh(goodmap)
-
-! model		layout	=	geometry
   thinkpad     us              =       thinkpad(us)
 
-! model		=	geometry
+! model		layout	=	geometry
   microsoftelite	=	microsoft(elite)
  $msmodels	=	microsoft(natural)
   dell101	=	dell(dell101)
@@ -156,133 +151,133 @@
   kinesis	=	kinesis(model100)
   *		=       pc(pc104)
 
-! model		layout		variant		=	symbols
-  *		ben		basic		=	pc+in(ben)
-  *		ben		probhat		=	pc+in(ben_probhat)
-  *		dev		basic		=	pc+in(deva)
-  *		dvorak		$dvoraklayouts		=	pc+%v(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)
-  *		dzdwi		basic		=	pc+bt(basic)
-  *		fi		basic		=	pc+fi(classic)
-  *		ge		azerty_tskapo		=	pc+fr(geo)
-  *		guj		basic		=	pc+in(guj)
-  *		gur		basic		=	pc+in(guru)
-  *		ie		laptop		=	pc+ie(basic)
-  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
-  *		il		si1452		=	pc+ie(basic)
-  *		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)
-  *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std)
-  *		ro		academic		=	pc+ro(std)
-  *		ro		std_comma		=	pc+ro(std)
-  *		ro		comma		=	pc+ro(basic)
-  *		ru		os		=	pc+ru(os_legacy)
-  *		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)
+! model		=	geometry
+  *		ben		basic		=	pc+in(ben)

+  *		ben		probhat		=	pc+in(ben_probhat)

+  *		dev		basic		=	pc+in(deva)

+  *		dvorak		$dvoraklayouts		=	pc+%v(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)

+  *		dzdwi		basic		=	pc+bt(basic)

+  *		fi		basic		=	pc+fi(classic)

+  *		ge		azerty_tskapo		=	pc+fr(geo)

+  *		guj		basic		=	pc+in(guj)

+  *		gur		basic		=	pc+in(guru)

+  *		ie		laptop		=	pc+ie(basic)

+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)

+  *		il		si1452		=	pc+ie(basic)

+  *		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)

+  *		ro		de		=	pc+ro(winkeys)

+  *		ro		us		=	pc+ro(std)

+  *		ro		academic		=	pc+ro(std)

+  *		ro		std_comma		=	pc+ro(std)

+  *		ro		comma		=	pc+ro(basic)

+  *		ru		os		=	pc+ru(os_legacy)

+  *		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)

   classmate	us		intl		=	pc+us(classmate-intl)
   classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
   classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
 
-! model		layout				=	symbols
-  *		ar			=	pc+ara
-  *		ben			=	pc+in(ben)
-  *		bs			=	pc+ba
-  *		cs			=	pc+rs
-  *		cz_qwerty			=	pc+cz(qwerty)
-  *		dev			=	pc+in(deva)
-  *		dvorak			=	pc+us(dvorak)
-  *		dzdwi			=	pc+bt
-  *		el			=	pc+gr
-  *		en_US			=	pc+latin
-  *		guj			=	pc+in(guj)
-  *		gur			=	pc+in(guru)
-  *		iu			=	pc+ca(ike)
-  *		lo			=	pc+la
-  *		kan			=	pc+in(kan)
-  *		mi			=	pc+mao
-  *		ml			=	pc+in(mal)
-  *		ogham			=	pc+ie(ogam)
-  *		ori			=	pc+ie(ori)
-  *		sapmi			=	pc+no(smi)
-  *		sr			=	pc+srp
-  *		syr			=	pc+sy(syc)
-  *		tel			=	pc+in(tel)
-  *		tml			=	pc+in(tam)
-  *		yu			=	pc+srp
-  *		fr-latin9			=	pc+fr(latin9)
-  *		us_intl			=	pc+us(alt-intl)
-  *		ben(basic)			=	pc+in(ben)
-  *		ben(probhat)			=	pc+in(ben_probhat)
-  *		dev(basic)			=	pc+in(deva)
-  *		dvorak($dvoraklayouts)			=	pc+%v(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)
-  *		dzdwi(basic)			=	pc+bt(basic)
-  *		fi(basic)			=	pc+fi(classic)
-  *		ge(azerty_tskapo)			=	pc+fr(geo)
-  *		guj(basic)			=	pc+in(guj)
-  *		gur(basic)			=	pc+in(guru)
-  *		ie(laptop)			=	pc+ie(basic)
-  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
-  *		il(si1452)			=	pc+ie(basic)
-  *		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)
-  *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std)
-  *		ro(academic)			=	pc+ro(std)
-  *		ro(std_comma)			=	pc+ro(std)
-  *		ro(comma)			=	pc+ro(basic)
-  *		ru(os)			=	pc+ru(os_legacy)
-  *		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)
+! model		layout		variant		=	symbols
+  *		ar			=	pc+ara

+  *		ben			=	pc+in(ben)

+  *		bs			=	pc+ba

+  *		cs			=	pc+rs

+  *		cz_qwerty			=	pc+cz(qwerty)

+  *		dev			=	pc+in(deva)

+  *		dvorak			=	pc+us(dvorak)

+  *		dzdwi			=	pc+bt

+  *		el			=	pc+gr

+  *		en_US			=	pc+latin

+  *		guj			=	pc+in(guj)

+  *		gur			=	pc+in(guru)

+  *		iu			=	pc+ca(ike)

+  *		lo			=	pc+la

+  *		kan			=	pc+in(kan)

+  *		mi			=	pc+mao

+  *		ml			=	pc+in(mal)

+  *		ogham			=	pc+ie(ogam)

+  *		ori			=	pc+ie(ori)

+  *		sapmi			=	pc+no(smi)

+  *		sr			=	pc+srp

+  *		syr			=	pc+sy(syc)

+  *		tel			=	pc+in(tel)

+  *		tml			=	pc+in(tam)

+  *		yu			=	pc+srp

+  *		fr-latin9			=	pc+fr(latin9)

+  *		us_intl			=	pc+us(alt-intl)

+  *		ben(basic)			=	pc+in(ben)

+  *		ben(probhat)			=	pc+in(ben_probhat)

+  *		dev(basic)			=	pc+in(deva)

+  *		dvorak($dvoraklayouts)			=	pc+%v(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)

+  *		dzdwi(basic)			=	pc+bt(basic)

+  *		fi(basic)			=	pc+fi(classic)

+  *		ge(azerty_tskapo)			=	pc+fr(geo)

+  *		guj(basic)			=	pc+in(guj)

+  *		gur(basic)			=	pc+in(guru)

+  *		ie(laptop)			=	pc+ie(basic)

+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)

+  *		il(si1452)			=	pc+ie(basic)

+  *		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)

+  *		ro(de)			=	pc+ro(winkeys)

+  *		ro(us)			=	pc+ro(std)

+  *		ro(academic)			=	pc+ro(std)

+  *		ro(std_comma)			=	pc+ro(std)

+  *		ro(comma)			=	pc+ro(basic)

+  *		ru(os)			=	pc+ru(os_legacy)

+  *		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)

   ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
   ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
   amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
@@ -309,81 +304,81 @@
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
 
-! model		layout[1]			=	symbols
-  *		ar			=	pc+ara%(v[1])
-  *		ben			=	pc+in(ben)%(v[1])
-  *		bs			=	pc+ba%(v[1])
-  *		cs			=	pc+rs%(v[1])
-  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
-  *		dev			=	pc+in(deva)%(v[1])
-  *		dvorak			=	pc+us(dvorak)%(v[1])
-  *		dzdwi			=	pc+bt%(v[1])
-  *		el			=	pc+gr%(v[1])
-  *		en_US			=	pc+latin%(v[1])
-  *		guj			=	pc+in(guj)%(v[1])
-  *		gur			=	pc+in(guru)%(v[1])
-  *		iu			=	pc+ca(ike)%(v[1])
-  *		lo			=	pc+la%(v[1])
-  *		kan			=	pc+in(kan)%(v[1])
-  *		mi			=	pc+mao%(v[1])
-  *		ml			=	pc+in(mal)%(v[1])
-  *		ogham			=	pc+ie(ogam)%(v[1])
-  *		ori			=	pc+ie(ori)%(v[1])
-  *		sapmi			=	pc+no(smi)%(v[1])
-  *		sr			=	pc+srp%(v[1])
-  *		syr			=	pc+sy(syc)%(v[1])
-  *		tel			=	pc+in(tel)%(v[1])
-  *		tml			=	pc+in(tam)%(v[1])
-  *		yu			=	pc+srp%(v[1])
-  *		fr-latin9			=	pc+fr(latin9)%(v[1])
-  *		us_intl			=	pc+us(alt-intl)%(v[1])
-  *		ben(basic)			=	pc+in(ben)
-  *		ben(probhat)			=	pc+in(ben_probhat)
-  *		dev(basic)			=	pc+in(deva)
-  *		dvorak($dvoraklayouts)			=	pc+%v(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)
-  *		dzdwi(basic)			=	pc+bt(basic)
-  *		fi(basic)			=	pc+fi(classic)
-  *		ge(azerty_tskapo)			=	pc+fr(geo)
-  *		guj(basic)			=	pc+in(guj)
-  *		gur(basic)			=	pc+in(guru)
-  *		ie(laptop)			=	pc+ie(basic)
-  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
-  *		il(si1452)			=	pc+ie(basic)
-  *		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)
-  *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std)
-  *		ro(academic)			=	pc+ro(std)
-  *		ro(std_comma)			=	pc+ro(std)
-  *		ro(comma)			=	pc+ro(basic)
-  *		ru(os)			=	pc+ru(os_legacy)
-  *		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)
+! model		layout				=	symbols
+  *		ar			=	pc+ara%(v[1])

+  *		ben			=	pc+in(ben)%(v[1])

+  *		bs			=	pc+ba%(v[1])

+  *		cs			=	pc+rs%(v[1])

+  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])

+  *		dev			=	pc+in(deva)%(v[1])

+  *		dvorak			=	pc+us(dvorak)%(v[1])

+  *		dzdwi			=	pc+bt%(v[1])

+  *		el			=	pc+gr%(v[1])

+  *		en_US			=	pc+latin%(v[1])

+  *		guj			=	pc+in(guj)%(v[1])

+  *		gur			=	pc+in(guru)%(v[1])

+  *		iu			=	pc+ca(ike)%(v[1])

+  *		lo			=	pc+la%(v[1])

+  *		kan			=	pc+in(kan)%(v[1])

+  *		mi			=	pc+mao%(v[1])

+  *		ml			=	pc+in(mal)%(v[1])

+  *		ogham			=	pc+ie(ogam)%(v[1])

+  *		ori			=	pc+ie(ori)%(v[1])

+  *		sapmi			=	pc+no(smi)%(v[1])

+  *		sr			=	pc+srp%(v[1])

+  *		syr			=	pc+sy(syc)%(v[1])

+  *		tel			=	pc+in(tel)%(v[1])

+  *		tml			=	pc+in(tam)%(v[1])

+  *		yu			=	pc+srp%(v[1])

+  *		fr-latin9			=	pc+fr(latin9)%(v[1])

+  *		us_intl			=	pc+us(alt-intl)%(v[1])

+  *		ben(basic)			=	pc+in(ben)

+  *		ben(probhat)			=	pc+in(ben_probhat)

+  *		dev(basic)			=	pc+in(deva)

+  *		dvorak($dvoraklayouts)			=	pc+%v(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)

+  *		dzdwi(basic)			=	pc+bt(basic)

+  *		fi(basic)			=	pc+fi(classic)

+  *		ge(azerty_tskapo)			=	pc+fr(geo)

+  *		guj(basic)			=	pc+in(guj)

+  *		gur(basic)			=	pc+in(guru)

+  *		ie(laptop)			=	pc+ie(basic)

+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)

+  *		il(si1452)			=	pc+ie(basic)

+  *		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)

+  *		ro(de)			=	pc+ro(winkeys)

+  *		ro(us)			=	pc+ro(std)

+  *		ro(academic)			=	pc+ro(std)

+  *		ro(std_comma)			=	pc+ro(std)

+  *		ro(comma)			=	pc+ro(basic)

+  *		ru(os)			=	pc+ru(os_legacy)

+  *		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)

   ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
   sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
@@ -395,434 +390,434 @@
   thinkpad	br			=	pc+%l[1](thinkpad)
   *		*			=	pc+%l[1]%(v[1])
 
+! model		layout[1]			=	symbols
+  *		ben		basic		=	pc+in(ben)

+  *		ben		probhat		=	pc+in(ben_probhat)

+  *		dev		basic		=	pc+in(deva)

+  *		dvorak		$dvoraklayouts		=	pc+%v(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)

+  *		dzdwi		basic		=	pc+bt(basic)

+  *		fi		basic		=	pc+fi(classic)

+  *		ge		azerty_tskapo		=	pc+fr(geo)

+  *		guj		basic		=	pc+in(guj)

+  *		gur		basic		=	pc+in(guru)

+  *		ie		laptop		=	pc+ie(basic)

+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)

+  *		il		si1452		=	pc+ie(basic)

+  *		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)

+  *		ro		de		=	pc+ro(winkeys)

+  *		ro		us		=	pc+ro(std)

+  *		ro		academic		=	pc+ro(std)

+  *		ro		std_comma		=	pc+ro(std)

+  *		ro		comma		=	pc+ro(basic)

+  *		ru		os		=	pc+ru(os_legacy)

+  *		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)

+
 ! model		layout[1]	variant[1]	=	symbols
-  *		ben		basic		=	pc+in(ben)
-  *		ben		probhat		=	pc+in(ben_probhat)
-  *		dev		basic		=	pc+in(deva)
-  *		dvorak		$dvoraklayouts		=	pc+%v(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)
-  *		dzdwi		basic		=	pc+bt(basic)
-  *		fi		basic		=	pc+fi(classic)
-  *		ge		azerty_tskapo		=	pc+fr(geo)
-  *		guj		basic		=	pc+in(guj)
-  *		gur		basic		=	pc+in(guru)
-  *		ie		laptop		=	pc+ie(basic)
-  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
-  *		il		si1452		=	pc+ie(basic)
-  *		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)
-  *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std)
-  *		ro		academic		=	pc+ro(std)
-  *		ro		std_comma		=	pc+ro(std)
-  *		ro		comma		=	pc+ro(basic)
-  *		ru		os		=	pc+ru(os_legacy)
-  *		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)
+  ar		=	+ara%(v[2]):2

+  ben		=	+in(ben)%(v[2]):2

+  bs		=	+ba%(v[2]):2

+  cs		=	+rs%(v[2]):2

+  cz_qwerty		=	+cz(qwerty)%(v[2]):2

+  dev		=	+in(deva)%(v[2]):2

+  dvorak		=	+us(dvorak)%(v[2]):2

+  dzdwi		=	+bt%(v[2]):2

+  el		=	+gr%(v[2]):2

+  en_US		=	+latin%(v[2]):2

+  guj		=	+in(guj)%(v[2]):2

+  gur		=	+in(guru)%(v[2]):2

+  iu		=	+ca(ike)%(v[2]):2

+  lo		=	+la%(v[2]):2

+  kan		=	+in(kan)%(v[2]):2

+  mi		=	+mao%(v[2]):2

+  ml		=	+in(mal)%(v[2]):2

+  ogham		=	+ie(ogam)%(v[2]):2

+  ori		=	+ie(ori)%(v[2]):2

+  sapmi		=	+no(smi)%(v[2]):2

+  sr		=	+srp%(v[2]):2

+  syr		=	+sy(syc)%(v[2]):2

+  tel		=	+in(tel)%(v[2]):2

+  tml		=	+in(tam)%(v[2]):2

+  yu		=	+srp%(v[2]):2

+  fr-latin9		=	+fr(latin9)%(v[2]):2

+  us_intl		=	+us(alt-intl)%(v[2]):2

+  ben(basic)	=	+in(ben):2

+  ben(probhat)	=	+in(ben_probhat):2

+  dev(basic)	=	+in(deva):2

+  dvorak($dvoraklayouts)	=	+%v(dvorak):2

+  dvorak(basic)	=	+us(dvorak):2

+  dvorak(pl_basic)	=	+pl(dvorak):2

+  dvorak(pl)	=	+pl(dvorak_quotes):2

+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2

+  dzdwi(basic)	=	+bt(basic):2

+  fi(basic)	=	+fi(classic):2

+  ge(azerty_tskapo)	=	+fr(geo):2

+  guj(basic)	=	+in(guj):2

+  gur(basic)	=	+in(guru):2

+  ie(laptop)	=	+ie(basic):2

+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2

+  il(si1452)	=	+ie(basic):2

+  iu(basic)	=	+ca(ike):2

+  lo(basic)	=	+la(basic):2

+  kan(basic)	=	+in(kan):2

+  mal(basic)	=	+in(mal):2

+  mal(mlplusnum)	=	+in(mal):2

+  ogham(basic)	=	+ie(ogam):2

+  ogham(laptop)	=	+ie(ogam):2

+  ogham(is434)	=	+ie(ogam_is434):2

+  ogham(is434laptop)	=	+ie(ogam_is434):2

+  ori(basic)	=	+in(ori):2

+  ro(de)	=	+ro(winkeys):2

+  ro(us)	=	+ro(std):2

+  ro(academic)	=	+ro(std):2

+  ro(std_comma)	=	+ro(std):2

+  ro(comma)	=	+ro(basic):2

+  ru(os)	=	+ru(os_legacy):2

+  sapmi(basic)	=	+no(smi):2

+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2

+  sapmi(sefi)	=	+fi(smi):2

+  sin(phonetic-static)	=	+in(sin_phonetic):2

+  syr(basic)	=	+sy(syc):2

+  syr(phonetic)	=	+sy(syc_phonetic):2

+  tam(INSCRIPT)	=	+in(tam):2

+  tam(UNI)	=	+in(tam_unicode):2

+  tam(TAB)	=	+in(tam_TAB):2

+  tam(TSCII)	=	+in(tam_TSCII):2

+  tel(basic)	=	+in(tel):2

+  yu(basic)	=	+srp(latin):2

+  yu(unicode)	=	+srp(latinunicode):2

+  yu(yz)	=	+srp(latinyz):2

+  yu(unicodeyz)	=	+srp(latinunicodeyz):2

+  *		=	+%l[2]%(v[2]):2
 
 ! layout[2]	=	symbols
-  ar		=	+ara%(v[2]):2
-  ben		=	+in(ben)%(v[2]):2
-  bs		=	+ba%(v[2]):2
-  cs		=	+rs%(v[2]):2
-  cz_qwerty		=	+cz(qwerty)%(v[2]):2
-  dev		=	+in(deva)%(v[2]):2
-  dvorak		=	+us(dvorak)%(v[2]):2
-  dzdwi		=	+bt%(v[2]):2
-  el		=	+gr%(v[2]):2
-  en_US		=	+latin%(v[2]):2
-  guj		=	+in(guj)%(v[2]):2
-  gur		=	+in(guru)%(v[2]):2
-  iu		=	+ca(ike)%(v[2]):2
-  lo		=	+la%(v[2]):2
-  kan		=	+in(kan)%(v[2]):2
-  mi		=	+mao%(v[2]):2
-  ml		=	+in(mal)%(v[2]):2
-  ogham		=	+ie(ogam)%(v[2]):2
-  ori		=	+ie(ori)%(v[2]):2
-  sapmi		=	+no(smi)%(v[2]):2
-  sr		=	+srp%(v[2]):2
-  syr		=	+sy(syc)%(v[2]):2
-  tel		=	+in(tel)%(v[2]):2
-  tml		=	+in(tam)%(v[2]):2
-  yu		=	+srp%(v[2]):2
-  fr-latin9		=	+fr(latin9)%(v[2]):2
-  us_intl		=	+us(alt-intl)%(v[2]):2
-  ben(basic)	=	+in(ben):2
-  ben(probhat)	=	+in(ben_probhat):2
-  dev(basic)	=	+in(deva):2
-  dvorak($dvoraklayouts)	=	+%v(dvorak):2
-  dvorak(basic)	=	+us(dvorak):2
-  dvorak(pl_basic)	=	+pl(dvorak):2
-  dvorak(pl)	=	+pl(dvorak_quotes):2
-  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
-  dzdwi(basic)	=	+bt(basic):2
-  fi(basic)	=	+fi(classic):2
-  ge(azerty_tskapo)	=	+fr(geo):2
-  guj(basic)	=	+in(guj):2
-  gur(basic)	=	+in(guru):2
-  ie(laptop)	=	+ie(basic):2
-  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2
-  il(si1452)	=	+ie(basic):2
-  iu(basic)	=	+ca(ike):2
-  lo(basic)	=	+la(basic):2
-  kan(basic)	=	+in(kan):2
-  mal(basic)	=	+in(mal):2
-  mal(mlplusnum)	=	+in(mal):2
-  ogham(basic)	=	+ie(ogam):2
-  ogham(laptop)	=	+ie(ogam):2
-  ogham(is434)	=	+ie(ogam_is434):2
-  ogham(is434laptop)	=	+ie(ogam_is434):2
-  ori(basic)	=	+in(ori):2
-  ro(de)	=	+ro(winkeys):2
-  ro(us)	=	+ro(std):2
-  ro(academic)	=	+ro(std):2
-  ro(std_comma)	=	+ro(std):2
-  ro(comma)	=	+ro(basic):2
-  ru(os)	=	+ru(os_legacy):2
-  sapmi(basic)	=	+no(smi):2
-  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
-  sapmi(sefi)	=	+fi(smi):2
-  sin(phonetic-static)	=	+in(sin_phonetic):2
-  syr(basic)	=	+sy(syc):2
-  syr(phonetic)	=	+sy(syc_phonetic):2
-  tam(INSCRIPT)	=	+in(tam):2
-  tam(UNI)	=	+in(tam_unicode):2
-  tam(TAB)	=	+in(tam_TAB):2
-  tam(TSCII)	=	+in(tam_TSCII):2
-  tel(basic)	=	+in(tel):2
-  yu(basic)	=	+srp(latin):2
-  yu(unicode)	=	+srp(latinunicode):2
-  yu(yz)	=	+srp(latinyz):2
-  yu(unicodeyz)	=	+srp(latinunicodeyz):2
-  *		=	+%l[2]%(v[2]):2
+  ar		=	+ara%(v[3]):3

+  ben		=	+in(ben)%(v[3]):3

+  bs		=	+ba%(v[3]):3

+  cs		=	+rs%(v[3]):3

+  cz_qwerty		=	+cz(qwerty)%(v[3]):3

+  dev		=	+in(deva)%(v[3]):3

+  dvorak		=	+us(dvorak)%(v[3]):3

+  dzdwi		=	+bt%(v[3]):3

+  el		=	+gr%(v[3]):3

+  en_US		=	+latin%(v[3]):3

+  guj		=	+in(guj)%(v[3]):3

+  gur		=	+in(guru)%(v[3]):3

+  iu		=	+ca(ike)%(v[3]):3

+  lo		=	+la%(v[3]):3

+  kan		=	+in(kan)%(v[3]):3

+  mi		=	+mao%(v[3]):3

+  ml		=	+in(mal)%(v[3]):3

+  ogham		=	+ie(ogam)%(v[3]):3

+  ori		=	+ie(ori)%(v[3]):3

+  sapmi		=	+no(smi)%(v[3]):3

+  sr		=	+srp%(v[3]):3

+  syr		=	+sy(syc)%(v[3]):3

+  tel		=	+in(tel)%(v[3]):3

+  tml		=	+in(tam)%(v[3]):3

+  yu		=	+srp%(v[3]):3

+  fr-latin9		=	+fr(latin9)%(v[3]):3

+  us_intl		=	+us(alt-intl)%(v[3]):3

+  ben(basic)	=	+in(ben):3

+  ben(probhat)	=	+in(ben_probhat):3

+  dev(basic)	=	+in(deva):3

+  dvorak($dvoraklayouts)	=	+%v(dvorak):3

+  dvorak(basic)	=	+us(dvorak):3

+  dvorak(pl_basic)	=	+pl(dvorak):3

+  dvorak(pl)	=	+pl(dvorak_quotes):3

+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3

+  dzdwi(basic)	=	+bt(basic):3

+  fi(basic)	=	+fi(classic):3

+  ge(azerty_tskapo)	=	+fr(geo):3

+  guj(basic)	=	+in(guj):3

+  gur(basic)	=	+in(guru):3

+  ie(laptop)	=	+ie(basic):3

+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3

+  il(si1452)	=	+ie(basic):3

+  iu(basic)	=	+ca(ike):3

+  lo(basic)	=	+la(basic):3

+  kan(basic)	=	+in(kan):3

+  mal(basic)	=	+in(mal):3

+  mal(mlplusnum)	=	+in(mal):3

+  ogham(basic)	=	+ie(ogam):3

+  ogham(laptop)	=	+ie(ogam):3

+  ogham(is434)	=	+ie(ogam_is434):3

+  ogham(is434laptop)	=	+ie(ogam_is434):3

+  ori(basic)	=	+in(ori):3

+  ro(de)	=	+ro(winkeys):3

+  ro(us)	=	+ro(std):3

+  ro(academic)	=	+ro(std):3

+  ro(std_comma)	=	+ro(std):3

+  ro(comma)	=	+ro(basic):3

+  ru(os)	=	+ru(os_legacy):3

+  sapmi(basic)	=	+no(smi):3

+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3

+  sapmi(sefi)	=	+fi(smi):3

+  sin(phonetic-static)	=	+in(sin_phonetic):3

+  syr(basic)	=	+sy(syc):3

+  syr(phonetic)	=	+sy(syc_phonetic):3

+  tam(INSCRIPT)	=	+in(tam):3

+  tam(UNI)	=	+in(tam_unicode):3

+  tam(TAB)	=	+in(tam_TAB):3

+  tam(TSCII)	=	+in(tam_TSCII):3

+  tel(basic)	=	+in(tel):3

+  yu(basic)	=	+srp(latin):3

+  yu(unicode)	=	+srp(latinunicode):3

+  yu(yz)	=	+srp(latinyz):3

+  yu(unicodeyz)	=	+srp(latinunicodeyz):3

+  *		=	+%l[3]%(v[3]):3
 
 ! layout[3]	=	symbols
-  ar		=	+ara%(v[3]):3
-  ben		=	+in(ben)%(v[3]):3
-  bs		=	+ba%(v[3]):3
-  cs		=	+rs%(v[3]):3
-  cz_qwerty		=	+cz(qwerty)%(v[3]):3
-  dev		=	+in(deva)%(v[3]):3
-  dvorak		=	+us(dvorak)%(v[3]):3
-  dzdwi		=	+bt%(v[3]):3
-  el		=	+gr%(v[3]):3
-  en_US		=	+latin%(v[3]):3
-  guj		=	+in(guj)%(v[3]):3
-  gur		=	+in(guru)%(v[3]):3
-  iu		=	+ca(ike)%(v[3]):3
-  lo		=	+la%(v[3]):3
-  kan		=	+in(kan)%(v[3]):3
-  mi		=	+mao%(v[3]):3
-  ml		=	+in(mal)%(v[3]):3
-  ogham		=	+ie(ogam)%(v[3]):3
-  ori		=	+ie(ori)%(v[3]):3
-  sapmi		=	+no(smi)%(v[3]):3
-  sr		=	+srp%(v[3]):3
-  syr		=	+sy(syc)%(v[3]):3
-  tel		=	+in(tel)%(v[3]):3
-  tml		=	+in(tam)%(v[3]):3
-  yu		=	+srp%(v[3]):3
-  fr-latin9		=	+fr(latin9)%(v[3]):3
-  us_intl		=	+us(alt-intl)%(v[3]):3
-  ben(basic)	=	+in(ben):3
-  ben(probhat)	=	+in(ben_probhat):3
-  dev(basic)	=	+in(deva):3
-  dvorak($dvoraklayouts)	=	+%v(dvorak):3
-  dvorak(basic)	=	+us(dvorak):3
-  dvorak(pl_basic)	=	+pl(dvorak):3
-  dvorak(pl)	=	+pl(dvorak_quotes):3
-  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
-  dzdwi(basic)	=	+bt(basic):3
-  fi(basic)	=	+fi(classic):3
-  ge(azerty_tskapo)	=	+fr(geo):3
-  guj(basic)	=	+in(guj):3
-  gur(basic)	=	+in(guru):3
-  ie(laptop)	=	+ie(basic):3
-  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3
-  il(si1452)	=	+ie(basic):3
-  iu(basic)	=	+ca(ike):3
-  lo(basic)	=	+la(basic):3
-  kan(basic)	=	+in(kan):3
-  mal(basic)	=	+in(mal):3
-  mal(mlplusnum)	=	+in(mal):3
-  ogham(basic)	=	+ie(ogam):3
-  ogham(laptop)	=	+ie(ogam):3
-  ogham(is434)	=	+ie(ogam_is434):3
-  ogham(is434laptop)	=	+ie(ogam_is434):3
-  ori(basic)	=	+in(ori):3
-  ro(de)	=	+ro(winkeys):3
-  ro(us)	=	+ro(std):3
-  ro(academic)	=	+ro(std):3
-  ro(std_comma)	=	+ro(std):3
-  ro(comma)	=	+ro(basic):3
-  ru(os)	=	+ru(os_legacy):3
-  sapmi(basic)	=	+no(smi):3
-  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
-  sapmi(sefi)	=	+fi(smi):3
-  sin(phonetic-static)	=	+in(sin_phonetic):3
-  syr(basic)	=	+sy(syc):3
-  syr(phonetic)	=	+sy(syc_phonetic):3
-  tam(INSCRIPT)	=	+in(tam):3
-  tam(UNI)	=	+in(tam_unicode):3
-  tam(TAB)	=	+in(tam_TAB):3
-  tam(TSCII)	=	+in(tam_TSCII):3
-  tel(basic)	=	+in(tel):3
-  yu(basic)	=	+srp(latin):3
-  yu(unicode)	=	+srp(latinunicode):3
-  yu(yz)	=	+srp(latinyz):3
-  yu(unicodeyz)	=	+srp(latinunicodeyz):3
-  *		=	+%l[3]%(v[3]):3
+  ar		=	+ara%(v[4]):4

+  ben		=	+in(ben)%(v[4]):4

+  bs		=	+ba%(v[4]):4

+  cs		=	+rs%(v[4]):4

+  cz_qwerty		=	+cz(qwerty)%(v[4]):4

+  dev		=	+in(deva)%(v[4]):4

+  dvorak		=	+us(dvorak)%(v[4]):4

+  dzdwi		=	+bt%(v[4]):4

+  el		=	+gr%(v[4]):4

+  en_US		=	+latin%(v[4]):4

+  guj		=	+in(guj)%(v[4]):4

+  gur		=	+in(guru)%(v[4]):4

+  iu		=	+ca(ike)%(v[4]):4

+  lo		=	+la%(v[4]):4

+  kan		=	+in(kan)%(v[4]):4

+  mi		=	+mao%(v[4]):4

+  ml		=	+in(mal)%(v[4]):4

+  ogham		=	+ie(ogam)%(v[4]):4

+  ori		=	+ie(ori)%(v[4]):4

+  sapmi		=	+no(smi)%(v[4]):4

+  sr		=	+srp%(v[4]):4

+  syr		=	+sy(syc)%(v[4]):4

+  tel		=	+in(tel)%(v[4]):4

+  tml		=	+in(tam)%(v[4]):4

+  yu		=	+srp%(v[4]):4

+  fr-latin9		=	+fr(latin9)%(v[4]):4

+  us_intl		=	+us(alt-intl)%(v[4]):4

+  ben(basic)	=	+in(ben):4

+  ben(probhat)	=	+in(ben_probhat):4

+  dev(basic)	=	+in(deva):4

+  dvorak($dvoraklayouts)	=	+%v(dvorak):4

+  dvorak(basic)	=	+us(dvorak):4

+  dvorak(pl_basic)	=	+pl(dvorak):4

+  dvorak(pl)	=	+pl(dvorak_quotes):4

+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4

+  dzdwi(basic)	=	+bt(basic):4

+  fi(basic)	=	+fi(classic):4

+  ge(azerty_tskapo)	=	+fr(geo):4

+  guj(basic)	=	+in(guj):4

+  gur(basic)	=	+in(guru):4

+  ie(laptop)	=	+ie(basic):4

+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4

+  il(si1452)	=	+ie(basic):4

+  iu(basic)	=	+ca(ike):4

+  lo(basic)	=	+la(basic):4

+  kan(basic)	=	+in(kan):4

+  mal(basic)	=	+in(mal):4

+  mal(mlplusnum)	=	+in(mal):4

+  ogham(basic)	=	+ie(ogam):4

+  ogham(laptop)	=	+ie(ogam):4

+  ogham(is434)	=	+ie(ogam_is434):4

+  ogham(is434laptop)	=	+ie(ogam_is434):4

+  ori(basic)	=	+in(ori):4

+  ro(de)	=	+ro(winkeys):4

+  ro(us)	=	+ro(std):4

+  ro(academic)	=	+ro(std):4

+  ro(std_comma)	=	+ro(std):4

+  ro(comma)	=	+ro(basic):4

+  ru(os)	=	+ru(os_legacy):4

+  sapmi(basic)	=	+no(smi):4

+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4

+  sapmi(sefi)	=	+fi(smi):4

+  sin(phonetic-static)	=	+in(sin_phonetic):4

+  syr(basic)	=	+sy(syc):4

+  syr(phonetic)	=	+sy(syc_phonetic):4

+  tam(INSCRIPT)	=	+in(tam):4

+  tam(UNI)	=	+in(tam_unicode):4

+  tam(TAB)	=	+in(tam_TAB):4

+  tam(TSCII)	=	+in(tam_TSCII):4

+  tel(basic)	=	+in(tel):4

+  yu(basic)	=	+srp(latin):4

+  yu(unicode)	=	+srp(latinunicode):4

+  yu(yz)	=	+srp(latinyz):4

+  yu(unicodeyz)	=	+srp(latinunicodeyz):4

+  *		=	+%l[4]%(v[4]):4
 
 ! layout[4]	=	symbols
-  ar		=	+ara%(v[4]):4
-  ben		=	+in(ben)%(v[4]):4
-  bs		=	+ba%(v[4]):4
-  cs		=	+rs%(v[4]):4
-  cz_qwerty		=	+cz(qwerty)%(v[4]):4
-  dev		=	+in(deva)%(v[4]):4
-  dvorak		=	+us(dvorak)%(v[4]):4
-  dzdwi		=	+bt%(v[4]):4
-  el		=	+gr%(v[4]):4
-  en_US		=	+latin%(v[4]):4
-  guj		=	+in(guj)%(v[4]):4
-  gur		=	+in(guru)%(v[4]):4
-  iu		=	+ca(ike)%(v[4]):4
-  lo		=	+la%(v[4]):4
-  kan		=	+in(kan)%(v[4]):4
-  mi		=	+mao%(v[4]):4
-  ml		=	+in(mal)%(v[4]):4
-  ogham		=	+ie(ogam)%(v[4]):4
-  ori		=	+ie(ori)%(v[4]):4
-  sapmi		=	+no(smi)%(v[4]):4
-  sr		=	+srp%(v[4]):4
-  syr		=	+sy(syc)%(v[4]):4
-  tel		=	+in(tel)%(v[4]):4
-  tml		=	+in(tam)%(v[4]):4
-  yu		=	+srp%(v[4]):4
-  fr-latin9		=	+fr(latin9)%(v[4]):4
-  us_intl		=	+us(alt-intl)%(v[4]):4
-  ben(basic)	=	+in(ben):4
-  ben(probhat)	=	+in(ben_probhat):4
-  dev(basic)	=	+in(deva):4
-  dvorak($dvoraklayouts)	=	+%v(dvorak):4
-  dvorak(basic)	=	+us(dvorak):4
-  dvorak(pl_basic)	=	+pl(dvorak):4
-  dvorak(pl)	=	+pl(dvorak_quotes):4
-  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
-  dzdwi(basic)	=	+bt(basic):4
-  fi(basic)	=	+fi(classic):4
-  ge(azerty_tskapo)	=	+fr(geo):4
-  guj(basic)	=	+in(guj):4
-  gur(basic)	=	+in(guru):4
-  ie(laptop)	=	+ie(basic):4
-  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4
-  il(si1452)	=	+ie(basic):4
-  iu(basic)	=	+ca(ike):4
-  lo(basic)	=	+la(basic):4
-  kan(basic)	=	+in(kan):4
-  mal(basic)	=	+in(mal):4
-  mal(mlplusnum)	=	+in(mal):4
-  ogham(basic)	=	+ie(ogam):4
-  ogham(laptop)	=	+ie(ogam):4
-  ogham(is434)	=	+ie(ogam_is434):4
-  ogham(is434laptop)	=	+ie(ogam_is434):4
-  ori(basic)	=	+in(ori):4
-  ro(de)	=	+ro(winkeys):4
-  ro(us)	=	+ro(std):4
-  ro(academic)	=	+ro(std):4
-  ro(std_comma)	=	+ro(std):4
-  ro(comma)	=	+ro(basic):4
-  ru(os)	=	+ru(os_legacy):4
-  sapmi(basic)	=	+no(smi):4
-  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
-  sapmi(sefi)	=	+fi(smi):4
-  sin(phonetic-static)	=	+in(sin_phonetic):4
-  syr(basic)	=	+sy(syc):4
-  syr(phonetic)	=	+sy(syc_phonetic):4
-  tam(INSCRIPT)	=	+in(tam):4
-  tam(UNI)	=	+in(tam_unicode):4
-  tam(TAB)	=	+in(tam_TAB):4
-  tam(TSCII)	=	+in(tam_TSCII):4
-  tel(basic)	=	+in(tel):4
-  yu(basic)	=	+srp(latin):4
-  yu(unicode)	=	+srp(latinunicode):4
-  yu(yz)	=	+srp(latinyz):4
-  yu(unicodeyz)	=	+srp(latinunicodeyz):4
-  *		=	+%l[4]%(v[4]):4
+  ben		basic	=	+in(ben):2

+  ben		probhat	=	+in(ben_probhat):2

+  dev		basic	=	+in(deva):2

+  dvorak		$dvoraklayouts	=	+%v(dvorak):2

+  dvorak		basic	=	+us(dvorak):2

+  dvorak		pl_basic	=	+pl(dvorak):2

+  dvorak		pl	=	+pl(dvorak_quotes):2

+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2

+  dzdwi		basic	=	+bt(basic):2

+  fi		basic	=	+fi(classic):2

+  ge		azerty_tskapo	=	+fr(geo):2

+  guj		basic	=	+in(guj):2

+  gur		basic	=	+in(guru):2

+  ie		laptop	=	+ie(basic):2

+  ie		CloGaelachLaptop	=	+ie(CloGaelach):2

+  il		si1452	=	+ie(basic):2

+  iu		basic	=	+ca(ike):2

+  lo		basic	=	+la(basic):2

+  kan		basic	=	+in(kan):2

+  mal		basic	=	+in(mal):2

+  mal		mlplusnum	=	+in(mal):2

+  ogham		basic	=	+ie(ogam):2

+  ogham		laptop	=	+ie(ogam):2

+  ogham		is434	=	+ie(ogam_is434):2

+  ogham		is434laptop	=	+ie(ogam_is434):2

+  ori		basic	=	+in(ori):2

+  ro		de	=	+ro(winkeys):2

+  ro		us	=	+ro(std):2

+  ro		academic	=	+ro(std):2

+  ro		std_comma	=	+ro(std):2

+  ro		comma	=	+ro(basic):2

+  ru		os	=	+ru(os_legacy):2

+  sapmi		basic	=	+no(smi):2

+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2

+  sapmi		sefi	=	+fi(smi):2

+  sin		phonetic-static	=	+in(sin_phonetic):2

+  syr		basic	=	+sy(syc):2

+  syr		phonetic	=	+sy(syc_phonetic):2

+  tam		INSCRIPT	=	+in(tam):2

+  tam		UNI	=	+in(tam_unicode):2

+  tam		TAB	=	+in(tam_TAB):2

+  tam		TSCII	=	+in(tam_TSCII):2

+  tel		basic	=	+in(tel):2

+  yu		basic	=	+srp(latin):2

+  yu		unicode	=	+srp(latinunicode):2

+  yu		yz	=	+srp(latinyz):2

+  yu		unicodeyz	=	+srp(latinunicodeyz):2

 
 ! layout[2]	variant[2]	=	symbols
-  ben		basic	=	+in(ben):2
-  ben		probhat	=	+in(ben_probhat):2
-  dev		basic	=	+in(deva):2
-  dvorak		$dvoraklayouts	=	+%v(dvorak):2
-  dvorak		basic	=	+us(dvorak):2
-  dvorak		pl_basic	=	+pl(dvorak):2
-  dvorak		pl	=	+pl(dvorak_quotes):2
-  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
-  dzdwi		basic	=	+bt(basic):2
-  fi		basic	=	+fi(classic):2
-  ge		azerty_tskapo	=	+fr(geo):2
-  guj		basic	=	+in(guj):2
-  gur		basic	=	+in(guru):2
-  ie		laptop	=	+ie(basic):2
-  ie		CloGaelachLaptop	=	+ie(CloGaelach):2
-  il		si1452	=	+ie(basic):2
-  iu		basic	=	+ca(ike):2
-  lo		basic	=	+la(basic):2
-  kan		basic	=	+in(kan):2
-  mal		basic	=	+in(mal):2
-  mal		mlplusnum	=	+in(mal):2
-  ogham		basic	=	+ie(ogam):2
-  ogham		laptop	=	+ie(ogam):2
-  ogham		is434	=	+ie(ogam_is434):2
-  ogham		is434laptop	=	+ie(ogam_is434):2
-  ori		basic	=	+in(ori):2
-  ro		de	=	+ro(winkeys):2
-  ro		us	=	+ro(std):2
-  ro		academic	=	+ro(std):2
-  ro		std_comma	=	+ro(std):2
-  ro		comma	=	+ro(basic):2
-  ru		os	=	+ru(os_legacy):2
-  sapmi		basic	=	+no(smi):2
-  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
-  sapmi		sefi	=	+fi(smi):2
-  sin		phonetic-static	=	+in(sin_phonetic):2
-  syr		basic	=	+sy(syc):2
-  syr		phonetic	=	+sy(syc_phonetic):2
-  tam		INSCRIPT	=	+in(tam):2
-  tam		UNI	=	+in(tam_unicode):2
-  tam		TAB	=	+in(tam_TAB):2
-  tam		TSCII	=	+in(tam_TSCII):2
-  tel		basic	=	+in(tel):2
-  yu		basic	=	+srp(latin):2
-  yu		unicode	=	+srp(latinunicode):2
-  yu		yz	=	+srp(latinyz):2
-  yu		unicodeyz	=	+srp(latinunicodeyz):2
+  ben		basic	=	+in(ben):3

+  ben		probhat	=	+in(ben_probhat):3

+  dev		basic	=	+in(deva):3

+  dvorak		$dvoraklayouts	=	+%v(dvorak):3

+  dvorak		basic	=	+us(dvorak):3

+  dvorak		pl_basic	=	+pl(dvorak):3

+  dvorak		pl	=	+pl(dvorak_quotes):3

+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3

+  dzdwi		basic	=	+bt(basic):3

+  fi		basic	=	+fi(classic):3

+  ge		azerty_tskapo	=	+fr(geo):3

+  guj		basic	=	+in(guj):3

+  gur		basic	=	+in(guru):3

+  ie		laptop	=	+ie(basic):3

+  ie		CloGaelachLaptop	=	+ie(CloGaelach):3

+  il		si1452	=	+ie(basic):3

+  iu		basic	=	+ca(ike):3

+  lo		basic	=	+la(basic):3

+  kan		basic	=	+in(kan):3

+  mal		basic	=	+in(mal):3

+  mal		mlplusnum	=	+in(mal):3

+  ogham		basic	=	+ie(ogam):3

+  ogham		laptop	=	+ie(ogam):3

+  ogham		is434	=	+ie(ogam_is434):3

+  ogham		is434laptop	=	+ie(ogam_is434):3

+  ori		basic	=	+in(ori):3

+  ro		de	=	+ro(winkeys):3

+  ro		us	=	+ro(std):3

+  ro		academic	=	+ro(std):3

+  ro		std_comma	=	+ro(std):3

+  ro		comma	=	+ro(basic):3

+  ru		os	=	+ru(os_legacy):3

+  sapmi		basic	=	+no(smi):3

+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3

+  sapmi		sefi	=	+fi(smi):3

+  sin		phonetic-static	=	+in(sin_phonetic):3

+  syr		basic	=	+sy(syc):3

+  syr		phonetic	=	+sy(syc_phonetic):3

+  tam		INSCRIPT	=	+in(tam):3

+  tam		UNI	=	+in(tam_unicode):3

+  tam		TAB	=	+in(tam_TAB):3

+  tam		TSCII	=	+in(tam_TSCII):3

+  tel		basic	=	+in(tel):3

+  yu		basic	=	+srp(latin):3

+  yu		unicode	=	+srp(latinunicode):3

+  yu		yz	=	+srp(latinyz):3

+  yu		unicodeyz	=	+srp(latinunicodeyz):3

 
 ! layout[3]	variant[3]	=	symbols
-  ben		basic	=	+in(ben):3
-  ben		probhat	=	+in(ben_probhat):3
-  dev		basic	=	+in(deva):3
-  dvorak		$dvoraklayouts	=	+%v(dvorak):3
-  dvorak		basic	=	+us(dvorak):3
-  dvorak		pl_basic	=	+pl(dvorak):3
-  dvorak		pl	=	+pl(dvorak_quotes):3
-  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
-  dzdwi		basic	=	+bt(basic):3
-  fi		basic	=	+fi(classic):3
-  ge		azerty_tskapo	=	+fr(geo):3
-  guj		basic	=	+in(guj):3
-  gur		basic	=	+in(guru):3
-  ie		laptop	=	+ie(basic):3
-  ie		CloGaelachLaptop	=	+ie(CloGaelach):3
-  il		si1452	=	+ie(basic):3
-  iu		basic	=	+ca(ike):3
-  lo		basic	=	+la(basic):3
-  kan		basic	=	+in(kan):3
-  mal		basic	=	+in(mal):3
-  mal		mlplusnum	=	+in(mal):3
-  ogham		basic	=	+ie(ogam):3
-  ogham		laptop	=	+ie(ogam):3
-  ogham		is434	=	+ie(ogam_is434):3
-  ogham		is434laptop	=	+ie(ogam_is434):3
-  ori		basic	=	+in(ori):3
-  ro		de	=	+ro(winkeys):3
-  ro		us	=	+ro(std):3
-  ro		academic	=	+ro(std):3
-  ro		std_comma	=	+ro(std):3
-  ro		comma	=	+ro(basic):3
-  ru		os	=	+ru(os_legacy):3
-  sapmi		basic	=	+no(smi):3
-  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
-  sapmi		sefi	=	+fi(smi):3
-  sin		phonetic-static	=	+in(sin_phonetic):3
-  syr		basic	=	+sy(syc):3
-  syr		phonetic	=	+sy(syc_phonetic):3
-  tam		INSCRIPT	=	+in(tam):3
-  tam		UNI	=	+in(tam_unicode):3
-  tam		TAB	=	+in(tam_TAB):3
-  tam		TSCII	=	+in(tam_TSCII):3
-  tel		basic	=	+in(tel):3
-  yu		basic	=	+srp(latin):3
-  yu		unicode	=	+srp(latinunicode):3
-  yu		yz	=	+srp(latinyz):3
-  yu		unicodeyz	=	+srp(latinunicodeyz):3
+  ben		basic	=	+in(ben):4

+  ben		probhat	=	+in(ben_probhat):4

+  dev		basic	=	+in(deva):4

+  dvorak		$dvoraklayouts	=	+%v(dvorak):4

+  dvorak		basic	=	+us(dvorak):4

+  dvorak		pl_basic	=	+pl(dvorak):4

+  dvorak		pl	=	+pl(dvorak_quotes):4

+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4

+  dzdwi		basic	=	+bt(basic):4

+  fi		basic	=	+fi(classic):4

+  ge		azerty_tskapo	=	+fr(geo):4

+  guj		basic	=	+in(guj):4

+  gur		basic	=	+in(guru):4

+  ie		laptop	=	+ie(basic):4

+  ie		CloGaelachLaptop	=	+ie(CloGaelach):4

+  il		si1452	=	+ie(basic):4

+  iu		basic	=	+ca(ike):4

+  lo		basic	=	+la(basic):4

+  kan		basic	=	+in(kan):4

+  mal		basic	=	+in(mal):4

+  mal		mlplusnum	=	+in(mal):4

+  ogham		basic	=	+ie(ogam):4

+  ogham		laptop	=	+ie(ogam):4

+  ogham		is434	=	+ie(ogam_is434):4

+  ogham		is434laptop	=	+ie(ogam_is434):4

+  ori		basic	=	+in(ori):4

+  ro		de	=	+ro(winkeys):4

+  ro		us	=	+ro(std):4

+  ro		academic	=	+ro(std):4

+  ro		std_comma	=	+ro(std):4

+  ro		comma	=	+ro(basic):4

+  ru		os	=	+ru(os_legacy):4

+  sapmi		basic	=	+no(smi):4

+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4

+  sapmi		sefi	=	+fi(smi):4

+  sin		phonetic-static	=	+in(sin_phonetic):4

+  syr		basic	=	+sy(syc):4

+  syr		phonetic	=	+sy(syc_phonetic):4

+  tam		INSCRIPT	=	+in(tam):4

+  tam		UNI	=	+in(tam_unicode):4

+  tam		TAB	=	+in(tam_TAB):4

+  tam		TSCII	=	+in(tam_TSCII):4

+  tel		basic	=	+in(tel):4

+  yu		basic	=	+srp(latin):4

+  yu		unicode	=	+srp(latinunicode):4

+  yu		yz	=	+srp(latinyz):4

+  yu		unicodeyz	=	+srp(latinunicodeyz):4

 
 ! layout[4]	variant[4]	=	symbols
-  ben		basic	=	+in(ben):4
-  ben		probhat	=	+in(ben_probhat):4
-  dev		basic	=	+in(deva):4
-  dvorak		$dvoraklayouts	=	+%v(dvorak):4
-  dvorak		basic	=	+us(dvorak):4
-  dvorak		pl_basic	=	+pl(dvorak):4
-  dvorak		pl	=	+pl(dvorak_quotes):4
-  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
-  dzdwi		basic	=	+bt(basic):4
-  fi		basic	=	+fi(classic):4
-  ge		azerty_tskapo	=	+fr(geo):4
-  guj		basic	=	+in(guj):4
-  gur		basic	=	+in(guru):4
-  ie		laptop	=	+ie(basic):4
-  ie		CloGaelachLaptop	=	+ie(CloGaelach):4
-  il		si1452	=	+ie(basic):4
-  iu		basic	=	+ca(ike):4
-  lo		basic	=	+la(basic):4
-  kan		basic	=	+in(kan):4
-  mal		basic	=	+in(mal):4
-  mal		mlplusnum	=	+in(mal):4
-  ogham		basic	=	+ie(ogam):4
-  ogham		laptop	=	+ie(ogam):4
-  ogham		is434	=	+ie(ogam_is434):4
-  ogham		is434laptop	=	+ie(ogam_is434):4
-  ori		basic	=	+in(ori):4
-  ro		de	=	+ro(winkeys):4
-  ro		us	=	+ro(std):4
-  ro		academic	=	+ro(std):4
-  ro		std_comma	=	+ro(std):4
-  ro		comma	=	+ro(basic):4
-  ru		os	=	+ru(os_legacy):4
-  sapmi		basic	=	+no(smi):4
-  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
-  sapmi		sefi	=	+fi(smi):4
-  sin		phonetic-static	=	+in(sin_phonetic):4
-  syr		basic	=	+sy(syc):4
-  syr		phonetic	=	+sy(syc_phonetic):4
-  tam		INSCRIPT	=	+in(tam):4
-  tam		UNI	=	+in(tam_unicode):4
-  tam		TAB	=	+in(tam_TAB):4
-  tam		TSCII	=	+in(tam_TSCII):4
-  tel		basic	=	+in(tel):4
-  yu		basic	=	+srp(latin):4
-  yu		unicode	=	+srp(latinunicode):4
-  yu		yz	=	+srp(latinyz):4
-  yu		unicodeyz	=	+srp(latinunicodeyz):4
-
-! model		=	symbols
   benqx730      =       +inet(benqx)
   benqx800      =       +inet(benqx)
   dellsk8125    =       +inet(dell)
@@ -853,35 +848,32 @@
   $macs	        =       +inet(apple)
   thinkpadz60   =       +inet(thinkpad60)
 
-! model		layout		=	compat
+! model		=	symbols
   pc98		nec_vndr/jp	=	pc98(basic)
   *		jp		=	complete+japan
   olpc         *               =       olpc
   *		*		=	complete
 
-! model		layout[1]	=	compat
+! model		layout		=	compat
   *		*		=	complete
 
-! model		=	types
+! model		layout[1]	=	compat
   $macs		=	complete+numpad(mac)
   *		=	complete
 
-! layout	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
-
-! layout[1]	option	=	symbols
+! model		=	types
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
 
-! layout[2]	option	=	symbols
+! layout	option	=	symbols
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
 
-! layout[3]	option	=	symbols
+! layout[1]	option	=	symbols
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
 
-! layout[4]	option	=	symbols
+! layout[2]	option	=	symbols
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
 
-! option	=	symbols
+! layout[3]	option	=	symbols
   grp:shift_toggle	=	+group(shifts_toggle)
   altwin:menu		=	+altwin(menu)
   altwin:meta_alt	=	+altwin(meta_alt)
@@ -975,7 +967,7 @@
   shift:breaks_caps     =	+shift(breaks_caps)
 
 
-! option	=	compat
+! layout[4]	option	=	symbols
   grp_led:num		=	+lednum(group_lock)
   grp_led:caps		=	+ledcaps(group_lock)
   grp_led:scroll	=	+ledscroll(group_lock)
@@ -983,7 +975,7 @@
   japan:kana_lock	=	+japan(kana_lock)
 
 
-! option	=	types
+! option	=	symbols
   caps:internal			=	+caps(internal)
   caps:internal_nocancel	=	+caps(internal_nocancel)
   caps:shift			=	+caps(shift)