aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkbdata.src')
-rw-r--r--xorg-server/xkbdata.src/compat/makefile25
-rw-r--r--xorg-server/xkbdata.src/geometry/digital_vndr/makefile14
-rw-r--r--xorg-server/xkbdata.src/geometry/makefile26
-rw-r--r--xorg-server/xkbdata.src/geometry/sgi_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/keycodes/digital_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/keycodes/makefile8
-rw-r--r--xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/keymap/digital_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/keymap/makefile12
-rw-r--r--xorg-server/xkbdata.src/keymap/sgi_vndr/makefile23
-rw-r--r--xorg-server/xkbdata.src/keymap/sun_vndr/makefile18
-rw-r--r--xorg-server/xkbdata.src/makefile2
-rw-r--r--xorg-server/xkbdata.src/rules/base1256
-rw-r--r--xorg-server/xkbdata.src/rules/base.lst1352
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ln_s.sh18
-rw-r--r--xorg-server/xkbdata.src/rules/compat/lnv_s.sh14
-rw-r--r--xorg-server/xkbdata.src/rules/compat/makefile47
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1_s.sh15
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh11
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml_s.sh15
-rw-r--r--xorg-server/xkbdata.src/rules/compat/mlv_s.sh12
-rw-r--r--xorg-server/xkbdata.src/rules/evdev1256
-rw-r--r--xorg-server/xkbdata.src/rules/makefile109
-rw-r--r--xorg-server/xkbdata.src/rules/merge.py13
-rw-r--r--xorg-server/xkbdata.src/symbols/digital_vndr/makefile16
-rw-r--r--xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/symbols/hp_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile19
-rw-r--r--xorg-server/xkbdata.src/symbols/makefile144
-rw-r--r--xorg-server/xkbdata.src/symbols/nec_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/symbols/sgi_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/symbols/sony_vndr/makefile15
-rw-r--r--xorg-server/xkbdata.src/symbols/sun_vndr/makefile20
-rw-r--r--xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile15
34 files changed, 2420 insertions, 2175 deletions
diff --git a/xorg-server/xkbdata.src/compat/makefile b/xorg-server/xkbdata.src/compat/makefile
index 0598a1fd9..729d5b3b3 100644
--- a/xorg-server/xkbdata.src/compat/makefile
+++ b/xorg-server/xkbdata.src/compat/makefile
@@ -9,24 +9,13 @@ $(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
dist_xkbdata_compat_DATA = \
- accessx \
- basic \
- complete \
- default \
- iso9995 \
- japan \
- keypad \
- ledcaps \
- lednum \
- ledscroll \
- misc \
- mousekeys \
- norepeat \
- pc \
- pc98 \
- README \
- xfree86 \
- xtest
+accessx basic complete \
+default iso9995 \
+japan keypad ledcaps \
+lednum ledscroll level5 \
+misc mousekeys norepeat \
+olpc pc pc98 xfree86 \
+xtest README
DATA_FILES=$(dist_xkbdata_compat_DATA:%=$(DESTDIR)\%)
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/makefile b/xorg-server/xkbdata.src/geometry/digital_vndr/makefile
new file mode 100644
index 000000000..2137e8bf4
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/makefile
@@ -0,0 +1,14 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\digital_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_geom_DATA = \
+lk pc unix
+
+DATA_FILES=$(dist_geom_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/geometry/makefile b/xorg-server/xkbdata.src/geometry/makefile
index 0c8e83bfb..ac936737d 100644
--- a/xorg-server/xkbdata.src/geometry/makefile
+++ b/xorg-server/xkbdata.src/geometry/makefile
@@ -9,28 +9,16 @@ $(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
dist_xkbdata_geometry_DATA = \
- amiga \
- ataritt \
- chicony \
- dell \
- everex \
- fujitsu \
- hp \
- keytronic \
- kinesis \
- macintosh \
- microsoft \
- nec \
- northgate \
- pc \
- README \
- sony \
- sun \
- winbook
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec \
+northgate pc sony thinkpad \
+sun winbook README
DATA_FILES=$(dist_xkbdata_geometry_DATA:%=$(DESTDIR)\%)
-SUBDIRS = digital ibm sgi
+SUBDIRS = digital_vndr sgi_vndr
load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile b/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile
new file mode 100644
index 000000000..9d6380343
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\sgi_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_geom_DATA = \
+indigo indy O2
+
+DATA_FILES=$(dist_geom_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile b/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile
new file mode 100644
index 000000000..a39b83aa2
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\digital_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_keycodes_DATA = \
+lk pc
+
+DATA_FILES=$(dist_keycodes_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keycodes/makefile b/xorg-server/xkbdata.src/keycodes/makefile
index 880881042..bf48f22ef 100644
--- a/xorg-server/xkbdata.src/keycodes/makefile
+++ b/xorg-server/xkbdata.src/keycodes/makefile
@@ -8,22 +8,22 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
$(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-SUBDIRS = digital sgi
+SUBDIRS = digital_vndr sgi_vndr
dist_xkbdata_keycodes_DATA = \
aliases \
amiga \
ataritt \
+ evdev \
fujitsu \
hp \
ibm \
macintosh \
- powerpcps2 \
- README \
sony \
sun \
xfree86 \
- xfree98
+ xfree98 \
+ README
DATA_FILES=$(dist_xkbdata_keycodes_DATA:%=$(DESTDIR)\%)
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile b/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile
new file mode 100644
index 000000000..6c4251ec1
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\sgi_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_keycodes_DATA = \
+indigo indy iris
+
+DATA_FILES=$(dist_keycodes_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/makefile b/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
new file mode 100644
index 000000000..25750c711
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\digital_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_keymap_DATA = \
+us
+
+DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/makefile b/xorg-server/xkbdata.src/keymap/makefile
index 0cb723e11..888dae43a 100644
--- a/xorg-server/xkbdata.src/keymap/makefile
+++ b/xorg-server/xkbdata.src/keymap/makefile
@@ -8,16 +8,12 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
$(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-SUBDIRS = sun digital sgi
+SUBDIRS = digital_vndr sgi_vndr sun_vndr
dist_xkbdata_keymap_DATA = \
- amiga \
- ataritt \
- macintosh \
- README \
- sony \
- xfree86 \
- xfree98
+amiga ataritt macintosh \
+sony xfree86 xfree98 \
+README
DATA_FILES=$(dist_xkbdata_keymap_DATA:%=$(DESTDIR)\%)
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
new file mode 100644
index 000000000..e424b3f54
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
@@ -0,0 +1,23 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sgi_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_keymap_DATA = \
+be bg ca \
+ch cz de \
+dk dvorak \
+es fi \
+fr gb \
+hu it jp \
+no pl pt \
+ru se sk \
+th us
+
+DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
new file mode 100644
index 000000000..640bcd881
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
@@ -0,0 +1,18 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sun_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_keymap_DATA = \
+all de es fi \
+fr no pl \
+ru se uk \
+us
+
+DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/makefile b/xorg-server/xkbdata.src/makefile
index 1e3855fa4..94c550947 100644
--- a/xorg-server/xkbdata.src/makefile
+++ b/xorg-server/xkbdata.src/makefile
@@ -2,7 +2,7 @@ ifeq ($(MAKESERVER),1)
$(error Please do not specify MAKESERVER=1)
endif
-SUBDIRS = semantics keycodes keymap compat geometry torture symbols rules types
+SUBDIRS = compat geometry keycodes keymap rules semantics symbols types
load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
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)
diff --git a/xorg-server/xkbdata.src/rules/base.lst b/xorg-server/xkbdata.src/rules/base.lst
index 17742b8e6..4986c4dc4 100644
--- a/xorg-server/xkbdata.src/rules/base.lst
+++ b/xorg-server/xkbdata.src/rules/base.lst
@@ -1,683 +1,683 @@
! model
- pc101 Generic 101-key PC
- pc102 Generic 102-key (Intl) PC
- pc104 Generic 104-key PC
- pc105 Generic 105-key (Intl) PC
- dell101 Dell 101-key PC
- latitude Dell Latitude series laptop
- dellm65 Dell Precision M65
- everex Everex STEPnote
- flexpro Keytronic FlexPro
- microsoft Microsoft Natural
- omnikey101 Northgate OmniKey 101
- winbook Winbook Model XP5
- jp106 Japanese 106-key
- pc98 PC-98xx Series
- a4techKB21 A4Tech KB-21
- a4techKBS8 A4Tech KBS-8
- a4_rfkb23 A4Tech Wireless Desktop RFKB-23
- abnt2 Brazilian ABNT2
- airkey Acer AirKey V
- acpi ACPI Standard
- azonaRF2300 Azona RF2300 wireless Internet Keyboard
- scorpius Advance Scorpius KI
- brother Brother Internet Keyboard
- btc5113rf BTC 5113RF Multimedia
- btc5126t BTC 5126T
- btc6301urf BTC 6301URF
- btc9000 BTC 9000
- btc9000a BTC 9000A
- btc9001ah BTC 9001AH
- btc5090 BTC 5090
- btc9019u BTC 9019U
- cherryblue Cherry Blue Line CyBo@rd
- cherryblueb Cherry CyMotion Master XPress
- cherrybluea Cherry Blue Line CyBo@rd (alternate option)
- cherrycyboard Cherry CyBo@rd USB-Hub
- chicony Chicony Internet Keyboard
- chicony0108 Chicony KU-0108
- chicony9885 Chicony KB-9885
- compaqeak8 Compaq Easy Access Keyboard
- compaqik7 Compaq Internet Keyboard (7 keys)
- compaqik13 Compaq Internet Keyboard (13 keys)
- compaqik18 Compaq Internet Keyboard (18 keys)
- cymotionlinux Cherry CyMotion Master Linux
- armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
- presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard
- ipaq Compaq iPaq Keyboard
- dell Dell
- dellsk8125 Dell SK-8125
- dellsk8135 Dell SK-8135
- dellusbmm Dell USB Multimedia Keyboard
- inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx
- precision_m Dell Laptop/notebook Precision M series
- dexxa Dexxa Wireless Desktop Keyboard
- diamond Diamond 9801 / 9802 series
- dtk2000 DTK2000
- ennyah_dkb1008 Ennyah DKB-1008
- fscaa1667g Fujitsu-Siemens Computers AMILO A1667G laptop
- genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
- geniuscomfy Genius Comfy KB-12e
- geniuscomfy2 Genius Comfy KB-21e-Scroll
- geniuskb19e Genius KB-19e NB
- gyration Gyration
- logitech_base Logitech Generic Keyboard
- logitech_g15 Logitech G15 extra keys via G15daemon
- hpi6 Hewlett-Packard Internet Keyboard
- hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard
- hp2505 Hewlett-Packard SK-2505 Internet Keyboard
- hpxe3gc Hewlett-Packard Omnibook XE3 GC
- hpxe3gf Hewlett-Packard Omnibook XE3 GF
- hpxt1000 Hewlett-Packard Omnibook XT1000
- hpzt11xx Hewlett-Packard Pavilion ZT11xx
- hp500fa Hewlett-Packard Omnibook 500 FA
- hp5xx Hewlett-Packard Omnibook 5xx
- hp5181 Hewlett-Packard Internet Keyboard 5181
- hp5185 Hewlett-Packard Internet Keyboard 5185
- hpnx9020 Hewlett-Packard nx9020
- hp6000 Hewlett-Packard Omnibook 6000/6100
- honeywell_euroboard Honeywell Euroboard
- rapidaccess IBM Rapid Access
- rapidaccess2 IBM Rapid Access II
- rapidaccess2a IBM Rapid Access II (alternate option)
- thinkpad IBM ThinkPad 560Z/600/600E/A22E
- thinkpadintl IBM ThinkPad 560Z/600/600E/A22E, Intl
- thinkpad60 IBM ThinkPad R60/T60/R61/T61
- thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t
- ibm_spacesaver IBM Space Saver
- logiaccess Logitech Access Keyboard
- logiclx300 Logitech Cordless Desktop LX-300
- logii350 Logitech Internet 350 Keyboard
- logimel Logitech Media Elite Keyboard
- logicd Logitech Cordless Desktop
- logicd_it Logitech Cordless Desktop iTouch
- logicd_nav Logitech Cordless Desktop Navigator
- logicd_opt Logitech Cordless Desktop Optical
- logicda Logitech Cordless Desktop (alternate option)
- logicdpa2 Logitech Cordless Desktop Pro (alternate option2)
- logicfn Logitech Cordless Freedom/Desktop Navigator
- logicdn Logitech Cordless Desktop Navigator
- logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
- logiik Logitech Internet Keyboard
- itouch Logitech iTouch
- logicink Logitech Internet Navigator Keyboard
- logiex110 Logitech Cordless Desktop EX110
- logiinkse Logitech iTouch Internet Navigator Keyboard SE
- logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB)
- logiultrax Logitech Ultra-X Keyboard
- logiultraxc Logitech Ultra-X Cordless Media Desktop Keyboard
- logidinovo Logitech diNovo Keyboard
- logidinovoedge Logitech diNovo Edge Keyboard
- mx1998 Memorex MX1998
- mx2500 Memorex MX2500 EZ-Access Keyboard
- mx2750 Memorex MX2750
- microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000
- microsoftinet Microsoft Internet Keyboard
- microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
- microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
- microsoftprooem Microsoft Natural Keyboard Pro OEM
- vsonku306 ViewSonic KU-306 Internet Keyboard
- microsoftprose Microsoft Internet Keyboard Pro, Swedish
- microsoftoffice Microsoft Office Keyboard
- microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A
- microsoftelite Microsoft Natural Keyboard Elite
- oretec Ortek MCK-800 MM/Internet keyboard
- propeller Propeller Voyager (KTEZ-1000)
- qtronix QTronix Scorpius 98N+
- samsung4500 Samsung SDM 4500P
- samsung4510 Samsung SDM 4510P
- sk1300 SK-1300
- sk2500 SK-2500
- sk6200 SK-6200
- sk7100 SK-7100
- sp_inet Super Power Multimedia Keyboard
- sven SVEN Ergonomic 2500
- sven303 SVEN Slim 303
- symplon Symplon PaceBook (tablet PC)
- toshiba_s3000 Toshiba Satellite S3000
- trust Trust Wireless Keyboard Classic
- trustda Trust Direct Access Keyboard
- yahoo Yahoo! Internet Keyboard
- macbook78 MacBook/MacBook Pro
- macbook79 MacBook/MacBook Pro (Intl)
- macintosh Macintosh
- macintosh_old Macintosh Old
- macintosh_hhk Happy Hacking Keyboard for Mac
- acer_c300 Acer C300
- acer_ferrari4k Acer Ferrari 4000
- acer_laptop Acer Laptop
- asus_laptop Asus Laptop
- apple Apple
- apple_laptop Apple Laptop
- silvercrest SILVERCREST Multimedia Wireless Keyboard
- emachines Laptop/notebook eMachines m68xx
- kr106 Korean 106-key
- evdev Evdev-managed keyboard
- benqx BenQ X-Touch
- benqx730 BenQ X-Touch 730
- benqx800 BenQ X-Touch 800
- hhk Happy Hacking Keyboard
- classmate Classmate PC
- olpc OLPC
- sun6 Sun Type 5/6
+ pc101
+ pc102
+ pc104
+ pc105
+ dell101
+ latitude
+ dellm65
+ everex
+ flexpro
+ microsoft
+ omnikey101
+ winbook
+ jp106
+ pc98
+ a4techKB21
+ a4techKBS8
+ a4_rfkb23
+ abnt2
+ airkey
+ acpi
+ azonaRF2300
+ scorpius
+ brother
+ btc5113rf
+ btc5126t
+ btc6301urf
+ btc9000
+ btc9000a
+ btc9001ah
+ btc5090
+ btc9019u
+ cherryblue
+ cherryblueb
+ cherrybluea
+ cherrycyboard
+ chicony
+ chicony0108
+ chicony9885
+ compaqeak8
+ compaqik7
+ compaqik13
+ compaqik18
+ cymotionlinux
+ armada
+ presario
+ ipaq
+ dell
+ dellsk8125
+ dellsk8135
+ dellusbmm
+ inspiron
+ precision_m
+ dexxa
+ diamond
+ dtk2000
+ ennyah_dkb1008
+ fscaa1667g
+ genius
+ geniuscomfy
+ geniuscomfy2
+ geniuskb19e
+ gyration
+ logitech_base
+ logitech_g15
+ hpi6
+ hp2501
+ hp2505
+ hpxe3gc
+ hpxe3gf
+ hpxt1000
+ hpzt11xx
+ hp500fa
+ hp5xx
+ hp5181
+ hp5185
+ hpnx9020
+ hp6000
+ honeywell_euroboard
+ rapidaccess
+ rapidaccess2
+ rapidaccess2a
+ thinkpad
+ thinkpadintl
+ thinkpad60
+ thinkpadz60
+ ibm_spacesaver
+ logiaccess
+ logiclx300
+ logii350
+ logimel
+ logicd
+ logicd_it
+ logicd_nav
+ logicd_opt
+ logicda
+ logicdpa2
+ logicfn
+ logicdn
+ logiitc
+ logiik
+ itouch
+ logicink
+ logiex110
+ logiinkse
+ logiinkseusb
+ logiultrax
+ logiultraxc
+ logidinovo
+ logidinovoedge
+ mx1998
+ mx2500
+ mx2750
+ microsoft7000
+ microsoftinet
+ microsoftpro
+ microsoftprousb
+ microsoftprooem
+ vsonku306
+ microsoftprose
+ microsoftoffice
+ microsoftmult
+ microsoftelite
+ oretec
+ propeller
+ qtronix
+ samsung4500
+ samsung4510
+ sk1300
+ sk2500
+ sk6200
+ sk7100
+ sp_inet
+ sven
+ sven303
+ symplon
+ toshiba_s3000
+ trust
+ trustda
+ yahoo
+ macbook78
+ macbook79
+ macintosh
+ macintosh_old
+ macintosh_hhk
+ acer_c300
+ acer_ferrari4k
+ acer_laptop
+ asus_laptop
+ apple
+ apple_laptop
+ silvercrest
+ emachines
+ kr106
+ evdev
+ benqx
+ benqx730
+ benqx800
+ hhk
+ classmate
+ olpc
+ sun6
! layout
- us USA
- ad Andorra
- af Afghanistan
- ara Arabic
- al Albania
- am Armenia
- az Azerbaijan
- by Belarus
- be Belgium
- bd Bangladesh
- in India
- ba Bosnia and Herzegovina
- br Brazil
- bg Bulgaria
- ma Morocco
- mm Myanmar
- ca Canada
- cd Congo, Democratic Republic of the
- cn China
- hr Croatia
- cz Czechia
- dk Denmark
- nl Netherlands
- bt Bhutan
- ee Estonia
- ir Iran
- iq Iraq
- fo Faroe Islands
- fi Finland
- fr France
- gh Ghana
- gn Guinea
- ge Georgia
- de Germany
- gr Greece
- hu Hungary
- is Iceland
- il Israel
- it Italy
- jp Japan
- kg Kyrgyzstan
- kh Cambodia
- kz Kazakhstan
- la Laos
- latam Latin American
- lt Lithuania
- lv Latvia
- mao Maori
- me Montenegro
- mk Macedonia
- mt Malta
- mn Mongolia
- no Norway
- pl Poland
- pt Portugal
- ro Romania
- ru Russia
- rs Serbia
- si Slovenia
- sk Slovakia
- es Spain
- se Sweden
- ch Switzerland
- sy Syria
- tj Tajikistan
- lk Sri Lanka
- th Thailand
- tr Turkey
- ua Ukraine
- gb United Kingdom
- uz Uzbekistan
- vn Vietnam
- kr Korea, Republic of
- nec_vndr/jp Japan (PC-98xx Series)
- ie Ireland
- pk Pakistan
- mv Maldives
- za South Africa
- epo Esperanto
- np Nepal
- ng Nigeria
- et Ethiopia
- braille Braille
+ us
+ ad
+ af
+ ara
+ al
+ am
+ az
+ by
+ be
+ bd
+ in
+ ba
+ br
+ bg
+ ma
+ mm
+ ca
+ cd
+ cn
+ hr
+ cz
+ dk
+ nl
+ bt
+ ee
+ ir
+ iq
+ fo
+ fi
+ fr
+ gh
+ gn
+ ge
+ de
+ gr
+ hu
+ is
+ il
+ it
+ jp
+ kg
+ kh
+ kz
+ la
+ latam
+ lt
+ lv
+ mao
+ me
+ mk
+ mt
+ mn
+ no
+ pl
+ pt
+ ro
+ ru
+ rs
+ si
+ sk
+ es
+ se
+ ch
+ sy
+ tj
+ lk
+ th
+ tr
+ ua
+ gb
+ uz
+ vn
+ kr
+ nec_vndr/jp
+ ie
+ pk
+ mv
+ za
+ epo
+ np
+ ng
+ et
+ braille
! variant
- chr us: Cherokee
- euro us: With EuroSign on 5
- intl us: International (with dead keys)
- alt-intl us: Alternative international (former us_intl)
- colemak us: Colemak
- dvorak us: Dvorak
- dvorak-intl us: Dvorak international
- dvorak-l us: Left handed Dvorak
- dvorak-r us: Right handed Dvorak
- dvorak-classic us: Classic Dvorak
- dvp us: Programmer Dvorak
- rus us: Russian phonetic
- mac us: Macintosh
- altgr-intl us: International (AltGr dead keys)
- olpc2 us: Group toggle on multiply/divide key
- ps af: Pashto
- uz af: Southern Uzbek
- olpc-ps af: OLPC Pashto
- olpc-fa af: OLPC Dari
- olpc-uz af: OLPC Southern Uzbek
- azerty ara: azerty
- azerty_digits ara: azerty/digits
- digits ara: digits
- qwerty ara: qwerty
- qwerty_digits ara: qwerty/digits
- buckwalter ara: Buckwalter
- phonetic am: Phonetic
- phonetic-alt am: Alternative Phonetic
- eastern am: Eastern
- western am: Western
- eastern-alt am: Alternative Eastern
- cyrillic az: Cyrillic
- winkeys by: Winkeys
- latin by: Latin
- iso-alternate be: ISO Alternate
- nodeadkeys be: Eliminate dead keys
- sundeadkeys be: Sun dead keys
- wang be: Wang model 724 azerty
- probhat bd: Probhat
- ben in: Bengali
- ben_probhat in: Bengali Probhat
- guj in: Gujarati
- guru in: Gurmukhi
- jhelum in: Gurmukhi Jhelum
- kan in: Kannada
- mal in: Malayalam
- mal_lalitha in: Malayalam Lalitha
- ori in: Oriya
- tam_unicode in: Tamil Unicode
- tam_TAB in: Tamil TAB Typewriter
- tam_TSCII in: Tamil TSCII Typewriter
- tam in: Tamil
- tel in: Telugu
- urd in: Urdu
- bolnagri in: Hindi Bolnagri
- alternatequotes ba: Use guillemets for quotes
- unicode ba: Use Bosnian digraphs
- unicodeus ba: US keyboard with Bosnian digraphs
- us ba: US keyboard with Bosnian letters
- nodeadkeys br: Eliminate dead keys
- dvorak br: Dvorak
- nativo br: Nativo
- nativo-us br: Nativo for USA keyboards
- nativo-epo br: Nativo for Esperanto
- phonetic bg: Phonetic
- french ma: French
- tifinagh ma: Tifinagh
- tifinagh-alt ma: Tifinagh Alternative
- tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic
- tifinagh-extended ma: Tifinagh Extended
- tifinagh-phonetic ma: Tifinagh Phonetic
- tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic
- fr-dvorak ca: French Dvorak
- fr-legacy ca: French (legacy)
- multix ca: Multilingual
- multi ca: Multilingual, first part
- multi-2gr ca: Multilingual, second part
- ike ca: Inuktitut
- shs ca: Secwepemctsin
- kut ca: Ktunaxa
- tib cn: Tibetan
- tib_asciinum cn: Tibetan (with ASCII numerals)
- alternatequotes hr: Use guillemets for quotes
- unicode hr: Use Croatian digraphs
- unicodeus hr: US keyboard with Croatian digraphs
- us hr: US keyboard with Croatian letters
- bksl cz: With <\|> key
- qwerty cz: qwerty
- qwerty_bksl cz: qwerty, extended Backslash
- ucw cz: UCW layout (accented letters only)
- nodeadkeys dk: Eliminate dead keys
- mac dk: Macintosh
- mac_nodeadkeys dk: Macintosh, eliminate dead keys
- dvorak dk: Dvorak
- sundeadkeys nl: Sun dead keys
- mac nl: Macintosh
- std nl: Standard
- nodeadkeys ee: Eliminate dead keys
- dvorak ee: Dvorak
- us ee: US keyboard with Estonian letters
- pro ir: Pro
- keypad ir: Keypad
- pro_keypad ir: Pro Keypad
- ku ir: Kurdish, Latin Q
- ku_f ir: Kurdish, (F)
- ku_alt ir: Kurdish, Latin Alt-Q
- ku_ara ir: Kurdish, Arabic-Latin
- ku iq: Kurdish, Latin Q
- ku_f iq: Kurdish, (F)
- ku_alt iq: Kurdish, Latin Alt-Q
- ku_ara iq: Kurdish, Arabic-Latin
- nodeadkeys fo: Eliminate dead keys
- nodeadkeys fi: Eliminate dead keys
- smi fi: Northern Saami
- classic fi: Classic
- mac fi: Macintosh
- nodeadkeys fr: Eliminate dead keys
- sundeadkeys fr: Sun dead keys
- oss fr: Alternative
- oss_latin9 fr: Alternative, latin-9 only
- oss_nodeadkeys fr: Alternative, eliminate dead keys
- oss_sundeadkeys fr: Alternative, Sun dead keys
- latin9 fr: (Legacy) Alternative
- latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
- latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
- bepo fr: Bepo, ergonomic, Dvorak way
- bepo_latin9 fr: Bepo, ergonomic, Dvorak way, latin-9 only
- dvorak fr: Dvorak
- mac fr: Macintosh
- geo fr: Georgian AZERTY Tskapo
- generic gh: Multilingual
- akan gh: Akan
- ewe gh: Ewe
- fula gh: Fula
- ga gh: Ga
- hausa gh: Hausa
- ergonomic ge: Ergonomic
- mess ge: MESS
- ru ge: Russian
- os ge: Ossetian
- deadacute de: Dead acute
- deadgraveacute de: Dead grave acute
- nodeadkeys de: Eliminate dead keys
- ro de: Romanian keyboard with German letters
- ro_nodeadkeys de: Romanian keyboard with German letters, eliminate dead keys
- dvorak de: Dvorak
- sundeadkeys de: Sun dead keys
- neo de: Neostyle
- mac de: Macintosh
- mac_nodeadkeys de: Macintosh, eliminate dead keys
- simple gr: Simple
- extended gr: Extended
- nodeadkeys gr: Eliminate dead keys
- polytonic gr: Polytonic
- standard hu: Standard
- nodeadkeys hu: Eliminate dead keys
- qwerty hu: qwerty
- 101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
- 101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
- 101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
- 101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
- 101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
- 101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
- 101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
- 101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
- 102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
- 102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
- 102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
- 102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
- 102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
- 102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
- 102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
- 102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
- Sundeadkeys is: Sun dead keys
- nodeadkeys is: Eliminate dead keys
- mac is: Macintosh
- dvorak is: Dvorak
- lyx il: lyx
- phonetic il: Phonetic
- biblical il: Biblical Hebrew (Tiro)
- nodeadkeys it: Eliminate dead keys
- mac it: Macintosh
- geo it: Georgian
- kana jp: Kana
- OADG109A jp: OADG 109A
- ruskaz kz: Russian with Kazakh
- kazrus kz: Kazakh with Russian
- nodeadkeys latam: Eliminate dead keys
- sundeadkeys latam: Sun dead keys
- std lt: Standard
- us lt: US keyboard with Lithuanian letters
- ibm lt: IBM (LST 1205-92)
- lekp lt: LEKP
- lekpa lt: LEKPa
- balticplus lt: Baltic+
- apostrophe lv: Apostrophe (') variant
- tilde lv: Tilde (~) variant
- fkey lv: F-letter (F) variant
- cyrillic me: Cyrillic
- cyrillicyz me: Cyrillic, Z and ZHE swapped
- latinunicode me: Latin unicode
- latinyz me: Latin qwerty
- latinunicodeyz me: Latin unicode qwerty
- cyrillicalternatequotes me: Cyrillic with guillemets
- latinalternatequotes me: Latin with guillemets
- nodeadkeys mk: Eliminate dead keys
- us mt: Maltese keyboard with US layout
- nodeadkeys no: Eliminate dead keys
- dvorak no: Dvorak
- smi no: Northern Saami
- smi_nodeadkeys no: Northern Saami, eliminate dead keys
- mac no: Macintosh
- mac_nodeadkeys no: Macintosh, eliminate dead keys
- qwertz pl: qwertz
- dvorak pl: Dvorak
- dvorak_quotes pl: Dvorak, Polish quotes on quotemark key
- dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
- csb pl: Kashubian
- ru_phonetic_dvorak pl: Russian phonetic Dvorak
- nodeadkeys pt: Eliminate dead keys
- sundeadkeys pt: Sun dead keys
- mac pt: Macintosh
- mac_nodeadkeys pt: Macintosh, eliminate dead keys
- mac_sundeadkeys pt: Macintosh, Sun dead keys
- nativo pt: Nativo
- nativo-us pt: Nativo for USA keyboards
- nativo-epo pt: Nativo for Esperanto
- cedilla ro: Cedilla
- std ro: Standard
- std_cedilla ro: Standard (Cedilla)
- winkeys ro: Winkeys
- phonetic ru: Phonetic
- typewriter ru: Typewriter
- legacy ru: Legacy
- tt ru: Tatar
- os_legacy ru: Ossetian, legacy
- os_winkeys ru: Ossetian, Winkeys
- cv ru: Chuvash
- cv_latin ru: Chuvash Latin
- udm ru: Udmurt
- kom ru: Komi
- sah ru: Yakut
- yz rs: Z and ZHE swapped
- latin rs: Latin
- latinunicode rs: Latin Unicode
- latinyz rs: Latin qwerty
- latinunicodeyz rs: Latin Unicode qwerty
- alternatequotes rs: With guillemets
- latinalternatequotes rs: Latin with guillemets
- alternatequotes si: Use guillemets for quotes
- unicode si: Use Slovenian digraphs
- unicodeus si: US keyboard with Slovenian digraphs
- us si: US keyboard with Slovenian letters
- bksl sk: Extended Backslash
- qwerty sk: qwerty
- qwerty_bksl sk: qwerty, extended Backslash
- nodeadkeys es: Eliminate dead keys
- sundeadkeys es: Sun dead keys
- dvorak es: Dvorak
- ast es: Asturian variant with bottom-dot H and bottom-dot L
- cat es: Catalan variant with middle-dot L
- mac es: Macintosh
- nodeadkeys se: Eliminate dead keys
- dvorak se: Dvorak
- rus se: Russian phonetic
- rus_nodeadkeys se: Russian phonetic, eliminate dead keys
- smi se: Northern Saami
- mac se: Macintosh
- svdvorak se: Svdvorak
- de_nodeadkeys ch: German, eliminate dead keys
- de_sundeadkeys ch: German, Sun dead keys
- fr ch: French
- fr_nodeadkeys ch: French, eliminate dead keys
- fr_sundeadkeys ch: French, Sun dead keys
- fr_mac ch: French (Macintosh)
- de_mac ch: German (Macintosh)
- syc sy: Syriac
- syc_phonetic sy: Syriac phonetic
- ku sy: Kurdish, Latin Q
- ku_f sy: Kurdish, (F)
- ku_alt sy: Kurdish, Latin Alt-Q
- tam_unicode lk: Tamil Unicode
- tam_TAB lk: Tamil TAB Typewriter
- tis th: TIS-820.2538
- pat th: Pattachote
- f tr: (F)
- alt tr: Alt-Q
- sundeadkeys tr: Sun dead keys
- ku tr: Kurdish, Latin Q
- ku_f tr: Kurdish, (F)
- ku_alt tr: Kurdish, Latin Alt-Q
- intl tr: International (with dead keys)
- phonetic ua: Phonetic
- typewriter ua: Typewriter
- winkeys ua: Winkeys
- unicode ua: Unicode
- rstu ua: Standard RSTU
- rstu_ru ua: Standard RSTU on Russian layout
- homophonic ua: Homophonic
- intl gb: International (with dead keys)
- dvorak gb: Dvorak
- dvorakukp gb: Dvorak (UK Punctuation)
- mac gb: Macintosh
- colemak gb: Colemak
- latin uz: Latin
- kr104 kr: 101/104 key Compatible
- CloGaelach ie: CloGaelach
- UnicodeExpert ie: UnicodeExpert
- ogam ie: Ogham
- ogam_is434 ie: Ogham IS434
- ara pk: Arabic
- legacy epo: displaced semicolon and quote (obsolete)
- igbo ng: Igbo
- yoruba ng: Yoruba
- hausa ng: Hausa
- left_hand braille: Left hand
- right_hand braille: Right hand
+ chr us:
+ euro us:
+ intl us:
+ alt-intl us:
+ colemak us:
+ dvorak us:
+ dvorak-intl us:
+ dvorak-l us:
+ dvorak-r us:
+ dvorak-classic us:
+ dvp us:
+ rus us:
+ mac us:
+ altgr-intl us:
+ olpc2 us:
+ ps af:
+ uz af:
+ olpc-ps af:
+ olpc-fa af:
+ olpc-uz af:
+ azerty ara:
+ azerty_digits ara:
+ digits ara:
+ qwerty ara:
+ qwerty_digits ara:
+ buckwalter ara:
+ phonetic am:
+ phonetic-alt am:
+ eastern am:
+ western am:
+ eastern-alt am:
+ cyrillic az:
+ winkeys by:
+ latin by:
+ iso-alternate be:
+ nodeadkeys be:
+ sundeadkeys be:
+ wang be:
+ probhat bd:
+ ben in:
+ ben_probhat in:
+ guj in:
+ guru in:
+ jhelum in:
+ kan in:
+ mal in:
+ mal_lalitha in:
+ ori in:
+ tam_unicode in:
+ tam_TAB in:
+ tam_TSCII in:
+ tam in:
+ tel in:
+ urd in:
+ bolnagri in:
+ alternatequotes ba:
+ unicode ba:
+ unicodeus ba:
+ us ba:
+ nodeadkeys br:
+ dvorak br:
+ nativo br:
+ nativo-us br:
+ nativo-epo br:
+ phonetic bg:
+ french ma:
+ tifinagh ma:
+ tifinagh-alt ma:
+ tifinagh-alt-phonetic ma:
+ tifinagh-extended ma:
+ tifinagh-phonetic ma:
+ tifinagh-extended-phonetic ma:
+ fr-dvorak ca:
+ fr-legacy ca:
+ multix ca:
+ multi ca:
+ multi-2gr ca:
+ ike ca:
+ shs ca:
+ kut ca:
+ tib cn:
+ tib_asciinum cn:
+ alternatequotes hr:
+ unicode hr:
+ unicodeus hr:
+ us hr:
+ bksl cz:
+ qwerty cz:
+ qwerty_bksl cz:
+ ucw cz:
+ nodeadkeys dk:
+ mac dk:
+ mac_nodeadkeys dk:
+ dvorak dk:
+ sundeadkeys nl:
+ mac nl:
+ std nl:
+ nodeadkeys ee:
+ dvorak ee:
+ us ee:
+ pro ir:
+ keypad ir:
+ pro_keypad ir:
+ ku ir:
+ ku_f ir:
+ ku_alt ir:
+ ku_ara ir:
+ ku iq:
+ ku_f iq:
+ ku_alt iq:
+ ku_ara iq:
+ nodeadkeys fo:
+ nodeadkeys fi:
+ smi fi:
+ classic fi:
+ mac fi:
+ nodeadkeys fr:
+ sundeadkeys fr:
+ oss fr:
+ oss_latin9 fr:
+ oss_nodeadkeys fr:
+ oss_sundeadkeys fr:
+ latin9 fr:
+ latin9_nodeadkeys fr:
+ latin9_sundeadkeys fr:
+ bepo fr:
+ bepo_latin9 fr:
+ dvorak fr:
+ mac fr:
+ geo fr:
+ generic gh:
+ akan gh:
+ ewe gh:
+ fula gh:
+ ga gh:
+ hausa gh:
+ ergonomic ge:
+ mess ge:
+ ru ge:
+ os ge:
+ deadacute de:
+ deadgraveacute de:
+ nodeadkeys de:
+ ro de:
+ ro_nodeadkeys de:
+ dvorak de:
+ sundeadkeys de:
+ neo de:
+ mac de:
+ mac_nodeadkeys de:
+ simple gr:
+ extended gr:
+ nodeadkeys gr:
+ polytonic gr:
+ standard hu:
+ nodeadkeys hu:
+ qwerty hu:
+ 101_qwertz_comma_dead hu:
+ 101_qwertz_comma_nodead hu:
+ 101_qwertz_dot_dead hu:
+ 101_qwertz_dot_nodead hu:
+ 101_qwerty_comma_dead hu:
+ 101_qwerty_comma_nodead hu:
+ 101_qwerty_dot_dead hu:
+ 101_qwerty_dot_nodead hu:
+ 102_qwertz_comma_dead hu:
+ 102_qwertz_comma_nodead hu:
+ 102_qwertz_dot_dead hu:
+ 102_qwertz_dot_nodead hu:
+ 102_qwerty_comma_dead hu:
+ 102_qwerty_comma_nodead hu:
+ 102_qwerty_dot_dead hu:
+ 102_qwerty_dot_nodead hu:
+ Sundeadkeys is:
+ nodeadkeys is:
+ mac is:
+ dvorak is:
+ lyx il:
+ phonetic il:
+ biblical il:
+ nodeadkeys it:
+ mac it:
+ geo it:
+ kana jp:
+ OADG109A jp:
+ ruskaz kz:
+ kazrus kz:
+ nodeadkeys latam:
+ sundeadkeys latam:
+ std lt:
+ us lt:
+ ibm lt:
+ lekp lt:
+ lekpa lt:
+ balticplus lt:
+ apostrophe lv:
+ tilde lv:
+ fkey lv:
+ cyrillic me:
+ cyrillicyz me:
+ latinunicode me:
+ latinyz me:
+ latinunicodeyz me:
+ cyrillicalternatequotes me:
+ latinalternatequotes me:
+ nodeadkeys mk:
+ us mt:
+ nodeadkeys no:
+ dvorak no:
+ smi no:
+ smi_nodeadkeys no:
+ mac no:
+ mac_nodeadkeys no:
+ qwertz pl:
+ dvorak pl:
+ dvorak_quotes pl:
+ dvorak_altquotes pl:
+ csb pl:
+ ru_phonetic_dvorak pl:
+ nodeadkeys pt:
+ sundeadkeys pt:
+ mac pt:
+ mac_nodeadkeys pt:
+ mac_sundeadkeys pt:
+ nativo pt:
+ nativo-us pt:
+ nativo-epo pt:
+ cedilla ro:
+ std ro:
+ std_cedilla ro:
+ winkeys ro:
+ phonetic ru:
+ typewriter ru:
+ legacy ru:
+ tt ru:
+ os_legacy ru:
+ os_winkeys ru:
+ cv ru:
+ cv_latin ru:
+ udm ru:
+ kom ru:
+ sah ru:
+ yz rs:
+ latin rs:
+ latinunicode rs:
+ latinyz rs:
+ latinunicodeyz rs:
+ alternatequotes rs:
+ latinalternatequotes rs:
+ alternatequotes si:
+ unicode si:
+ unicodeus si:
+ us si:
+ bksl sk:
+ qwerty sk:
+ qwerty_bksl sk:
+ nodeadkeys es:
+ sundeadkeys es:
+ dvorak es:
+ ast es:
+ cat es:
+ mac es:
+ nodeadkeys se:
+ dvorak se:
+ rus se:
+ rus_nodeadkeys se:
+ smi se:
+ mac se:
+ svdvorak se:
+ de_nodeadkeys ch:
+ de_sundeadkeys ch:
+ fr ch:
+ fr_nodeadkeys ch:
+ fr_sundeadkeys ch:
+ fr_mac ch:
+ de_mac ch:
+ syc sy:
+ syc_phonetic sy:
+ ku sy:
+ ku_f sy:
+ ku_alt sy:
+ tam_unicode lk:
+ tam_TAB lk:
+ tis th:
+ pat th:
+ f tr:
+ alt tr:
+ sundeadkeys tr:
+ ku tr:
+ ku_f tr:
+ ku_alt tr:
+ intl tr:
+ phonetic ua:
+ typewriter ua:
+ winkeys ua:
+ unicode ua:
+ rstu ua:
+ rstu_ru ua:
+ homophonic ua:
+ intl gb:
+ dvorak gb:
+ dvorakukp gb:
+ mac gb:
+ colemak gb:
+ latin uz:
+ kr104 kr:
+ CloGaelach ie:
+ UnicodeExpert ie:
+ ogam ie:
+ ogam_is434 ie:
+ ara pk:
+ legacy epo:
+ igbo ng:
+ yoruba ng:
+ hausa ng:
+ left_hand braille:
+ right_hand braille:
! option
- grp Layout switching
- grp:switch R-Alt switches layout while pressed.
- grp:lswitch Left Alt key switches layout while pressed.
- grp:lwin_switch Left Win-key switches layout while pressed.
- grp:rwin_switch Right Win-key switches layout while pressed.
- grp:win_switch Both Win-keys switch layout while pressed.
- grp:caps_switch CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
- grp:rctrl_switch Right Ctrl key switches layout while pressed.
- grp:toggle Right Alt key changes layout.
- grp:lalt_toggle Left Alt key changes layout.
- grp:caps_toggle CapsLock key changes layout.
- grp:shift_caps_toggle Shift+CapsLock changes layout.
- grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
- grp:alt_caps_toggle Alt+CapsLock changes layout.
- grp:shifts_toggle Both Shift keys together change layout.
- grp:alts_toggle Both Alt keys together change layout.
- grp:ctrls_toggle Both Ctrl keys together change layout.
- grp:ctrl_shift_toggle Ctrl+Shift change layout.
- grp:lctrl_lshift_toggle LCtrl+LShift change layout.
- grp:ctrl_alt_toggle Alt+Ctrl change layout.
- grp:alt_shift_toggle Alt+Shift change layout.
- grp:menu_toggle Menu key changes layout.
- grp:lwin_toggle Left Win-key changes layout.
- grp:rwin_toggle Right Win-key changes layout.
- grp:lshift_toggle Left Shift key changes layout.
- grp:rshift_toggle Right Shift key changes layout.
- grp:lctrl_toggle Left Ctrl key changes layout.
- grp:rctrl_toggle Right Ctrl key changes layout.
- lv3 Third level choosers
- lv3:switch Press Right Ctrl to choose 3rd level.
- lv3:menu_switch Press Menu key to choose 3rd level.
- lv3:win_switch Press any of Win-keys to choose 3rd level.
- lv3:lwin_switch Press Left Win-key to choose 3rd level.
- lv3:rwin_switch Press Right Win-key to choose 3rd level.
- lv3:alt_switch Press any of Alt keys to choose 3rd level.
- lv3:lalt_switch Press Left Alt key to choose 3rd level.
- lv3:ralt_switch Press Right Alt key to choose 3rd level.
- lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
- lv3:ralt_alt Right Alt key never chooses 3rd level.
- ctrl Ctrl key position
- ctrl:nocaps Make CapsLock an additional Ctrl.
- ctrl:swapcaps Swap Ctrl and CapsLock.
- ctrl:ctrl_ac Ctrl key at left of 'A'
- ctrl:ctrl_aa Ctrl key at bottom left
- ctrl:ctrl_ra Right Ctrl key works as Right Alt.
- grp_led Use keyboard LED to show alternative layout.
- grp_led:num NumLock LED shows alternative layout.
- grp_led:caps CapsLock LED shows alternative layout.
- grp_led:scroll ScrollLock LED shows alternative layout.
- keypad Numeric keypad layout selection
- keypad:legacy Legacy keypad
- keypad:oss Keypad with unicode additions (arrows and math operators)
- keypad:future Keypad with unicode additions (arrows and math operators). Math operators on default level.
- keypad:legacy_wang Legacy Wang 724 keypad
- keypad:oss_wang Wang 724 keypad with unicode additions (arrows and math operators)
- keypad:future_wang Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.
- keypad:phone_hex ATM/phone-style hexadecimal keypad
- kpdl Numeric keypad delete key behaviour
- kpdl:dot Legacy key with dot
- kpdl:comma Legacy key with comma
- kpdl:dotoss Four-level key with dot
- kpdl:dotoss_latin9 Four-level key with dot, latin-9 restriction
- kpdl:commaoss Four-level key with comma
- kpdl:momayyezoss Four-level key with momayyez
- kpdl:kposs Four-level key with abstract separators
- caps CapsLock key behavior
- caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock.
- caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
- caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
- caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
- caps:capslock CapsLock toggles normal capitalization of alphabetic characters.
- caps:swapescape Swap ESC and CapsLock.
- caps:shiftlock CapsLock toggles Shift so all keys are affected.
- altwin Alt/Win key behavior
- altwin:menu Add the standard behavior to Menu key.
- altwin:meta_alt Alt and Meta are on the Alt keys.
- altwin:ctrl_win Control is mapped to the Win-keys (and the usual Ctrl keys).
- altwin:meta_win Meta is mapped to the Win-keys.
- altwin:left_meta_win Meta is mapped to the left Win-key.
- altwin:super_win Super is mapped to the Win-keys.
- altwin:hyper_win Hyper is mapped to the Win-keys.
- altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
- altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
- Compose key Compose key position
- compose:ralt Right Alt is Compose.
- compose:lwin Left Win-key is Compose.
- compose:rwin Right Win-key is Compose.
- compose:menu Menu is Compose.
- compose:rctrl Right Ctrl is Compose.
- compose:caps Caps Lock is Compose.
- compose:102 Less-than/Greater-than is Compose.
- compat Miscellaneous compatibility options
- numpad:pc Default numeric keypad keys.
- numpad:mac Numeric keypad keys work as with Mac.
- numpad:microsoft Shift with numeric keypad keys works as in MS Windows.
- srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server.
- apple:badmap Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
- shift:breaks_caps Shift cancels CapsLock.
- eurosign Adding the EuroSign to certain keys
- eurosign:e Add the EuroSign to the E key.
- eurosign:2 Add the EuroSign to the 2 key.
- eurosign:4 Add the EuroSign to the 4 key.
- eurosign:5 Add the EuroSign to the 5 key.
- nbsp Using space key to input non-breakable space character
- nbsp:none Space key outputs usual space at any level.
- nbsp:level2 Space key outputs non-breakable space character at second level.
- nbsp:level3 Space key outputs non-breakable space character at third level.
- nbsp:level3s Space key outputs non-breakable space character at third level, nothing at fourth level.
- nbsp:level3n Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level
- nbsp:level4 Space key outputs non-breakable space character at fourth level.
- nbsp:level4n Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level
- nbsp:level4nl Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
- japan Japanese keyboard options
- japan:kana_lock Kana Lock key is locking
- japan:nicola_f_bs NICOLA-F style Backspace
+ grp
+ grp:switch
+ grp:lswitch
+ grp:lwin_switch
+ grp:rwin_switch
+ grp:win_switch
+ grp:caps_switch
+ grp:rctrl_switch
+ grp:toggle
+ grp:lalt_toggle
+ grp:caps_toggle
+ grp:shift_caps_toggle
+ grp:shift_caps_switch
+ grp:alt_caps_toggle
+ grp:shifts_toggle
+ grp:alts_toggle
+ grp:ctrls_toggle
+ grp:ctrl_shift_toggle
+ grp:lctrl_lshift_toggle
+ grp:ctrl_alt_toggle
+ grp:alt_shift_toggle
+ grp:menu_toggle
+ grp:lwin_toggle
+ grp:rwin_toggle
+ grp:lshift_toggle
+ grp:rshift_toggle
+ grp:lctrl_toggle
+ grp:rctrl_toggle
+ lv3
+ lv3:switch
+ lv3:menu_switch
+ lv3:win_switch
+ lv3:lwin_switch
+ lv3:rwin_switch
+ lv3:alt_switch
+ lv3:lalt_switch
+ lv3:ralt_switch
+ lv3:ralt_switch_multikey
+ lv3:ralt_alt
+ ctrl
+ ctrl:nocaps
+ ctrl:swapcaps
+ ctrl:ctrl_ac
+ ctrl:ctrl_aa
+ ctrl:ctrl_ra
+ grp_led
+ grp_led:num
+ grp_led:caps
+ grp_led:scroll
+ keypad
+ keypad:legacy
+ keypad:oss
+ keypad:future
+ keypad:legacy_wang
+ keypad:oss_wang
+ keypad:future_wang
+ keypad:phone_hex
+ kpdl
+ kpdl:dot
+ kpdl:comma
+ kpdl:dotoss
+ kpdl:dotoss_latin9
+ kpdl:commaoss
+ kpdl:momayyezoss
+ kpdl:kposs
+ caps
+ caps:internal
+ caps:internal_nocancel
+ caps:shift
+ caps:shift_nocancel
+ caps:capslock
+ caps:swapescape
+ caps:shiftlock
+ altwin
+ altwin:menu
+ altwin:meta_alt
+ altwin:ctrl_win
+ altwin:meta_win
+ altwin:left_meta_win
+ altwin:super_win
+ altwin:hyper_win
+ altwin:alt_super_win
+ altwin:swap_lalt_lwin
+ Compose key
+ compose:ralt
+ compose:lwin
+ compose:rwin
+ compose:menu
+ compose:rctrl
+ compose:caps
+ compose:102
+ compat
+ numpad:pc
+ numpad:mac
+ numpad:microsoft
+ srvrkeys:none
+ apple:badmap
+ shift:breaks_caps
+ eurosign
+ eurosign:e
+ eurosign:2
+ eurosign:4
+ eurosign:5
+ nbsp
+ nbsp:none
+ nbsp:level2
+ nbsp:level3
+ nbsp:level3s
+ nbsp:level3n
+ nbsp:level4
+ nbsp:level4n
+ nbsp:level4nl
+ japan
+ japan:kana_lock
+ japan:nicola_f_bs
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
index 00c2f593c..9423e8980 100644
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
@@ -1,16 +1,10 @@
-#!/bin/sh
+@echo off
+set variant=%1
-variant=$1
+set OUTFILE=base.l%variant%_s.part
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}_s.part
+del %OUTFILE%
-> $OUTFILE
+gawk "{ printf """ %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
-awk '{
- printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2;
-}' < $INDIR/layoutRename.lst >> $OUTFILE
-
-awk '{
- printf " %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """ %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
index ae699f95b..21de20529 100644
--- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
@@ -1,12 +1,8 @@
-#!/bin/sh
+@echo off
+set variant=%1
-variant=$1
+set OUTFILE=base.l%variant%v%variant%_s.part
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}v${variant}_s.part
+del %OUTFILE%
-> $OUTFILE
-
-awk '{
- printf " %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
+awk "{ printf """ %%s %%s = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile
new file mode 100644
index 000000000..d04a3ceb2
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/makefile
@@ -0,0 +1,47 @@
+
+TRANSFORM_FILES=layoutRename.lst variantRename.lst
+
+TRANSFORM_SCRIPTS=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+
+SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \
+base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
+base.ml_s.part base.ml1_s.part \
+base.mlv_s.part base.ml1v1_s.part \
+base.ml_s.part
+
+SH=cmd /c
+
+%.bat: %.sh
+ copy $< $@
+
+base.l2_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 2
+
+base.l3_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 3
+
+base.l4_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 4
+
+base.l2v2_s.part: lnv_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 2
+
+base.l3v3_s.part: lnv_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 3
+
+base.l4v4_s.part: lnv_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 4
+
+base.ml_s.part: ml_s.bat $(TRANSFORM_FILES)
+ $(SH) $<
+
+base.ml1_s.part: ml1_s.bat $(TRANSFORM_FILES)
+ $(SH) $<
+
+base.mlv_s.part: mlv_s.bat $(TRANSFORM_FILES)
+ $(SH) $<
+
+base.ml1v1_s.part: ml1v1_s.bat $(TRANSFORM_FILES)
+ $(SH) $<
+
+all: $(SCRIPTS)
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
index 210d1b655..bd47a342e 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
@@ -1,14 +1,9 @@
-#!/bin/sh
+@echo off
-INDIR=`dirname $0`
-OUTFILE=base.ml1_s.part
+set OUTFILE=base.ml1_s.part
-> $OUTFILE
+del %OUTFILE%
-awk '{
- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
-}' < $INDIR/layoutRename.lst >> $OUTFILE
+awk "{ printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
+awk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
index 9edcb8e8c..4cc83e138 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
@@ -1,10 +1,7 @@
-#!/bin/sh
+@echo off
-INDIR=`dirname $0`
-OUTFILE=base.ml1v1_s.part
+set OUTFILE=base.ml1v1_s.part
-> $OUTFILE
+del %OUTFILE%
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
+awk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
index f35087380..9b41b9a7c 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
@@ -1,14 +1,9 @@
-#!/bin/sh
+@echo off
-INDIR=`dirname $0`
-OUTFILE=base.ml_s.part
+set OUTFILE=base.ml_s.part
-> $OUTFILE
+del %OUTFILE%
-awk '{
- printf " * %s = pc+%s\n", $1, $2;
-}' < $INDIR/layoutRename.lst >> $OUTFILE
+awk "{ printf """ * %%s = pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
+awk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
index ea644dcab..4d59fef67 100644
--- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
@@ -1,10 +1,8 @@
-#!/bin/sh
+@echo off
-INDIR=`dirname $0`
-OUTFILE=base.mlv_s.part
+set OUTFILE=base.mlv_s.part
-> $OUTFILE
+del %OUTFILE%
+
+awk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/evdev b/xorg-server/xkbdata.src/rules/evdev
index d58b15b1c..3d84eaad0 100644
--- a/xorg-server/xkbdata.src/rules/evdev
+++ b/xorg-server/xkbdata.src/rules/evdev
@@ -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 $
//
@@ -116,13 +115,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)
@@ -144,133 +139,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
@@ -297,81 +292,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])
@@ -383,465 +378,462 @@
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
* = +inet(evdev)
-! 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)
@@ -935,7 +927,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)
@@ -943,7 +935,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)
diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile
index e130c3a7b..0046f5852 100644
--- a/xorg-server/xkbdata.src/rules/makefile
+++ b/xorg-server/xkbdata.src/rules/makefile
@@ -6,21 +6,98 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
$(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-dist_xkbdata_rules_DATA = \
- README \
- sgi \
- sgi.lst \
- sun \
- sun.lst \
- xfree98 \
- xfree98.lst \
- xkb.dtd \
- xml2lst.pl \
- xorg \
- xorg-it.lst \
- xorg.lst \
- xorg.xml
-
-DATA_FILES=$(dist_xkbdata_rules_DATA:%=$(DESTDIR)\%)
+BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+BASE_PARTS = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR base.m_k.part HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part \
+HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_c.part HDR base.o_t.part
+
+EVDEV_PARTS = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR evdev.m_k.part HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part \
+HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_c.part HDR base.o_t.part
+
+RULES_FILES = base evdev xfree98
+
+LST_FILES = base.lst evdev.lst
+
+%.lst: %.xml
+ perl xml2lst.pl < $< > $@
+
+base: $(BASE_PARTS_NO_COMPAT)
+ merge $@ $(BASE_PARTS)
+
+evdev: $(EVDEV_PARTS_NO_COMPAT)
+ merge $@ $(EVDEV_PARTS)
+
+ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \
+ xkb.dtd README
+
+rules_DATA = $(ALL_RULES_FILES)
+
+XML_IN_FILES = base.xml.in evdev.xml.in
+xml_DATA = $(XML_IN_FILES:%.xml.in=%.xml)
+
+$(DESTDIR)\%.xml: %.xml.in
+ copy $< $@
+
+
+
+DATA_FILES=$(rules_DATA:%=$(DESTDIR)\%) $(xml_DATA:%=$(DESTDIR)\%)
include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/rules/merge.py b/xorg-server/xkbdata.src/rules/merge.py
new file mode 100644
index 000000000..442a866f2
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/merge.py
@@ -0,0 +1,13 @@
+import sys
+
+pOUT=open(sys.argv[1],"wb")
+pHDR=open("HDR","r")
+for item in sys.argv[2:]:
+ if item == 'HDR':
+ pOUT.write("\n")
+ pOUT.write(pHDR.readline())
+ else:
+ pOUT.write(open(item,"rb").read())
+
+pOUT.close()
+
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/makefile b/xorg-server/xkbdata.src/symbols/digital_vndr/makefile
new file mode 100644
index 000000000..6cff8ef1c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/makefile
@@ -0,0 +1,16 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\digital_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+lk pc us \
+vt
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile
new file mode 100644
index 000000000..c068650f1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\fujitsu_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+jp us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/makefile b/xorg-server/xkbdata.src/symbols/hp_vndr/makefile
new file mode 100644
index 000000000..d5fbe59d3
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\hp_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
new file mode 100644
index 000000000..3150831dc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
@@ -0,0 +1,19 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+apple ch de dk \
+es fi fr \
+gb is it \
+latam nl no pt \
+se us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
index 82bdbea58..d6762e1ae 100644
--- a/xorg-server/xkbdata.src/symbols/makefile
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -8,122 +8,38 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
$(DESTDIR):
if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-SUBDIRS = pc macintosh sun fujitsu nec digital hp sgi sony xfree68
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
dist_xkbdata_symbols_DATA = \
- al \
- altwin \
- am \
- apple \
- ar \
- az \
- be \
- ben \
- bg \
- br \
- bs \
- by \
- ca \
- ca_enhanced \
- capslock \
- compose \
- ctrl \
- cz \
- cz_qwerty \
- czsk \
- de \
- de_CH \
- dev \
- dk \
- dvorak \
- ee \
- el \
- en_US \
- es \
- eurosign \
- fi \
- fo \
- fr \
- fr_CH \
- gb \
- ge_la \
- ge_ru \
- group \
- guj \
- gur \
- hr \
- hr_US \
- hu \
- hu_qwerty \
- hu_US \
- ie \
- il \
- il_phonetic \
- inet \
- ir \
- is \
- iso9995-3 \
- it \
- iu \
- jp \
- kan \
- keypad \
- la \
- level3 \
- lo \
- lock \
- lt \
- lt_a \
- lt_p \
- lt_std \
- lv \
- mk \
- ml \
- mm \
- mn \
- mt \
- mt_us \
- nl \
- no \
- ogham \
- ori \
- pc104 \
- pl \
- pl2 \
- pt \
- ralt \
- README \
- ro \
- ro2 \
- ru \
- sapmi \
- se \
- se_FI \
- se_NO \
- se_SE \
- si \
- sk \
- sk_qwerty \
- sr \
- srvr_ctrl \
- syr \
- syr_phonetic \
- tel \
- th \
- th_pat \
- th_tis \
- tj \
- tml \
- tr \
- tr_f \
- ua \
- us \
- us_group2 \
- us_group3 \
- us_intl \
- uz \
- vn \
- yu
+ad af al \
+am ara az \
+be bd \
+bg br ba \
+bt by braille \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+kg kh kr kz \
+la latam latin \
+lk lt lv \
+ma mao me mk \
+mm mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk \
+sy th \
+tj tr \
+ua us uz vn \
+za \
+altwin capslock compose ctrl eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
DATA_FILES=$(dist_xkbdata_symbols_DATA:%=$(DESTDIR)\%)
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/makefile b/xorg-server/xkbdata.src/symbols/nec_vndr/makefile
new file mode 100644
index 000000000..40782ce04
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\nec_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+jp
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile b/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile
new file mode 100644
index 000000000..84e299514
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sgi_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+jp
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/makefile b/xorg-server/xkbdata.src/symbols/sony_vndr/makefile
new file mode 100644
index 000000000..0827ecb0e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sony_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/makefile b/xorg-server/xkbdata.src/symbols/sun_vndr/makefile
new file mode 100644
index 000000000..122c1c376
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/makefile
@@ -0,0 +1,20 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sun_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+ cs cz de dk es \
+ fi fr gb gr hu \
+ it jp ko lt lv \
+ nl no pl pt ru \
+ se solaris sw tr tuv \
+ tw us usb
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile b/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile
new file mode 100644
index 000000000..20c3d18f2
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile
@@ -0,0 +1,15 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\xfree68_vndr
+$(DESTDIR):
+ if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+
+dist_symbols_DATA = \
+amiga ataritt
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak