X Strike Force X.Org X11 SVN commit: r3524 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-09-27 18:09:23 -0400 (Wed, 27 Sep 2006)
New Revision: 3524
Added:
trunk/data/xkb-data/debian/patches/compatibility.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/resync_rules_base.diff
trunk/data/xkb-data/debian/patches/series
trunk/data/xkb-data/debian/symbols.dir
Log:
* debian/patches/compatibility.diff: Add compatibility rules to
make sure that changes in symbols/pc do not cause trouble.
Closes: #389589 Thanks Robert Bihlmeyer.
* Regenerate debian/patches/resync_rules_base.diff and debian/symbols.dir
* Upload xkeyboard-config 0.8-15 into unstable
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-09-27 19:55:00 UTC (rev 3523)
+++ trunk/data/xkb-data/debian/changelog 2006-09-27 22:09:23 UTC (rev 3524)
@@ -1,4 +1,4 @@
-xkeyboard-config (0.8-15) UNRELEASED; urgency=low
+xkeyboard-config (0.8-15) unstable; urgency=low
* debian/patches/greek.diff: New patch to replace dead_horn and
dead_ogonek by U0313/U0314, which are the correct breathing
@@ -6,8 +6,12 @@
that an updated el_GR.UTF-8/Compose file hit testing.
Closes: #386385 Thanks Jan Willem Stumpel.
- -- Denis Barbier <barbier@debian.org> Tue, 26 Sep 2006 23:45:18 +0200
+ * debian/patches/compatibility.diff: Add compatibility rules to
+ make sure that changes in symbols/pc do not cause trouble.
+ Closes: #389589 Thanks Robert Bihlmeyer.
+ -- Denis Barbier <barbier@debian.org> Wed, 27 Sep 2006 23:19:39 +0200
+
xkeyboard-config (0.8-14) unstable; urgency=low
* Sync to CVS 2006-09-25.
Added: trunk/data/xkb-data/debian/patches/compatibility.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/compatibility.diff (rev 0)
+++ trunk/data/xkb-data/debian/patches/compatibility.diff 2006-09-27 22:09:23 UTC (rev 3524)
@@ -0,0 +1,132 @@
+Add backward compatibility rules.
+This patch can be dropped after etch.
+
+Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8321
+
+Index: xkb-data/rules/base.ml1_s.part
+===================================================================
+--- xkb-data.orig/rules/base.ml1_s.part
++++ xkb-data/rules/base.ml1_s.part
+@@ -5,5 +5,5 @@
+ macintosh_old us = macintosh_vndr/us(oldmac)
+ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+ macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
+- * * = pc+%l[1]%(v[1])
++ $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l[1]%(v[1])
++ * * = pc(pc105)+%l[1]%(v[1])
+Index: xkb-data/rules/base.ml_s.part
+===================================================================
+--- xkb-data.orig/rules/base.ml_s.part
++++ xkb-data/rules/base.ml_s.part
+@@ -7,14 +7,14 @@
+ sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2
+ sun5 * = latin+sun_vndr/us(sun5)+%l%(v)
+ pc98 nec_vndr/jp = nec_vndr/jp(pc98)
+- abnt2 br = pc+br
++ abnt2 br = pc(pc105)+br
+ macintosh_old us = macintosh_vndr/us(oldmac)
+ macintosh_old en_US = macintosh_vndr/us(oldmac)
+ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+ macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
+ macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
+- $macs en_US = pc+macintosh_vndr/us(extended)
+- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+- * jp = pc+jp(latin)+jp:2
+- * $nonlatin = pc+us+%l%(v):2
+- * * = pc+%l%(v)
++ $macs en_US = pc(pc105)+macintosh_vndr/us(extended)
++ $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v)
++ * jp = pc(pc105)+jp(latin)+jp:2
++ * $nonlatin = pc(pc105)+us+%l%(v):2
++ * * = pc(pc105)+%l%(v)
+Index: xkb-data/rules/compat/ml1_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1_s.sh
++++ xkb-data/rules/compat/ml1_s.sh
+@@ -5,9 +5,9 @@
+ > $OUTFILE
+
+ awk '{
+- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
++ printf " * %s = pc(pc105)+%s%%(v[1])\n", $1, $2;
+ }' < layoutRename.lst >> $OUTFILE
+
+ awk '{
+- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
++ printf " * %s(%s) = pc(pc105)+%s(%s)\n", $1, $2, $3, $4;
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml1v1_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1v1_s.sh
++++ xkb-data/rules/compat/ml1v1_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+
+ awk '{
+- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
++ printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4;
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml1v_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1v_s.sh
++++ xkb-data/rules/compat/ml1v_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+
+ awk '{
+- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
++ printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4;
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml_s.sh
++++ xkb-data/rules/compat/ml_s.sh
+@@ -5,9 +5,9 @@
+ > $OUTFILE
+
+ awk '{
+- printf " * %s = pc+%s\n", $1, $2;
++ printf " * %s = pc(pc105)+%s\n", $1, $2;
+ }' < layoutRename.lst >> $OUTFILE
+
+ awk '{
+- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
++ printf " * %s(%s) = pc(pc105)+%s(%s)\n", $1, $2, $3, $4;
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/mlv_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/mlv_s.sh
++++ xkb-data/rules/compat/mlv_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+
+ awk '{
+- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
++ printf " * %s %s = pc(pc105)+%s(%s)\n", $1, $2, $3, $4;
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/symbols/pc
+===================================================================
+--- xkb-data.orig/symbols/pc
++++ xkb-data/symbols/pc
+@@ -143,3 +143,20 @@
+ key <RGHT> { [ Right ] };
+ };
+
++// Compatibility with previous versions
++partial hidden
++xkb_symbols "basic" {
++ include "pc"
++};
++partial hidden
++xkb_symbols "pc101" {
++ include "pc"
++};
++partial hidden
++xkb_symbols "pc102" {
++ include "pc"
++};
++partial hidden
++xkb_symbols "pc104" {
++ include "pc"
++};
Modified: trunk/data/xkb-data/debian/patches/resync_rules_base.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-09-27 19:55:00 UTC (rev 3523)
+++ trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-09-27 22:09:23 UTC (rev 3524)
@@ -112,7 +112,7 @@
* = xfree86
! layout[1] = keycodes
-@@ -98,241 +116,138 @@
+@@ -98,240 +116,137 @@
$qwertz = +aliases(qwertz)
* = +aliases(qwerty)
@@ -147,332 +147,225 @@
! model layout variant = symbols
- $pcmodels ben basic = pc(%m)+in(ben)
-- * ben basic = pc(pc105)+in(ben)
+ * ben basic = pc(pc105)+in(ben)
- $pcmodels ben probhat = pc(%m)+in(ben_probhat)
-- * ben probhat = pc(pc105)+in(ben_probhat)
+ * ben probhat = pc(pc105)+in(ben_probhat)
- $pcmodels dev basic = pc(%m)+in(deva)
-- * dev basic = pc(pc105)+in(deva)
+ * dev basic = pc(pc105)+in(deva)
- $pcmodels dvorak $dvoraklayouts = pc(%m)+%l(dvorak)
-- * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
+ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
- $pcmodels dvorak basic = pc(%m)+us(dvorak)
-- * dvorak basic = pc(pc105)+us(dvorak)
+ * dvorak basic = pc(pc105)+us(dvorak)
- $pcmodels dvorak pl_basic = pc(%m)+pl(dvorak)
-- * dvorak pl_basic = pc(pc105)+pl(dvorak)
+ * dvorak pl_basic = pc(pc105)+pl(dvorak)
- $pcmodels dvorak pl = pc(%m)+pl(dvorak_quotes)
-- * dvorak pl = pc(pc105)+pl(dvorak_quotes)
+ * dvorak pl = pc(pc105)+pl(dvorak_quotes)
- $pcmodels dvorak pl_altquotes = pc(%m)+pl(dvorak_altquotes)
-- * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
+ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
- $pcmodels dzdwi basic = pc(%m)+bt(basic)
-- * dzdwi basic = pc(pc105)+bt(basic)
+ * dzdwi basic = pc(pc105)+bt(basic)
- $pcmodels guj basic = pc(%m)+in(guj)
-- * guj basic = pc(pc105)+in(guj)
+ * guj basic = pc(pc105)+in(guj)
- $pcmodels gur basic = pc(%m)+in(guru)
-- * gur basic = pc(pc105)+in(guru)
+ * gur basic = pc(pc105)+in(guru)
- $pcmodels ie laptop = pc(%m)+ie(basic)
-- * ie laptop = pc(pc105)+ie(basic)
+ * ie laptop = pc(pc105)+ie(basic)
- $pcmodels ie CloGaelachLaptop = pc(%m)+ie(CloGaelach)
-- * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
+ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
- $pcmodels iu basic = pc(%m)+ca(ike)
-- * iu basic = pc(pc105)+ca(ike)
++ * il si1452 = pc(pc105)+ie(basic)
+ * iu basic = pc(pc105)+ca(ike)
- $pcmodels lo basic = pc(%m)+la(basic)
-- * lo basic = pc(pc105)+la(basic)
+ * lo basic = pc(pc105)+la(basic)
- $pcmodels kan basic = pc(%m)+in(kan)
-- * kan basic = pc(pc105)+in(kan)
+ * kan basic = pc(pc105)+in(kan)
- $pcmodels mal basic = pc(%m)+in(mal)
-- * mal basic = pc(pc105)+in(mal)
+ * mal basic = pc(pc105)+in(mal)
- $pcmodels mal mlplusnum = pc(%m)+in(mal)
-- * mal mlplusnum = pc(pc105)+in(mal)
+ * mal mlplusnum = pc(pc105)+in(mal)
- $pcmodels ogham basic = pc(%m)+ie(ogam)
-- * ogham basic = pc(pc105)+ie(ogam)
+ * ogham basic = pc(pc105)+ie(ogam)
- $pcmodels ogham laptop = pc(%m)+ie(ogam)
-- * ogham laptop = pc(pc105)+ie(ogam)
+ * ogham laptop = pc(pc105)+ie(ogam)
- $pcmodels ogham is434 = pc(%m)+ie(ogam_is434)
-- * ogham is434 = pc(pc105)+ie(ogam_is434)
+ * ogham is434 = pc(pc105)+ie(ogam_is434)
- $pcmodels ogham is434laptop = pc(%m)+ie(ogam_is434)
-- * ogham is434laptop = pc(pc105)+ie(ogam_is434)
+ * ogham is434laptop = pc(pc105)+ie(ogam_is434)
- $pcmodels ori basic = pc(%m)+in(ori)
-- * ori basic = pc(pc105)+in(ori)
+ * ori basic = pc(pc105)+in(ori)
- $pcmodels ro de = pc(%m)+ro(winkeys)
-- * ro de = pc(pc105)+ro(winkeys)
+ * ro de = pc(pc105)+ro(winkeys)
- $pcmodels ro us = pc(%m)+ro(std)
-- * ro us = pc(pc105)+ro(std)
+ * ro us = pc(pc105)+ro(std)
- $pcmodels sapmi basic = pc(%m)+no(smi)
-- * sapmi basic = pc(pc105)+no(smi)
+ * sapmi basic = pc(pc105)+no(smi)
- $pcmodels sapmi nodeadkeys = pc(%m)+no(smi_nodeadkeys)
-- * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
+ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
- $pcmodels sapmi sefi = pc(%m)+fi(smi)
-- * sapmi sefi = pc(pc105)+fi(smi)
+ * sapmi sefi = pc(pc105)+fi(smi)
- $pcmodels sin phonetic-static = pc(%m)+in(sin_phonetic)
-- * sin phonetic-static = pc(pc105)+in(sin_phonetic)
+ * sin phonetic-static = pc(pc105)+in(sin_phonetic)
- $pcmodels syr basic = pc(%m)+sy(syc)
-- * syr basic = pc(pc105)+sy(syc)
+ * syr basic = pc(pc105)+sy(syc)
- $pcmodels syr phonetic = pc(%m)+sy(syc_phonetic)
-- * syr phonetic = pc(pc105)+sy(syc_phonetic)
+ * syr phonetic = pc(pc105)+sy(syc_phonetic)
- $pcmodels tam INSCRIPT = pc(%m)+in(tam)
-- * tam INSCRIPT = pc(pc105)+in(tam)
+ * tam INSCRIPT = pc(pc105)+in(tam)
- $pcmodels tam UNI = pc(%m)+in(tam_unicode)
-- * tam UNI = pc(pc105)+in(tam_unicode)
+ * tam UNI = pc(pc105)+in(tam_unicode)
- $pcmodels tam TAB = pc(%m)+in(tam_TAB)
-- * tam TAB = pc(pc105)+in(tam_TAB)
+ * tam TAB = pc(pc105)+in(tam_TAB)
- $pcmodels tam TSCII = pc(%m)+in(tam_TSCII)
-- * tam TSCII = pc(pc105)+in(tam_TSCII)
+ * tam TSCII = pc(pc105)+in(tam_TSCII)
- $pcmodels tel basic = pc(%m)+in(tel)
-- * tel basic = pc(pc105)+in(tel)
+ * tel basic = pc(pc105)+in(tel)
- $pcmodels yu basic = pc(%m)+srp(latin)
-- * yu basic = pc(pc105)+srp(latin)
+ * yu basic = pc(pc105)+srp(latin)
- $pcmodels yu unicode = pc(%m)+srp(latinunicode)
-- * yu unicode = pc(pc105)+srp(latinunicode)
+ * yu unicode = pc(pc105)+srp(latinunicode)
- $pcmodels yu yz = pc(%m)+srp(latinyz)
-- * yu yz = pc(pc105)+srp(latinyz)
+ * yu yz = pc(pc105)+srp(latinyz)
- $pcmodels yu unicodeyz = pc(%m)+srp(latinunicodeyz)
-- * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
+ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
- $mac $macvendorlayouts nodeadkeys = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
-+ * ben basic = pc+in(ben)
-+ * ben probhat = pc+in(ben_probhat)
-+ * dev basic = pc+in(deva)
-+ * dvorak $dvoraklayouts = pc+%l(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)
-+ * 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)
-+ * 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
- $pcmodels ar = pc(%m)+ara
-- * ar = pc(pc105)+ara
+ * ar = pc(pc105)+ara
- $pcmodels ben = pc(%m)+in(ben)
-- * ben = pc(pc105)+in(ben)
+ * ben = pc(pc105)+in(ben)
- $pcmodels bs = pc(%m)+ba
-- * bs = pc(pc105)+ba
+ * bs = pc(pc105)+ba
- $pcmodels cz_qwerty = pc(%m)+cz(qwerty)
-- * cz_qwerty = pc(pc105)+cz(qwerty)
+ * cz_qwerty = pc(pc105)+cz(qwerty)
- $pcmodels dev = pc(%m)+in(deva)
-- * dev = pc(pc105)+in(deva)
+ * dev = pc(pc105)+in(deva)
- $pcmodels dvorak = pc(%m)+us(dvorak)
-- * dvorak = pc(pc105)+us(dvorak)
+ * dvorak = pc(pc105)+us(dvorak)
- $pcmodels dzdwi = pc(%m)+bt
-- * dzdwi = pc(pc105)+bt
+ * dzdwi = pc(pc105)+bt
- $pcmodels el = pc(%m)+gr
-- * el = pc(pc105)+gr
+ * el = pc(pc105)+gr
- $pcmodels en_US = pc(%m)+latin
-- * en_US = pc(pc105)+latin
+ * en_US = pc(pc105)+latin
- $pcmodels guj = pc(%m)+in(guj)
-- * guj = pc(pc105)+in(guj)
+ * guj = pc(pc105)+in(guj)
- $pcmodels gur = pc(%m)+in(guru)
-- * gur = pc(pc105)+in(guru)
+ * gur = pc(pc105)+in(guru)
- $pcmodels iu = pc(%m)+ca(ike)
-- * iu = pc(pc105)+ca(ike)
+ * iu = pc(pc105)+ca(ike)
- $pcmodels lo = pc(%m)+la
-- * lo = pc(pc105)+la
+ * lo = pc(pc105)+la
- $pcmodels kan = pc(%m)+in(kan)
-- * kan = pc(pc105)+in(kan)
+ * kan = pc(pc105)+in(kan)
- $pcmodels mi = pc(%m)+mao
-- * mi = pc(pc105)+mao
+ * mi = pc(pc105)+mao
- $pcmodels ml = pc(%m)+in(mal)
-- * ml = pc(pc105)+in(mal)
+ * ml = pc(pc105)+in(mal)
- $pcmodels ogham = pc(%m)+ie(ogam)
-- * ogham = pc(pc105)+ie(ogam)
+ * ogham = pc(pc105)+ie(ogam)
- $pcmodels ori = pc(%m)+ie(ori)
-- * ori = pc(pc105)+ie(ori)
+ * ori = pc(pc105)+ie(ori)
- $pcmodels sapmi = pc(%m)+no(smi)
-- * sapmi = pc(pc105)+no(smi)
+ * sapmi = pc(pc105)+no(smi)
- $pcmodels sr = pc(%m)+srp
-- * sr = pc(pc105)+srp
+ * sr = pc(pc105)+srp
- $pcmodels syr = pc(%m)+sy(syc)
-- * syr = pc(pc105)+sy(syc)
+ * syr = pc(pc105)+sy(syc)
- $pcmodels tel = pc(%m)+in(tel)
-- * tel = pc(pc105)+in(tel)
+ * tel = pc(pc105)+in(tel)
- $pcmodels tml = pc(%m)+in(tam)
-- * tml = pc(pc105)+in(tam)
+ * tml = pc(pc105)+in(tam)
- $pcmodels yu = pc(%m)+srp
-- * yu = pc(pc105)+srp
+ * yu = pc(pc105)+srp
- $pcmodels fr-latin9 = pc(%m)+fr(latin9)
-- * fr-latin9 = pc(pc105)+fr(latin9)
+ * fr-latin9 = pc(pc105)+fr(latin9)
- $pcmodels us_intl = pc(%m)+us(alt-intl)
-- * us_intl = pc(pc105)+us(alt-intl)
+ * us_intl = pc(pc105)+us(alt-intl)
- $pcmodels ben(basic) = pc(%m)+in(ben)
-- * ben(basic) = pc(pc105)+in(ben)
+ * ben(basic) = pc(pc105)+in(ben)
- $pcmodels ben(probhat) = pc(%m)+in(ben_probhat)
-- * ben(probhat) = pc(pc105)+in(ben_probhat)
+ * ben(probhat) = pc(pc105)+in(ben_probhat)
- $pcmodels dev(basic) = pc(%m)+in(deva)
-- * dev(basic) = pc(pc105)+in(deva)
+ * dev(basic) = pc(pc105)+in(deva)
- $pcmodels dvorak($dvoraklayouts) = pc(%m)+%l(dvorak)
-- * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
+ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
- $pcmodels dvorak(basic) = pc(%m)+us(dvorak)
-- * dvorak(basic) = pc(pc105)+us(dvorak)
+ * dvorak(basic) = pc(pc105)+us(dvorak)
- $pcmodels dvorak(pl_basic) = pc(%m)+pl(dvorak)
-- * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
+ * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
- $pcmodels dvorak(pl) = pc(%m)+pl(dvorak_quotes)
-- * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
+ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
- $pcmodels dvorak(pl_altquotes) = pc(%m)+pl(dvorak_altquotes)
-- * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
+ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
- $pcmodels dzdwi(basic) = pc(%m)+bt(basic)
-- * dzdwi(basic) = pc(pc105)+bt(basic)
+ * dzdwi(basic) = pc(pc105)+bt(basic)
- $pcmodels guj(basic) = pc(%m)+in(guj)
-- * guj(basic) = pc(pc105)+in(guj)
+ * guj(basic) = pc(pc105)+in(guj)
- $pcmodels gur(basic) = pc(%m)+in(guru)
-- * gur(basic) = pc(pc105)+in(guru)
+ * gur(basic) = pc(pc105)+in(guru)
- $pcmodels ie(laptop) = pc(%m)+ie(basic)
-- * ie(laptop) = pc(pc105)+ie(basic)
+ * ie(laptop) = pc(pc105)+ie(basic)
- $pcmodels ie(CloGaelachLaptop) = pc(%m)+ie(CloGaelach)
-- * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
+ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
- $pcmodels iu(basic) = pc(%m)+ca(ike)
-- * iu(basic) = pc(pc105)+ca(ike)
++ * il(si1452) = pc(pc105)+ie(basic)
+ * iu(basic) = pc(pc105)+ca(ike)
- $pcmodels lo(basic) = pc(%m)+la(basic)
-- * lo(basic) = pc(pc105)+la(basic)
+ * lo(basic) = pc(pc105)+la(basic)
- $pcmodels kan(basic) = pc(%m)+in(kan)
-- * kan(basic) = pc(pc105)+in(kan)
+ * kan(basic) = pc(pc105)+in(kan)
- $pcmodels mal(basic) = pc(%m)+in(mal)
-- * mal(basic) = pc(pc105)+in(mal)
+ * mal(basic) = pc(pc105)+in(mal)
- $pcmodels mal(mlplusnum) = pc(%m)+in(mal)
-- * mal(mlplusnum) = pc(pc105)+in(mal)
+ * mal(mlplusnum) = pc(pc105)+in(mal)
- $pcmodels ogham(basic) = pc(%m)+ie(ogam)
-- * ogham(basic) = pc(pc105)+ie(ogam)
+ * ogham(basic) = pc(pc105)+ie(ogam)
- $pcmodels ogham(laptop) = pc(%m)+ie(ogam)
-- * ogham(laptop) = pc(pc105)+ie(ogam)
+ * ogham(laptop) = pc(pc105)+ie(ogam)
- $pcmodels ogham(is434) = pc(%m)+ie(ogam_is434)
-- * ogham(is434) = pc(pc105)+ie(ogam_is434)
+ * ogham(is434) = pc(pc105)+ie(ogam_is434)
- $pcmodels ogham(is434laptop) = pc(%m)+ie(ogam_is434)
-- * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
+ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
- $pcmodels ori(basic) = pc(%m)+in(ori)
-- * ori(basic) = pc(pc105)+in(ori)
+ * ori(basic) = pc(pc105)+in(ori)
- $pcmodels ro(de) = pc(%m)+ro(winkeys)
-- * ro(de) = pc(pc105)+ro(winkeys)
+ * ro(de) = pc(pc105)+ro(winkeys)
- $pcmodels ro(us) = pc(%m)+ro(std)
-- * ro(us) = pc(pc105)+ro(std)
+ * ro(us) = pc(pc105)+ro(std)
- $pcmodels sapmi(basic) = pc(%m)+no(smi)
-- * sapmi(basic) = pc(pc105)+no(smi)
+ * sapmi(basic) = pc(pc105)+no(smi)
- $pcmodels sapmi(nodeadkeys) = pc(%m)+no(smi_nodeadkeys)
-- * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
+ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
- $pcmodels sapmi(sefi) = pc(%m)+fi(smi)
-- * sapmi(sefi) = pc(pc105)+fi(smi)
+ * sapmi(sefi) = pc(pc105)+fi(smi)
- $pcmodels sin(phonetic-static) = pc(%m)+in(sin_phonetic)
-- * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
+ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
- $pcmodels syr(basic) = pc(%m)+sy(syc)
-- * syr(basic) = pc(pc105)+sy(syc)
+ * syr(basic) = pc(pc105)+sy(syc)
- $pcmodels syr(phonetic) = pc(%m)+sy(syc_phonetic)
-- * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
+ * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
- $pcmodels tam(INSCRIPT) = pc(%m)+in(tam)
-- * tam(INSCRIPT) = pc(pc105)+in(tam)
+ * tam(INSCRIPT) = pc(pc105)+in(tam)
- $pcmodels tam(UNI) = pc(%m)+in(tam_unicode)
-- * tam(UNI) = pc(pc105)+in(tam_unicode)
+ * tam(UNI) = pc(pc105)+in(tam_unicode)
- $pcmodels tam(TAB) = pc(%m)+in(tam_TAB)
-- * tam(TAB) = pc(pc105)+in(tam_TAB)
+ * tam(TAB) = pc(pc105)+in(tam_TAB)
- $pcmodels tam(TSCII) = pc(%m)+in(tam_TSCII)
-- * tam(TSCII) = pc(pc105)+in(tam_TSCII)
+ * tam(TSCII) = pc(pc105)+in(tam_TSCII)
- $pcmodels tel(basic) = pc(%m)+in(tel)
-- * tel(basic) = pc(pc105)+in(tel)
+ * tel(basic) = pc(pc105)+in(tel)
- $pcmodels yu(basic) = pc(%m)+srp(latin)
-- * yu(basic) = pc(pc105)+srp(latin)
+ * yu(basic) = pc(pc105)+srp(latin)
- $pcmodels yu(unicode) = pc(%m)+srp(latinunicode)
-- * yu(unicode) = pc(pc105)+srp(latinunicode)
+ * yu(unicode) = pc(pc105)+srp(latinunicode)
- $pcmodels yu(yz) = pc(%m)+srp(latinyz)
-- * yu(yz) = pc(pc105)+srp(latinyz)
+ * yu(yz) = pc(pc105)+srp(latinyz)
- $pcmodels yu(unicodeyz) = pc(%m)+srp(latinunicodeyz)
-- * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz)
-+ * ar = pc+ara
-+ * ben = pc+in(ben)
-+ * bs = pc+ba
-+ * 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+%l(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)
-+ * 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)
-+ * 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)
+ * yu(unicodeyz) = pc(pc105)+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
-@@ -342,247 +257,138 @@
+@@ -342,246 +257,137 @@
sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2
sun5 * = latin+sun_vndr/us(sun5)+%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
@@ -489,220 +382,152 @@
- * jp = pc(pc102)+jp(latin)+jp:2
- $pcmodels $nonlatin = pc(%m)+us+%l%(v):2
- $pcmodels * = pc(%m)+%l%(v)
-- * $nonlatin = pc(pc105)+us+%l%(v):2
-- * * = pc(pc105)+%l%(v)
-+ abnt2 br = pc+br
++ abnt2 br = pc(pc105)+br
+ macintosh_old us = macintosh_vndr/us(oldmac)
+ macintosh_old en_US = macintosh_vndr/us(oldmac)
+ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+ macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
+ macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
-+ $macs en_US = pc+macintosh_vndr/us(extended)
-+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
-+ * jp = pc+jp(latin)+jp:2
-+ * $nonlatin = pc+us+%l%(v):2
-+ * * = pc+%l%(v)
++ $macs en_US = pc(pc105)+macintosh_vndr/us(extended)
++ $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v)
++ * jp = pc(pc105)+jp(latin)+jp:2
+ * $nonlatin = pc(pc105)+us+%l%(v):2
+ * * = pc(pc105)+%l%(v)
! model layout[1] = symbols
- $pcmodels ar = pc(%m)+ara%(v[1])
-- * ar = pc(pc105)+ara%(v[1])
+ * ar = pc(pc105)+ara%(v[1])
- $pcmodels ben = pc(%m)+in(ben)%(v[1])
-- * ben = pc(pc105)+in(ben)%(v[1])
+ * ben = pc(pc105)+in(ben)%(v[1])
- $pcmodels bs = pc(%m)+ba%(v[1])
-- * bs = pc(pc105)+ba%(v[1])
+ * bs = pc(pc105)+ba%(v[1])
- $pcmodels cz_qwerty = pc(%m)+cz(qwerty)%(v[1])
-- * cz_qwerty = pc(pc105)+cz(qwerty)%(v[1])
+ * cz_qwerty = pc(pc105)+cz(qwerty)%(v[1])
- $pcmodels dev = pc(%m)+in(deva)%(v[1])
-- * dev = pc(pc105)+in(deva)%(v[1])
+ * dev = pc(pc105)+in(deva)%(v[1])
- $pcmodels dvorak = pc(%m)+us(dvorak)%(v[1])
-- * dvorak = pc(pc105)+us(dvorak)%(v[1])
+ * dvorak = pc(pc105)+us(dvorak)%(v[1])
- $pcmodels dzdwi = pc(%m)+bt%(v[1])
-- * dzdwi = pc(pc105)+bt%(v[1])
+ * dzdwi = pc(pc105)+bt%(v[1])
- $pcmodels el = pc(%m)+gr%(v[1])
-- * el = pc(pc105)+gr%(v[1])
+ * el = pc(pc105)+gr%(v[1])
- $pcmodels en_US = pc(%m)+latin%(v[1])
-- * en_US = pc(pc105)+latin%(v[1])
+ * en_US = pc(pc105)+latin%(v[1])
- $pcmodels guj = pc(%m)+in(guj)%(v[1])
-- * guj = pc(pc105)+in(guj)%(v[1])
+ * guj = pc(pc105)+in(guj)%(v[1])
- $pcmodels gur = pc(%m)+in(guru)%(v[1])
-- * gur = pc(pc105)+in(guru)%(v[1])
+ * gur = pc(pc105)+in(guru)%(v[1])
- $pcmodels iu = pc(%m)+ca(ike)%(v[1])
-- * iu = pc(pc105)+ca(ike)%(v[1])
+ * iu = pc(pc105)+ca(ike)%(v[1])
- $pcmodels lo = pc(%m)+la%(v[1])
-- * lo = pc(pc105)+la%(v[1])
+ * lo = pc(pc105)+la%(v[1])
- $pcmodels kan = pc(%m)+in(kan)%(v[1])
-- * kan = pc(pc105)+in(kan)%(v[1])
+ * kan = pc(pc105)+in(kan)%(v[1])
- $pcmodels mi = pc(%m)+mao%(v[1])
-- * mi = pc(pc105)+mao%(v[1])
+ * mi = pc(pc105)+mao%(v[1])
- $pcmodels ml = pc(%m)+in(mal)%(v[1])
-- * ml = pc(pc105)+in(mal)%(v[1])
+ * ml = pc(pc105)+in(mal)%(v[1])
- $pcmodels ogham = pc(%m)+ie(ogam)%(v[1])
-- * ogham = pc(pc105)+ie(ogam)%(v[1])
+ * ogham = pc(pc105)+ie(ogam)%(v[1])
- $pcmodels ori = pc(%m)+ie(ori)%(v[1])
-- * ori = pc(pc105)+ie(ori)%(v[1])
+ * ori = pc(pc105)+ie(ori)%(v[1])
- $pcmodels sapmi = pc(%m)+no(smi)%(v[1])
-- * sapmi = pc(pc105)+no(smi)%(v[1])
+ * sapmi = pc(pc105)+no(smi)%(v[1])
- $pcmodels sr = pc(%m)+srp%(v[1])
-- * sr = pc(pc105)+srp%(v[1])
+ * sr = pc(pc105)+srp%(v[1])
- $pcmodels syr = pc(%m)+sy(syc)%(v[1])
-- * syr = pc(pc105)+sy(syc)%(v[1])
+ * syr = pc(pc105)+sy(syc)%(v[1])
- $pcmodels tel = pc(%m)+in(tel)%(v[1])
-- * tel = pc(pc105)+in(tel)%(v[1])
+ * tel = pc(pc105)+in(tel)%(v[1])
- $pcmodels tml = pc(%m)+in(tam)%(v[1])
-- * tml = pc(pc105)+in(tam)%(v[1])
+ * tml = pc(pc105)+in(tam)%(v[1])
- $pcmodels yu = pc(%m)+srp%(v[1])
-- * yu = pc(pc105)+srp%(v[1])
+ * yu = pc(pc105)+srp%(v[1])
- $pcmodels fr-latin9 = pc(%m)+fr(latin9)%(v[1])
-- * fr-latin9 = pc(pc105)+fr(latin9)%(v[1])
+ * fr-latin9 = pc(pc105)+fr(latin9)%(v[1])
- $pcmodels us_intl = pc(%m)+us(alt-intl)%(v[1])
-- * us_intl = pc(pc105)+us(alt-intl)%(v[1])
+ * us_intl = pc(pc105)+us(alt-intl)%(v[1])
- $pcmodels ben(basic) = pc(%m)+in(ben)
-- * ben(basic) = pc(pc105)+in(ben)
+ * ben(basic) = pc(pc105)+in(ben)
- $pcmodels ben(probhat) = pc(%m)+in(ben_probhat)
-- * ben(probhat) = pc(pc105)+in(ben_probhat)
+ * ben(probhat) = pc(pc105)+in(ben_probhat)
- $pcmodels dev(basic) = pc(%m)+in(deva)
-- * dev(basic) = pc(pc105)+in(deva)
+ * dev(basic) = pc(pc105)+in(deva)
- $pcmodels dvorak($dvoraklayouts) = pc(%m)+%l(dvorak)
-- * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
+ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
- $pcmodels dvorak(basic) = pc(%m)+us(dvorak)
-- * dvorak(basic) = pc(pc105)+us(dvorak)
+ * dvorak(basic) = pc(pc105)+us(dvorak)
- $pcmodels dvorak(pl_basic) = pc(%m)+pl(dvorak)
-- * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
+ * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
- $pcmodels dvorak(pl) = pc(%m)+pl(dvorak_quotes)
-- * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
+ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
- $pcmodels dvorak(pl_altquotes) = pc(%m)+pl(dvorak_altquotes)
-- * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
+ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
- $pcmodels dzdwi(basic) = pc(%m)+bt(basic)
-- * dzdwi(basic) = pc(pc105)+bt(basic)
+ * dzdwi(basic) = pc(pc105)+bt(basic)
- $pcmodels guj(basic) = pc(%m)+in(guj)
-- * guj(basic) = pc(pc105)+in(guj)
+ * guj(basic) = pc(pc105)+in(guj)
- $pcmodels gur(basic) = pc(%m)+in(guru)
-- * gur(basic) = pc(pc105)+in(guru)
+ * gur(basic) = pc(pc105)+in(guru)
- $pcmodels ie(laptop) = pc(%m)+ie(basic)
-- * ie(laptop) = pc(pc105)+ie(basic)
+ * ie(laptop) = pc(pc105)+ie(basic)
- $pcmodels ie(CloGaelachLaptop) = pc(%m)+ie(CloGaelach)
-- * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
+ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
- $pcmodels iu(basic) = pc(%m)+ca(ike)
-- * iu(basic) = pc(pc105)+ca(ike)
++ * il(si1452) = pc(pc105)+ie(basic)
+ * iu(basic) = pc(pc105)+ca(ike)
- $pcmodels lo(basic) = pc(%m)+la(basic)
-- * lo(basic) = pc(pc105)+la(basic)
+ * lo(basic) = pc(pc105)+la(basic)
- $pcmodels kan(basic) = pc(%m)+in(kan)
-- * kan(basic) = pc(pc105)+in(kan)
+ * kan(basic) = pc(pc105)+in(kan)
- $pcmodels mal(basic) = pc(%m)+in(mal)
-- * mal(basic) = pc(pc105)+in(mal)
+ * mal(basic) = pc(pc105)+in(mal)
- $pcmodels mal(mlplusnum) = pc(%m)+in(mal)
-- * mal(mlplusnum) = pc(pc105)+in(mal)
+ * mal(mlplusnum) = pc(pc105)+in(mal)
- $pcmodels ogham(basic) = pc(%m)+ie(ogam)
-- * ogham(basic) = pc(pc105)+ie(ogam)
+ * ogham(basic) = pc(pc105)+ie(ogam)
- $pcmodels ogham(laptop) = pc(%m)+ie(ogam)
-- * ogham(laptop) = pc(pc105)+ie(ogam)
+ * ogham(laptop) = pc(pc105)+ie(ogam)
- $pcmodels ogham(is434) = pc(%m)+ie(ogam_is434)
-- * ogham(is434) = pc(pc105)+ie(ogam_is434)
+ * ogham(is434) = pc(pc105)+ie(ogam_is434)
- $pcmodels ogham(is434laptop) = pc(%m)+ie(ogam_is434)
-- * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
+ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
- $pcmodels ori(basic) = pc(%m)+in(ori)
-- * ori(basic) = pc(pc105)+in(ori)
+ * ori(basic) = pc(pc105)+in(ori)
- $pcmodels ro(de) = pc(%m)+ro(winkeys)
-- * ro(de) = pc(pc105)+ro(winkeys)
+ * ro(de) = pc(pc105)+ro(winkeys)
- $pcmodels ro(us) = pc(%m)+ro(std)
-- * ro(us) = pc(pc105)+ro(std)
+ * ro(us) = pc(pc105)+ro(std)
- $pcmodels sapmi(basic) = pc(%m)+no(smi)
-- * sapmi(basic) = pc(pc105)+no(smi)
+ * sapmi(basic) = pc(pc105)+no(smi)
- $pcmodels sapmi(nodeadkeys) = pc(%m)+no(smi_nodeadkeys)
-- * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
+ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
- $pcmodels sapmi(sefi) = pc(%m)+fi(smi)
-- * sapmi(sefi) = pc(pc105)+fi(smi)
+ * sapmi(sefi) = pc(pc105)+fi(smi)
- $pcmodels sin(phonetic-static) = pc(%m)+in(sin_phonetic)
-- * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
+ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
- $pcmodels syr(basic) = pc(%m)+sy(syc)
-- * syr(basic) = pc(pc105)+sy(syc)
+ * syr(basic) = pc(pc105)+sy(syc)
- $pcmodels syr(phonetic) = pc(%m)+sy(syc_phonetic)
-- * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
+ * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
- $pcmodels tam(INSCRIPT) = pc(%m)+in(tam)
-- * tam(INSCRIPT) = pc(pc105)+in(tam)
+ * tam(INSCRIPT) = pc(pc105)+in(tam)
- $pcmodels tam(UNI) = pc(%m)+in(tam_unicode)
-- * tam(UNI) = pc(pc105)+in(tam_unicode)
+ * tam(UNI) = pc(pc105)+in(tam_unicode)
- $pcmodels tam(TAB) = pc(%m)+in(tam_TAB)
-- * tam(TAB) = pc(pc105)+in(tam_TAB)
+ * tam(TAB) = pc(pc105)+in(tam_TAB)
- $pcmodels tam(TSCII) = pc(%m)+in(tam_TSCII)
-- * tam(TSCII) = pc(pc105)+in(tam_TSCII)
+ * tam(TSCII) = pc(pc105)+in(tam_TSCII)
- $pcmodels tel(basic) = pc(%m)+in(tel)
-- * tel(basic) = pc(pc105)+in(tel)
+ * tel(basic) = pc(pc105)+in(tel)
- $pcmodels yu(basic) = pc(%m)+srp(latin)
-- * yu(basic) = pc(pc105)+srp(latin)
+ * yu(basic) = pc(pc105)+srp(latin)
- $pcmodels yu(unicode) = pc(%m)+srp(latinunicode)
-- * yu(unicode) = pc(pc105)+srp(latinunicode)
+ * yu(unicode) = pc(pc105)+srp(latinunicode)
- $pcmodels yu(yz) = pc(%m)+srp(latinyz)
-- * yu(yz) = pc(pc105)+srp(latinyz)
+ * yu(yz) = pc(pc105)+srp(latinyz)
- $pcmodels yu(unicodeyz) = pc(%m)+srp(latinunicodeyz)
-- * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz)
-+ * ar = pc+ara%(v[1])
-+ * ben = pc+in(ben)%(v[1])
-+ * bs = pc+ba%(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+%l(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)
-+ * 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)
-+ * 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)
+ * yu(unicodeyz) = pc(pc105)+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])
@@ -712,138 +537,96 @@
- old_macintosh * = macintosh_vndr/us(extended)+%l[1]%(v[1])
- $mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l[1]%(v[1])
- $pcmodels * = pc(%m)+%l[1]%(v[1])
-- * * = pc(pc105)+%l[1]%(v[1])
+ macintosh_old us = macintosh_vndr/us(oldmac)
+ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+ macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
-+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
-+ * * = pc+%l[1]%(v[1])
++ $macs $macvendorlayouts = pc(pc105)+macintosh_vndr/%l[1]%(v[1])
+ * * = pc(pc105)+%l[1]%(v[1])
! model layout[1] variant[1] = symbols
- $pcmodels ben basic = pc(%m)+in(ben)
-- * ben basic = pc(pc105)+in(ben)
+ * ben basic = pc(pc105)+in(ben)
- $pcmodels ben probhat = pc(%m)+in(ben_probhat)
-- * ben probhat = pc(pc105)+in(ben_probhat)
+ * ben probhat = pc(pc105)+in(ben_probhat)
- $pcmodels dev basic = pc(%m)+in(deva)
-- * dev basic = pc(pc105)+in(deva)
+ * dev basic = pc(pc105)+in(deva)
- $pcmodels dvorak $dvoraklayouts = pc(%m)+%l(dvorak)
-- * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
+ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
- $pcmodels dvorak basic = pc(%m)+us(dvorak)
-- * dvorak basic = pc(pc105)+us(dvorak)
+ * dvorak basic = pc(pc105)+us(dvorak)
- $pcmodels dvorak pl_basic = pc(%m)+pl(dvorak)
-- * dvorak pl_basic = pc(pc105)+pl(dvorak)
+ * dvorak pl_basic = pc(pc105)+pl(dvorak)
- $pcmodels dvorak pl = pc(%m)+pl(dvorak_quotes)
-- * dvorak pl = pc(pc105)+pl(dvorak_quotes)
+ * dvorak pl = pc(pc105)+pl(dvorak_quotes)
- $pcmodels dvorak pl_altquotes = pc(%m)+pl(dvorak_altquotes)
-- * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
+ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
- $pcmodels dzdwi basic = pc(%m)+bt(basic)
-- * dzdwi basic = pc(pc105)+bt(basic)
+ * dzdwi basic = pc(pc105)+bt(basic)
- $pcmodels guj basic = pc(%m)+in(guj)
-- * guj basic = pc(pc105)+in(guj)
+ * guj basic = pc(pc105)+in(guj)
- $pcmodels gur basic = pc(%m)+in(guru)
-- * gur basic = pc(pc105)+in(guru)
+ * gur basic = pc(pc105)+in(guru)
- $pcmodels ie laptop = pc(%m)+ie(basic)
-- * ie laptop = pc(pc105)+ie(basic)
+ * ie laptop = pc(pc105)+ie(basic)
- $pcmodels ie CloGaelachLaptop = pc(%m)+ie(CloGaelach)
-- * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
+ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
- $pcmodels iu basic = pc(%m)+ca(ike)
-- * iu basic = pc(pc105)+ca(ike)
++ * il si1452 = pc(pc105)+ie(basic)
+ * iu basic = pc(pc105)+ca(ike)
- $pcmodels lo basic = pc(%m)+la(basic)
-- * lo basic = pc(pc105)+la(basic)
+ * lo basic = pc(pc105)+la(basic)
- $pcmodels kan basic = pc(%m)+in(kan)
-- * kan basic = pc(pc105)+in(kan)
+ * kan basic = pc(pc105)+in(kan)
- $pcmodels mal basic = pc(%m)+in(mal)
-- * mal basic = pc(pc105)+in(mal)
+ * mal basic = pc(pc105)+in(mal)
- $pcmodels mal mlplusnum = pc(%m)+in(mal)
-- * mal mlplusnum = pc(pc105)+in(mal)
+ * mal mlplusnum = pc(pc105)+in(mal)
- $pcmodels ogham basic = pc(%m)+ie(ogam)
-- * ogham basic = pc(pc105)+ie(ogam)
+ * ogham basic = pc(pc105)+ie(ogam)
- $pcmodels ogham laptop = pc(%m)+ie(ogam)
-- * ogham laptop = pc(pc105)+ie(ogam)
+ * ogham laptop = pc(pc105)+ie(ogam)
- $pcmodels ogham is434 = pc(%m)+ie(ogam_is434)
-- * ogham is434 = pc(pc105)+ie(ogam_is434)
+ * ogham is434 = pc(pc105)+ie(ogam_is434)
- $pcmodels ogham is434laptop = pc(%m)+ie(ogam_is434)
-- * ogham is434laptop = pc(pc105)+ie(ogam_is434)
+ * ogham is434laptop = pc(pc105)+ie(ogam_is434)
- $pcmodels ori basic = pc(%m)+in(ori)
-- * ori basic = pc(pc105)+in(ori)
+ * ori basic = pc(pc105)+in(ori)
- $pcmodels ro de = pc(%m)+ro(winkeys)
-- * ro de = pc(pc105)+ro(winkeys)
+ * ro de = pc(pc105)+ro(winkeys)
- $pcmodels ro us = pc(%m)+ro(std)
-- * ro us = pc(pc105)+ro(std)
+ * ro us = pc(pc105)+ro(std)
- $pcmodels sapmi basic = pc(%m)+no(smi)
-- * sapmi basic = pc(pc105)+no(smi)
+ * sapmi basic = pc(pc105)+no(smi)
- $pcmodels sapmi nodeadkeys = pc(%m)+no(smi_nodeadkeys)
-- * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
+ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
- $pcmodels sapmi sefi = pc(%m)+fi(smi)
-- * sapmi sefi = pc(pc105)+fi(smi)
+ * sapmi sefi = pc(pc105)+fi(smi)
- $pcmodels sin phonetic-static = pc(%m)+in(sin_phonetic)
-- * sin phonetic-static = pc(pc105)+in(sin_phonetic)
+ * sin phonetic-static = pc(pc105)+in(sin_phonetic)
- $pcmodels syr basic = pc(%m)+sy(syc)
-- * syr basic = pc(pc105)+sy(syc)
+ * syr basic = pc(pc105)+sy(syc)
- $pcmodels syr phonetic = pc(%m)+sy(syc_phonetic)
-- * syr phonetic = pc(pc105)+sy(syc_phonetic)
+ * syr phonetic = pc(pc105)+sy(syc_phonetic)
- $pcmodels tam INSCRIPT = pc(%m)+in(tam)
-- * tam INSCRIPT = pc(pc105)+in(tam)
+ * tam INSCRIPT = pc(pc105)+in(tam)
- $pcmodels tam UNI = pc(%m)+in(tam_unicode)
-- * tam UNI = pc(pc105)+in(tam_unicode)
+ * tam UNI = pc(pc105)+in(tam_unicode)
- $pcmodels tam TAB = pc(%m)+in(tam_TAB)
-- * tam TAB = pc(pc105)+in(tam_TAB)
+ * tam TAB = pc(pc105)+in(tam_TAB)
- $pcmodels tam TSCII = pc(%m)+in(tam_TSCII)
-- * tam TSCII = pc(pc105)+in(tam_TSCII)
+ * tam TSCII = pc(pc105)+in(tam_TSCII)
- $pcmodels tel basic = pc(%m)+in(tel)
-- * tel basic = pc(pc105)+in(tel)
+ * tel basic = pc(pc105)+in(tel)
- $pcmodels yu basic = pc(%m)+srp(latin)
-- * yu basic = pc(pc105)+srp(latin)
+ * yu basic = pc(pc105)+srp(latin)
- $pcmodels yu unicode = pc(%m)+srp(latinunicode)
-- * yu unicode = pc(pc105)+srp(latinunicode)
+ * yu unicode = pc(pc105)+srp(latinunicode)
- $pcmodels yu yz = pc(%m)+srp(latinyz)
-- * yu yz = pc(pc105)+srp(latinyz)
+ * yu yz = pc(pc105)+srp(latinyz)
- $pcmodels yu unicodeyz = pc(%m)+srp(latinunicodeyz)
-- * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
-+ * ben basic = pc+in(ben)
-+ * ben probhat = pc+in(ben_probhat)
-+ * dev basic = pc+in(deva)
-+ * dvorak $dvoraklayouts = pc+%l(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)
-+ * 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)
-+ * 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)
+ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
! layout[2] = symbols
- ar = +ara%(v[2]):2
@@ -624,6 +430,7 @@
gur(basic) = +in(guru):2
ie(laptop) = +ie(basic):2
@@ -1688,234 +1471,234 @@
--- /dev/null
+++ xkb-data/rules/compat/base.ml1_s.part
@@ -0,0 +1,67 @@
-+ * ar = pc+ara%(v[1])
-+ * ben = pc+in(ben)%(v[1])
-+ * bs = pc+ba%(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+%l(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)
-+ * 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)
-+ * 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 = pc(pc105)+ara%(v[1])
++ * ben = pc(pc105)+in(ben)%(v[1])
++ * bs = pc(pc105)+ba%(v[1])
++ * cz_qwerty = pc(pc105)+cz(qwerty)%(v[1])
++ * dev = pc(pc105)+in(deva)%(v[1])
++ * dvorak = pc(pc105)+us(dvorak)%(v[1])
++ * dzdwi = pc(pc105)+bt%(v[1])
++ * el = pc(pc105)+gr%(v[1])
++ * en_US = pc(pc105)+latin%(v[1])
++ * guj = pc(pc105)+in(guj)%(v[1])
++ * gur = pc(pc105)+in(guru)%(v[1])
++ * iu = pc(pc105)+ca(ike)%(v[1])
++ * lo = pc(pc105)+la%(v[1])
++ * kan = pc(pc105)+in(kan)%(v[1])
++ * mi = pc(pc105)+mao%(v[1])
++ * ml = pc(pc105)+in(mal)%(v[1])
++ * ogham = pc(pc105)+ie(ogam)%(v[1])
++ * ori = pc(pc105)+ie(ori)%(v[1])
++ * sapmi = pc(pc105)+no(smi)%(v[1])
++ * sr = pc(pc105)+srp%(v[1])
++ * syr = pc(pc105)+sy(syc)%(v[1])
++ * tel = pc(pc105)+in(tel)%(v[1])
++ * tml = pc(pc105)+in(tam)%(v[1])
++ * yu = pc(pc105)+srp%(v[1])
++ * fr-latin9 = pc(pc105)+fr(latin9)%(v[1])
++ * us_intl = pc(pc105)+us(alt-intl)%(v[1])
++ * ben(basic) = pc(pc105)+in(ben)
++ * ben(probhat) = pc(pc105)+in(ben_probhat)
++ * dev(basic) = pc(pc105)+in(deva)
++ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
++ * dvorak(basic) = pc(pc105)+us(dvorak)
++ * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
++ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
++ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
++ * dzdwi(basic) = pc(pc105)+bt(basic)
++ * guj(basic) = pc(pc105)+in(guj)
++ * gur(basic) = pc(pc105)+in(guru)
++ * ie(laptop) = pc(pc105)+ie(basic)
++ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
++ * il(si1452) = pc(pc105)+ie(basic)
++ * iu(basic) = pc(pc105)+ca(ike)
++ * lo(basic) = pc(pc105)+la(basic)
++ * kan(basic) = pc(pc105)+in(kan)
++ * mal(basic) = pc(pc105)+in(mal)
++ * mal(mlplusnum) = pc(pc105)+in(mal)
++ * ogham(basic) = pc(pc105)+ie(ogam)
++ * ogham(laptop) = pc(pc105)+ie(ogam)
++ * ogham(is434) = pc(pc105)+ie(ogam_is434)
++ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
++ * ori(basic) = pc(pc105)+in(ori)
++ * ro(de) = pc(pc105)+ro(winkeys)
++ * ro(us) = pc(pc105)+ro(std)
++ * sapmi(basic) = pc(pc105)+no(smi)
++ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
++ * sapmi(sefi) = pc(pc105)+fi(smi)
++ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
++ * syr(basic) = pc(pc105)+sy(syc)
++ * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
++ * tam(INSCRIPT) = pc(pc105)+in(tam)
++ * tam(UNI) = pc(pc105)+in(tam_unicode)
++ * tam(TAB) = pc(pc105)+in(tam_TAB)
++ * tam(TSCII) = pc(pc105)+in(tam_TSCII)
++ * tel(basic) = pc(pc105)+in(tel)
++ * yu(basic) = pc(pc105)+srp(latin)
++ * yu(unicode) = pc(pc105)+srp(latinunicode)
++ * yu(yz) = pc(pc105)+srp(latinyz)
++ * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz)
Index: xkb-data/rules/compat/base.ml1v1_s.part
===================================================================
--- /dev/null
+++ xkb-data/rules/compat/base.ml1v1_s.part
@@ -0,0 +1,41 @@
-+ * ben basic = pc+in(ben)
-+ * ben probhat = pc+in(ben_probhat)
-+ * dev basic = pc+in(deva)
-+ * dvorak $dvoraklayouts = pc+%l(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)
-+ * 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)
-+ * 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)
++ * ben basic = pc(pc105)+in(ben)
++ * ben probhat = pc(pc105)+in(ben_probhat)
++ * dev basic = pc(pc105)+in(deva)
++ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
++ * dvorak basic = pc(pc105)+us(dvorak)
++ * dvorak pl_basic = pc(pc105)+pl(dvorak)
++ * dvorak pl = pc(pc105)+pl(dvorak_quotes)
++ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
++ * dzdwi basic = pc(pc105)+bt(basic)
++ * guj basic = pc(pc105)+in(guj)
++ * gur basic = pc(pc105)+in(guru)
++ * ie laptop = pc(pc105)+ie(basic)
++ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
++ * il si1452 = pc(pc105)+ie(basic)
++ * iu basic = pc(pc105)+ca(ike)
++ * lo basic = pc(pc105)+la(basic)
++ * kan basic = pc(pc105)+in(kan)
++ * mal basic = pc(pc105)+in(mal)
++ * mal mlplusnum = pc(pc105)+in(mal)
++ * ogham basic = pc(pc105)+ie(ogam)
++ * ogham laptop = pc(pc105)+ie(ogam)
++ * ogham is434 = pc(pc105)+ie(ogam_is434)
++ * ogham is434laptop = pc(pc105)+ie(ogam_is434)
++ * ori basic = pc(pc105)+in(ori)
++ * ro de = pc(pc105)+ro(winkeys)
++ * ro us = pc(pc105)+ro(std)
++ * sapmi basic = pc(pc105)+no(smi)
++ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
++ * sapmi sefi = pc(pc105)+fi(smi)
++ * sin phonetic-static = pc(pc105)+in(sin_phonetic)
++ * syr basic = pc(pc105)+sy(syc)
++ * syr phonetic = pc(pc105)+sy(syc_phonetic)
++ * tam INSCRIPT = pc(pc105)+in(tam)
++ * tam UNI = pc(pc105)+in(tam_unicode)
++ * tam TAB = pc(pc105)+in(tam_TAB)
++ * tam TSCII = pc(pc105)+in(tam_TSCII)
++ * tel basic = pc(pc105)+in(tel)
++ * yu basic = pc(pc105)+srp(latin)
++ * yu unicode = pc(pc105)+srp(latinunicode)
++ * yu yz = pc(pc105)+srp(latinyz)
++ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
Index: xkb-data/rules/compat/base.ml_s.part
===================================================================
--- /dev/null
+++ xkb-data/rules/compat/base.ml_s.part
@@ -0,0 +1,67 @@
-+ * ar = pc+ara
-+ * ben = pc+in(ben)
-+ * bs = pc+ba
-+ * 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+%l(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)
-+ * 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)
-+ * 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 = pc(pc105)+ara
++ * ben = pc(pc105)+in(ben)
++ * bs = pc(pc105)+ba
++ * cz_qwerty = pc(pc105)+cz(qwerty)
++ * dev = pc(pc105)+in(deva)
++ * dvorak = pc(pc105)+us(dvorak)
++ * dzdwi = pc(pc105)+bt
++ * el = pc(pc105)+gr
++ * en_US = pc(pc105)+latin
++ * guj = pc(pc105)+in(guj)
++ * gur = pc(pc105)+in(guru)
++ * iu = pc(pc105)+ca(ike)
++ * lo = pc(pc105)+la
++ * kan = pc(pc105)+in(kan)
++ * mi = pc(pc105)+mao
++ * ml = pc(pc105)+in(mal)
++ * ogham = pc(pc105)+ie(ogam)
++ * ori = pc(pc105)+ie(ori)
++ * sapmi = pc(pc105)+no(smi)
++ * sr = pc(pc105)+srp
++ * syr = pc(pc105)+sy(syc)
++ * tel = pc(pc105)+in(tel)
++ * tml = pc(pc105)+in(tam)
++ * yu = pc(pc105)+srp
++ * fr-latin9 = pc(pc105)+fr(latin9)
++ * us_intl = pc(pc105)+us(alt-intl)
++ * ben(basic) = pc(pc105)+in(ben)
++ * ben(probhat) = pc(pc105)+in(ben_probhat)
++ * dev(basic) = pc(pc105)+in(deva)
++ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak)
++ * dvorak(basic) = pc(pc105)+us(dvorak)
++ * dvorak(pl_basic) = pc(pc105)+pl(dvorak)
++ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes)
++ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes)
++ * dzdwi(basic) = pc(pc105)+bt(basic)
++ * guj(basic) = pc(pc105)+in(guj)
++ * gur(basic) = pc(pc105)+in(guru)
++ * ie(laptop) = pc(pc105)+ie(basic)
++ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach)
++ * il(si1452) = pc(pc105)+ie(basic)
++ * iu(basic) = pc(pc105)+ca(ike)
++ * lo(basic) = pc(pc105)+la(basic)
++ * kan(basic) = pc(pc105)+in(kan)
++ * mal(basic) = pc(pc105)+in(mal)
++ * mal(mlplusnum) = pc(pc105)+in(mal)
++ * ogham(basic) = pc(pc105)+ie(ogam)
++ * ogham(laptop) = pc(pc105)+ie(ogam)
++ * ogham(is434) = pc(pc105)+ie(ogam_is434)
++ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434)
++ * ori(basic) = pc(pc105)+in(ori)
++ * ro(de) = pc(pc105)+ro(winkeys)
++ * ro(us) = pc(pc105)+ro(std)
++ * sapmi(basic) = pc(pc105)+no(smi)
++ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys)
++ * sapmi(sefi) = pc(pc105)+fi(smi)
++ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic)
++ * syr(basic) = pc(pc105)+sy(syc)
++ * syr(phonetic) = pc(pc105)+sy(syc_phonetic)
++ * tam(INSCRIPT) = pc(pc105)+in(tam)
++ * tam(UNI) = pc(pc105)+in(tam_unicode)
++ * tam(TAB) = pc(pc105)+in(tam_TAB)
++ * tam(TSCII) = pc(pc105)+in(tam_TSCII)
++ * tel(basic) = pc(pc105)+in(tel)
++ * yu(basic) = pc(pc105)+srp(latin)
++ * yu(unicode) = pc(pc105)+srp(latinunicode)
++ * yu(yz) = pc(pc105)+srp(latinyz)
++ * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz)
Index: xkb-data/rules/compat/base.mlv_s.part
===================================================================
--- /dev/null
+++ xkb-data/rules/compat/base.mlv_s.part
@@ -0,0 +1,41 @@
-+ * ben basic = pc+in(ben)
-+ * ben probhat = pc+in(ben_probhat)
-+ * dev basic = pc+in(deva)
-+ * dvorak $dvoraklayouts = pc+%l(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)
-+ * 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)
-+ * 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)
++ * ben basic = pc(pc105)+in(ben)
++ * ben probhat = pc(pc105)+in(ben_probhat)
++ * dev basic = pc(pc105)+in(deva)
++ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak)
++ * dvorak basic = pc(pc105)+us(dvorak)
++ * dvorak pl_basic = pc(pc105)+pl(dvorak)
++ * dvorak pl = pc(pc105)+pl(dvorak_quotes)
++ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes)
++ * dzdwi basic = pc(pc105)+bt(basic)
++ * guj basic = pc(pc105)+in(guj)
++ * gur basic = pc(pc105)+in(guru)
++ * ie laptop = pc(pc105)+ie(basic)
++ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach)
++ * il si1452 = pc(pc105)+ie(basic)
++ * iu basic = pc(pc105)+ca(ike)
++ * lo basic = pc(pc105)+la(basic)
++ * kan basic = pc(pc105)+in(kan)
++ * mal basic = pc(pc105)+in(mal)
++ * mal mlplusnum = pc(pc105)+in(mal)
++ * ogham basic = pc(pc105)+ie(ogam)
++ * ogham laptop = pc(pc105)+ie(ogam)
++ * ogham is434 = pc(pc105)+ie(ogam_is434)
++ * ogham is434laptop = pc(pc105)+ie(ogam_is434)
++ * ori basic = pc(pc105)+in(ori)
++ * ro de = pc(pc105)+ro(winkeys)
++ * ro us = pc(pc105)+ro(std)
++ * sapmi basic = pc(pc105)+no(smi)
++ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys)
++ * sapmi sefi = pc(pc105)+fi(smi)
++ * sin phonetic-static = pc(pc105)+in(sin_phonetic)
++ * syr basic = pc(pc105)+sy(syc)
++ * syr phonetic = pc(pc105)+sy(syc_phonetic)
++ * tam INSCRIPT = pc(pc105)+in(tam)
++ * tam UNI = pc(pc105)+in(tam_unicode)
++ * tam TAB = pc(pc105)+in(tam_TAB)
++ * tam TSCII = pc(pc105)+in(tam_TSCII)
++ * tel basic = pc(pc105)+in(tel)
++ * yu basic = pc(pc105)+srp(latin)
++ * yu unicode = pc(pc105)+srp(latinunicode)
++ * yu yz = pc(pc105)+srp(latinyz)
++ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz)
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-09-27 19:55:00 UTC (rev 3523)
+++ trunk/data/xkb-data/debian/patches/series 2006-09-27 22:09:23 UTC (rev 3524)
@@ -9,4 +9,5 @@
mac-gb-euro.diff
thinkpad.diff
greek.diff
+compatibility.diff
resync_rules_base.diff
Modified: trunk/data/xkb-data/debian/symbols.dir
===================================================================
--- trunk/data/xkb-data/debian/symbols.dir 2006-09-27 19:55:00 UTC (rev 3523)
+++ trunk/data/xkb-data/debian/symbols.dir 2006-09-27 22:09:23 UTC (rev 3524)
@@ -508,8 +508,12 @@
--p----- a------- no(smi)
--p----- a------- no(smi_nodeadkeys)
-dp----- a------- np(basic)
+h-p----- -------- pc(basic)
h-p----- a------- pc(editing)
h-p----- a------- pc(function)
+h-p----- -------- pc(pc101)
+h-p----- -------- pc(pc102)
+h-p----- -------- pc(pc104)
-dp----- am------ pc(pc105)
-dp----- a------- pk(urd)
-dp----- a------- pl(basic)
Reply to: