test/data: sync from xkeyboard-config 2.30
[platform/upstream/libxkbcommon.git] / test / data / rules / base
index 11e1b56..71aaa91 100644 (file)
@@ -1,4 +1,5 @@
-// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.py FROM rules/*.part
+//
 //
 //  Rules for resolving XKB components for use with XFree86
 //  Copyright 1996 by Joseph Moss
 //              ori pk ru scc sy syr tel th tj tam ua uz
 
 // PC models
-! $pcmodels = pc101 pc102 pc104 pc105
+! $pcmodels = pc86 pc101 pc102 pc104 pc104alt pc105
 
 // Jolla devices and keyboards
 ! $jollamodels = jollasbj
 
 // Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface
 
 // Nokia devices and keyboards
 ! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
 
-// PC geometries - they have special geometry but symbols are mostly pc105
-! $pcgeometries = latitude
-
 // TypeMatrix geometries
 ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
 
@@ -85,7 +83,6 @@
 
 ! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
 
-! $htcdreamlayouts = us it de
 
 ! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
               airkey \
               genius geniuscomfy2 \
               gyration honeywell_euroboard \
               hp250x hp5xx hp500fa hpdv5 \
-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ibm_spacesaver ipaq inspiron intel \
               logiaccess logicda logicink \
               logiex110 logiclx300 \
               silvercrest \
               sk1300 sk2500 sk6200 sk7100 \
               sven sven303 symplon \
+              teck227 teck229 \
               toshiba_s3000 trust trustda \
               unitekkb1925 yahoo \
-              teck227 teck229 \
               apex300
 
 ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
   omnikey101   =       northgate(omnikey101)
   sanwaskbkg3  =       sanwa(sanwaskbkg3)
  $pcmodels     =       pc(%m)
- $pcgeometries =       pc(%m)
   everex       =       everex(STEPnote)
   thinkpad     =       thinkpad(intl)
   thinkpad60   =       thinkpad(60)
   ws007sh      *                       =       pc+sharp_vndr/ws007sh(basic)
   ws011sh      *                       =       pc+sharp_vndr/ws011sh(basic)
   ws020sh      *                       =       pc+sharp_vndr/ws020sh(basic)
-  htcdream     $htcdreamlayouts        =       %l(htcdream)
   *            $nonlatin               =       pc+us+%l%(v):2
   *            *                       =       pc+%l%(v)
 
-! model                layout[1]                       =       symbols
-  *            ar                      =       pc+ara%(v[1])
-  *            ben                     =       pc+in(ben)
-  *            bs                      =       pc+ba%(v[1])
-  *            cs                      =       pc+rs%(v[1])
-  *            cz_qwerty                       =       pc+cz(qwerty)
-  *            dev                     =       pc+in(deva)
-  *            dvorak                  =       pc+us(dvorak)
-  *            dzdwi                   =       pc+bt%(v[1])
-  *            el                      =       pc+gr%(v[1])
-  *            en_US                   =       pc+latin%(v[1])
-  *            guj                     =       pc+in(guj)
-  *            gur                     =       pc+in(guru)
-  *            iu                      =       pc+ca(ike)
-  *            lo                      =       pc+la%(v[1])
-  *            kan                     =       pc+in(kan)
-  *            mi                      =       pc+mao%(v[1])
-  *            ogham                   =       pc+ie(ogam)
-  *            ori                     =       pc+ie(ori)
-  *            sapmi                   =       pc+no(smi)
-  *            sr                      =       pc+srp%(v[1])
-  *            syr                     =       pc+sy(syc)
-  *            tel                     =       pc+in(tel)
-  *            tml                     =       pc+in(tam)
-  *            yu                      =       pc+srp%(v[1])
-  *            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)
-  *            in(urd)                 =       pc+in(urd-phonetic)
-  *            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)
-  *            pk(urd)                 =       pc+pk(urd-phonetic)
-  *            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(NUMERAL-KEYBOARD)                   =       pc+in(tam_keyboard_with_numerals)
-  *            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]       =       symbols
+  *            ar              =       pc+ara%(v[1])
+  *            ben             =       pc+in(ben)
+  *            bs              =       pc+ba%(v[1])
+  *            cs              =       pc+rs%(v[1])
+  *            cz_qwerty               =       pc+cz(qwerty)
+  *            dev             =       pc+in(deva)
+  *            dvorak          =       pc+us(dvorak)
+  *            dzdwi           =       pc+bt%(v[1])
+  *            el              =       pc+gr%(v[1])
+  *            en_US           =       pc+latin%(v[1])
+  *            guj             =       pc+in(guj)
+  *            gur             =       pc+in(guru)
+  *            iu              =       pc+ca(ike)
+  *            lo              =       pc+la%(v[1])
+  *            kan             =       pc+in(kan)
+  *            mi              =       pc+mao%(v[1])
+  *            ogham           =       pc+ie(ogam)
+  *            ori             =       pc+ie(ori)
+  *            sapmi           =       pc+no(smi)
+  *            sr              =       pc+srp%(v[1])
+  *            syr             =       pc+sy(syc)
+  *            tel             =       pc+in(tel)
+  *            tml             =       pc+in(tam)
+  *            yu              =       pc+srp%(v[1])
+  *            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)
+  *            in(urd)         =       pc+in(urd-phonetic)
+  *            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)
+  *            pk(urd)         =       pc+pk(urd-phonetic)
+  *            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(NUMERAL-KEYBOARD)           =       pc+in(tam_keyboard_with_numerals)
+  *            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])
   jollasbj     *                       =       jolla_vndr/sbj(common)+%l[1]%(v[1])
   *            *                       =       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)
-  *            in              urd             =       pc+in(urd-phonetic)
-  *            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)
-  *            pk              urd             =       pc+pk(urd-phonetic)
-  *            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             NUMERAL-KEYBOARD                =       pc+in(tam_keyboard_with_numerals)
-  *            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+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)
+  *            in              urd     =       pc+in(urd-phonetic)
+  *            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)
+  *            pk              urd     =       pc+pk(urd-phonetic)
+  *            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             NUMERAL-KEYBOARD        =       pc+in(tam_keyboard_with_numerals)
+  *            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[2]       =       symbols
   *            ar              =       +ara%(v[2]):2
   *            yu              =       +srp%(v[2]):2
   *            fr-latin9               =       +fr(latin9):2
   *            us_intl         =       +us(alt-intl):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
-  *            in(urd) =       +in(urd-phonetic):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
-  *            pk(urd) =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)   =       +in(tam_keyboard_with_numerals):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):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
+  *            in(urd)         =       +in(urd-phonetic):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
+  *            pk(urd)         =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)           =       +in(tam_keyboard_with_numerals):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
   nokiarx51    cz(qwerty)      =       +nokia_vndr/rx-51(cz_qwerty):2
   nokiarx51    *               =       +nokia_vndr/rx-51(%l[2]%_v[2]):2
  $sun  $sun_custom     =       +sun_vndr/%l[2]%(v[2]):2
   *            yu              =       +srp%(v[3]):3
   *            fr-latin9               =       +fr(latin9):3
   *            us_intl         =       +us(alt-intl):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
-  *            in(urd) =       +in(urd-phonetic):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
-  *            pk(urd) =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)   =       +in(tam_keyboard_with_numerals):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):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
+  *            in(urd)         =       +in(urd-phonetic):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
+  *            pk(urd)         =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)           =       +in(tam_keyboard_with_numerals):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
   nokiarx51    cz(qwerty)      =       +nokia_vndr/rx-51(cz_qwerty):3
   nokiarx51    *               =       +nokia_vndr/rx-51(%l[3]%_v[3]):3
  $sun  $sun_custom     =       +sun_vndr/%l[3]%(v[3]):3
   *            yu              =       +srp%(v[4]):4
   *            fr-latin9               =       +fr(latin9):4
   *            us_intl         =       +us(alt-intl):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
-  *            in(urd) =       +in(urd-phonetic):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
-  *            pk(urd) =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)   =       +in(tam_keyboard_with_numerals):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
+  *            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
+  *            in(urd)         =       +in(urd-phonetic):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
+  *            pk(urd)         =       +pk(urd-phonetic):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(NUMERAL-KEYBOARD)           =       +in(tam_keyboard_with_numerals):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
   nokiarx51    cz(qwerty)      =       +nokia_vndr/rx-51(cz_qwerty):4
   nokiarx51    *               =       +nokia_vndr/rx-51(%l[4]%_v[4]):4
  $sun  $sun_custom     =       +sun_vndr/%l[4]%(v[4]):4
 ! layout       option  =       symbols
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
   *                    misc:typo       = +typo(base)
+  *                    misc:apl        = +apl(level3)
 
 ! layout[1]    option  =       symbols
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
   *                    misc:typo       = +typo(base):1
+  *                    misc:apl        = +apl(level3):1
 
 ! layout[2]    option  =       symbols
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
   *                    misc:typo       = +typo(base):2
+  *                    misc:apl        = +apl(level3):2
 
 ! layout[3]    option  =       symbols
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
   *                    misc:typo       = +typo(base):3
+  *                    misc:apl        = +apl(level3):3
 
 ! layout[4]    option  =       symbols
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
   *                    misc:typo       = +typo(base):4
+  *                    misc:apl        = +apl(level3):4
 
 ! option       =       symbols
   grp:shift_toggle     =       +group(shifts_toggle)
   altwin:menu          =       +altwin(menu)
+  altwin:menu_win      =       +altwin(menu_win)
   altwin:meta_alt      =       +altwin(meta_alt)
   altwin:alt_win       =       +altwin(alt_win)
   altwin:ctrl_win      =       +altwin(ctrl_win)
   lv3:lwin_switch      =       +level3(lwin_switch)
   lv3:rwin_switch      =       +level3(rwin_switch)
   lv3:enter_switch     =       +level3(enter_switch)
+  lv3:4_switch_isolated        =       +level3(4_switch_isolated)
+  lv3:9_switch_isolated        =       +level3(9_switch_isolated)
   caps:capslock                =       +capslock(capslock)
   caps:numlock         =       +capslock(numlock)
   caps:shiftlock       =       +capslock(shiftlock)
   caps:swapescape      =       +capslock(swapescape)
   caps:escape          =       +capslock(escape)
+  caps:escape_shifted_capslock =       +capslock(escape_shifted_capslock)
   caps:backspace       =       +capslock(backspace)
   caps:super           =       +capslock(super)
   caps:hyper           =       +capslock(hyper)
   ctrl:nocaps          =       +ctrl(nocaps)
   ctrl:lctrl_meta      =       +ctrl(lctrl_meta)
   ctrl:swapcaps                =       +ctrl(swapcaps)
+  ctrl:swapcaps_hyper  =       +ctrl(swapcaps_hyper)
+  ctrl:swapcaps_and_switch_layout      =       +ctrl(swapcaps_and_switch_layout)
   ctrl:ac_ctrl         =       +ctrl(ac_ctrl)
   ctrl:aa_ctrl         =       +ctrl(aa_ctrl)
   ctrl:rctrl_ralt      =       +ctrl(rctrl_ralt)
   nbsp:level4           =      +nbsp(level4)
   nbsp:level4n          =      +nbsp(level4n)
   nbsp:level4nl         =      +nbsp(level4nl)
+  nbsp:zwnj2            =      +nbsp(zwnj2)
+  nbsp:zwnj2zwj3        =      +nbsp(zwnj2zwj3)
+  nbsp:zwnj2zwj3nb4     =      +nbsp(zwnj2zwj3nb4)
+  nbsp:zwnj2nb3         =      +nbsp(zwnj2nb3)
+  nbsp:zwnj2nb3s        =      +nbsp(zwnj2nb3s)
+  nbsp:zwnj2nb3zwj4     =      +nbsp(zwnj2nb3zwj4)
+  nbsp:zwnj2nb3nnb4     =      +nbsp(zwnj2nb3nnb4)
+  nbsp:zwnj3zwj4        =      +nbsp(zwnj3zwj4)
   japan:nicola_f_bs     =      +jp(nicola_f_bs)
   japan:hztg_escape     =      +jp(hztg_escape)
-  korean:ralt_rctrl     =      +kr(ralt_hangul)+kr(rctrl_hanja)
-  korean:rctrl_ralt     =      +kr(rctrl_hangul)+kr(ralt_hanja)
+  korean:ralt_hangul   =       +kr(ralt_hangul)
+  korean:rctrl_hangul  =       +kr(rctrl_hangul)
+  korean:ralt_hanja    =       +kr(ralt_hanja)
+  korean:rctrl_hanja   =       +kr(rctrl_hanja)
   kpdl:dot              =      +kpdl(dot)
   kpdl:comma            =      +kpdl(comma)
   kpdl:dotoss           =      +kpdl(dotoss)
   lv3:caps_switch_latch              =       +level3(caps_switch_latch)
   lv3:bksl_switch_latch              =       +level3(bksl_switch_latch)
   lv3:lsgt_switch_latch              =       +level3(lsgt_switch_latch)
+  lv5:lsgt_switch                 =       +level5(lsgt_switch)
+  lv5:ralt_switch                 =       +level5(ralt_switch)
   lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
   lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
   lv5:lwin_switch_lock            =       +level5(lwin_switch_lock)
   grp_led:num          =       +lednum(group_lock)
   grp_led:caps         =       +ledcaps(group_lock)
   grp_led:scroll       =       +ledscroll(group_lock)
+  mod_led:compose      =       +ledcompose(compose)
   japan:kana_lock      =       +japan(kana_lock)
   caps:shiftlock       =       +ledcaps(shift_lock)
   grab:break_actions    =       +xfree86(grab_break)