xkb-data: Changes to 'debian-unstable'
debian/conffiles | 1
debian/patches/add_void_definition_pl-324647.diff | 2244 +++++++++++++++++++++-
debian/patches/mac_poweroff.diff | 6
debian/patches/resync_rules_base.diff | 1697 +++++++++++++++-
debian/patches/sclk_toggle.diff | 16
debian/patches/unhide_lv3_enter_switch.diff | 16
debian/rules | 4
debian/xkb-data.postinst | 5
8 files changed, 3854 insertions(+), 135 deletions(-)
New commits:
commit e41682d15e5866ca243ead80cad1707ef83af160
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 01:26:46 2008 +0100
also work when directory is empty
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5ac4acd..0d9f17c 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -6,7 +6,10 @@ set -e
case "$1" in
configure)
- find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
+ if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/|wc -l` -ne 1 ]
+ then
+ find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
commit 260421453ed5866fe50b01d13cb13024896f78e6
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 00:58:34 2008 +0100
find inside the directory and don't try to remove it...
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5d2b358..5ac4acd 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -6,7 +6,7 @@ set -e
case "$1" in
configure)
- find /etc/X11/xkb | grep -v '/^base.xml/' | xargs rm
+ find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
;;
abort-upgrade|abort-remove|abort-deconfigure)
commit 5af8ea64fc6dc3401a1fd54d5a53ba464394e52d
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 00:50:35 2008 +0100
stop being stupid when using dh_link
diff --git a/debian/rules b/debian/rules
index 130a67a..d410eba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,7 @@ install: build
# Move base.xml to /etc/X11/xkb/ and make
# /usr/share/X11/xkb/rules/base.xml links to it
mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml debian/xkb-data/etc/X11/xkb/
- dh_link debian/xkb-data/etc/X11/xkb/base.xml debian/xkb-data/usr/share/X11/xkb/rules/base.xml
+ dh_link etc/X11/xkb/base.xml usr/share/X11/xkb/rules/base.xml
# Build architecture-dependent files here.
binary-arch: build install
commit d0e532589d17af3d945c2d8cb4c1eb80cb1cf29b
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 00:47:44 2008 +0100
removed unnecessary file
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index e24f45f..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/X11/xkb/rules/base.xml
commit ccfa96b033ab33655cb4073d0276873df8f4e969
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 00:44:21 2008 +0100
fix dir
diff --git a/debian/rules b/debian/rules
index d1edbe4..130a67a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,8 +108,8 @@ install: build
# Move base.xml to /etc/X11/xkb/ and make
# /usr/share/X11/xkb/rules/base.xml links to it
- mv debian/usr/share/X11/xkb/rules/base.xml debian/etc/X11/xkb/
- dh_link debian/etc/X11/xkb/base.xml debian/usr/share/X11/xkb/rules/base.xml
+ mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml debian/xkb-data/etc/X11/xkb/
+ dh_link debian/xkb-data/etc/X11/xkb/base.xml debian/xkb-data/usr/share/X11/xkb/rules/base.xml
# Build architecture-dependent files here.
binary-arch: build install
commit 6a2b0ce385af3df07c635fc991d8e9bdc64adb1f
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 00:40:50 2008 +0100
refresh patch
diff --git a/debian/patches/add_void_definition_pl-324647.diff b/debian/patches/add_void_definition_pl-324647.diff
index 16f2021..45a0f3d 100644
--- a/debian/patches/add_void_definition_pl-324647.diff
+++ b/debian/patches/add_void_definition_pl-324647.diff
@@ -1,7 +1,2247 @@
+Index: xkb-data/rules/base
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/base 2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,949 @@
++// 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 $
++
++//
++// Rules for resolving XKB components for use with XFree86
++// Copyright 1996 by Joseph Moss
++//
++// 2002 Modifier: Ivan Pascal The XFree86 Project
++// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $
++//
++
++// If you want non-latin layouts implicitly include the en_US layout
++// uncomment lines below
++//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
++// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
++// ru scc sy syr tel th tj tam ua uz
++
++// PC models
++! $pcmodels = pc101 pc102 pc104 pc105
++
++// Microsoft models (using MS geometry)
++! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose
++
++// PC geometries - they have special geometry but symbols are mostly pc105
++! $pcgeometries = abnt2 latitude jp106 kr106
++
++// Layouts that provide further specializations for the OLPC
++! $olpclayouts = ara br es et kz np ru th tr us
++
++! $macbooks = macbook78 macbook79
++! $maclaptop = ibook powerbook macbook78 macbook79
++! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
++
++! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
++
++! $azerty = be fr
++! $qwertz = al cz de hr hu ro si sk
++
++! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
++ acer_c300 acer_ferrari4k acer_laptop \
++ acpi airkey \
++ apple armada asus_laptop azonaRF2300 \
++ benqx brother \
++ btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
++ cherryblue cherrybluea cherryblueb cherrycyboard \
++ chicony chicony0108 chicony9885 \
++ compaqeak8 compaqik7 compaqik13 compaqik18 \
++ cymotionlinux \
++ dell dellm65 inspiron precision_m dellusbmm dtk2000 \
++ emachines ennyah_dkb1008 evdev fscaa1667g \
++ genius geniuscomfy geniuscomfy2 geniuskb19e \
++ gyration honeywell_euroboard \
++ hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
++ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
++ ipaq inspiron intel latitude \
++ logiaccess logicd logicda logicink \
++ logiex110 logiclx300 \
++ logiinkse logiinkseusb logiitc logiik itouch logiultrax \
++ logitech_g15 \
++ logidinovo logidinovoedge \
++ microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
++ microsoftoffice microsoftmult \
++ mx1998 mx2500 mx2750 \
++ oretec \
++ presario propeller \
++ qtronix \
++ rapidaccess rapidaccess2 rapidaccess2a thinkpad \
++ samsung4500 samsung4510 \
++ scorpius silvercrest \
++ sk1300 sk2500 sk6200 sk7100 sp_inet \
++ sven symplon \
++ toshiba_s3000 trust trustda \
++ yahoo
++
++// all layouts with 3rd and 4th groups
++! $threelevellayouts = al az \
++ be br bt \
++ ca ch cs cz \
++ de dk \
++ ee es \
++ fi fo fr \
++ gb gr \
++ hu \
++ ie ir is it \
++ kg \
++ latam \
++ lk lt \
++ mn mt \
++ nl no \
++ pl pt \
++ ro \
++ se sk \
++ tr \
++ us \
++ vn \
++ za
++
++
++! $dvoraklayouts = br ca de ee es fr gb no pl se us
++
++! model = keycodes
++ amiga = amiga(de)
++ ataritt = ataritt(de)
++ sun4 = sun(type4_euro)
++ sun5 = sun(type5_euro)
++ sun6 = sun(type6_usb)
++ pc98 = xfree98(pc98)
++ abnt2 = xfree86(abnt2)
++ jp106 = xfree86(jp106)
++ evdev = evdev
++ olpc = evdev
++ macintosh_hhk = macintosh(hhk)
++ macintosh_old = macintosh(old)
++ $macbooks = macintosh+macintosh(goodmap)
++ $macs = macintosh
++ * = xfree86
++
++! layout[1] = keycodes
++ $azerty = +aliases(azerty)
++ $qwertz = +aliases(qwertz)
++ * = +aliases(qwerty)
++
++! layout = keycodes
++ $azerty = +aliases(azerty)
++ $qwertz = +aliases(qwertz)
++ * = +aliases(qwerty)
++
++! option = keycodes
++ apple:badmap = +macintosh(badmap)
++ apple:goodmap = +macintosh(goodmap)
++
++! model layout = geometry
++ thinkpad us = thinkpad(us)
++
++! model = geometry
++ microsoftelite = microsoft(elite)
++ $msmodels = microsoft(natural)
++ dell101 = dell(dell101)
++ dellm65 = dell(dellm65)
++ flexpro = keytronic(FlexPro)
++ hp6000 = hp(omnibook)
++ omnikey101 = northgate(omnikey101)
++ $pcmodels = pc(%m)
++ $pcgeometries = pc(%m)
++ everex = everex(STEPnote)
++ thinkpad = thinkpad(intl)
++ winbook = winbook(XP5)
++ pc98 = nec(pc98)
++ $macbooks = macintosh(%m)
++ $macs = macintosh(macintosh)
++ hhk = hhk(basic)
++ 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_comma)
++ * ro std = pc+ro(std_cedilla)
++ * ro academic = pc+ro(std_comma)
++ * 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
++ * 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_comma)
++ * ro(std) = pc+ro(std_cedilla)
++ * ro(academic) = pc+ro(std_comma)
++ * 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
++ amiga * = xfree68_vndr/amiga(usa1)+%l%(v)
++
++ classmate us = pc+%l(classmate)
++ sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2
++ sun4 * = latin+sun_vndr/us(sun4)+%l%(v)
++ sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2
++ sun5 * = latin+sun_vndr/us(sun5)+%l%(v)
++ sun6 us = pc+sun_vndr/us(type6)
++ sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic)
++ sun6 * = pc+sun_vndr/us(type6)+%l%(v)
++ pc98 nec_vndr/jp = nec_vndr/jp(pc98)
++ 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)
++ olpc $olpclayouts = olpc+%l%(m)
++ olpc * = olpc+%l
++ thinkpad br = pc+br(thinkpad)
++ * $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_comma)
++ * ro(std) = pc+ro(std_cedilla)
++ * ro(academic) = pc+ro(std_comma)
++ * 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])
++ sun5 * = latin+sun_vndr/us(sun5)+%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])
++ thinkpad br = pc+%l[1](thinkpad)
++ * * = pc+%l[1]%(v[1])
++
++! 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_comma)
++ * ro std = pc+ro(std_cedilla)
++ * ro academic = pc+ro(std_comma)
++ * sapmi basic = pc+no(smi)
++ * sapmi nodeadkeys = pc+no(smi_nodeadkeys)
++ * sapmi sefi = pc+fi(smi)
++ * sin phonetic-static = pc+in(sin_phonetic)
++ * syr basic = pc+sy(syc)
++ * syr phonetic = pc+sy(syc_phonetic)
++ * tam INSCRIPT = pc+in(tam)
++ * tam UNI = pc+in(tam_unicode)
++ * tam TAB = pc+in(tam_TAB)
++ * tam TSCII = pc+in(tam_TSCII)
++ * tel basic = pc+in(tel)
++ * yu basic = pc+srp(latin)
++ * yu unicode = pc+srp(latinunicode)
++ * yu yz = pc+srp(latinyz)
++ * yu unicodeyz = pc+srp(latinunicodeyz)
++
++! layout[2] = 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_comma):2
++ ro(std) = +ro(std_cedilla):2
++ ro(academic) = +ro(std_comma):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[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_comma):3
++ ro(std) = +ro(std_cedilla):3
++ ro(academic) = +ro(std_comma):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[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_comma):4
++ ro(std) = +ro(std_cedilla):4
++ ro(academic) = +ro(std_comma):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[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_comma):2
++ ro std = +ro(std_cedilla):2
++ ro academic = +ro(std_comma):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[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_comma):3
++ ro std = +ro(std_cedilla):3
++ ro academic = +ro(std_comma):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[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_comma):4
++ ro std = +ro(std_cedilla):4
++ ro academic = +ro(std_comma):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
++ $inetkbds = +inet(%m)
++ acer_tm_800 = +inet(acer_laptop)
++ benqx730 = +inet(benqx)
++ benqx800 = +inet(benqx)
++ dell8125 = +inet(dellusbmm)
++ dell8135 = +inet(dellusbmm)
++ ltcd = +inet(logicda)
++ logicdit = +inet(logicd)
++ logicdo = +inet(logicd)
++ logicdp = +inet(logicd)
++ logicdpa = +inet(logicda)
++ logiciink = +inet(logicink)
++ $maclaptop = +inet(apple)+level3(enter_switch)
++ $macs = +inet(apple)
++
++! model layout = compat
++ pc98 nec_vndr/jp = pc98(basic)
++ * jp = complete+japan
++ olpc * = olpc
++ * * = complete
++
++! model layout[1] = compat
++ * * = complete
++
++! model = types
++ $macs = complete+numpad(mac)
++ * = complete
++
++! layout option = symbols
++ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
++
++! layout[1] option = symbols
++ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
++
++! layout[2] option = symbols
++ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
++
++! layout[3] option = symbols
++ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
++
++! layout[4] option = symbols
++ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
++
++! option = symbols
++ grp:shift_toggle = +group(shifts_toggle)
++ altwin:menu = +altwin(menu)
++ altwin:meta_alt = +altwin(meta_alt)
++ altwin:ctrl_win = +altwin(ctrl_win)
++ altwin:meta_win = +altwin(meta_win)
++ altwin:left_meta_win = +altwin(left_meta_win)
++ altwin:super_win = +altwin(super_win)
++ altwin:hyper_win = +altwin(hyper_win)
++ altwin:alt_super_win = +altwin(alt_super_win)
++ altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
++ grp:switch = +group(switch)
++ grp:lswitch = +group(lswitch)
++ grp:win_switch = +group(win_switch)
++ grp:lwin_switch = +group(lwin_switch)
++ grp:rwin_switch = +group(rwin_switch)
++ grp:toggle = +group(toggle)
++ grp:shifts_toggle = +group(shifts_toggle)
++ grp:ctrls_toggle = +group(ctrls_toggle)
++ grp:alts_toggle = +group(alts_toggle)
++ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
++ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
++ grp:caps_toggle = +group(caps_toggle)
++ grp:shift_caps_toggle = +group(shift_caps_toggle)
++ grp:alt_caps_toggle = +group(alt_caps_toggle)
++ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
++ grp:alt_shift_toggle = +group(alt_shift_toggle)
++ grp:menu_toggle = +group(menu_toggle)
++ grp:lwin_toggle = +group(lwin_toggle)
++ grp:rwin_toggle = +group(rwin_toggle)
++ grp:lshift_toggle = +group(lshift_toggle)
++ grp:rshift_toggle = +group(rshift_toggle)
Reply to: