X Strike Force X.Org X11 SVN commit: r3818 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-10-15 08:54:14 -0400 (Sun, 15 Oct 2006)
New Revision: 3818
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/resync_rules_base.diff
Log:
debian/patches/resync_rules_base.diff: Regenerate to fix FTBFS.
Closes: #393166 Thanks Andreas Jochens.
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-10-15 09:43:54 UTC (rev 3817)
+++ trunk/data/xkb-data/debian/changelog 2006-10-15 12:54:14 UTC (rev 3818)
@@ -1,3 +1,10 @@
+xkeyboard-config (0.9-3) UNRELEASED; urgency=low
+
+ * debian/patches/resync_rules_base.diff: Regenerate to fix FTBFS.
+ Closes: #393166 Thanks Andreas Jochens.
+
+ -- Denis Barbier <barbier@debian.org> Sun, 15 Oct 2006 14:45:11 +0200
+
xkeyboard-config (0.9-2) unstable; urgency=low
+ debian/patches/po.diff: Update Hungarian PO file.
Modified: trunk/data/xkb-data/debian/patches/resync_rules_base.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-10-15 09:43:54 UTC (rev 3817)
+++ trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-10-15 12:54:14 UTC (rev 3818)
@@ -1,4 +1,10 @@
# To rebuild this patch, run
+ if x=$(quilt top) && [ "$x" = resync_rules_base.diff ]; then
+ echo Regenerating $x
+ else
+ echo 'You need to apply resync_rules_base.diff with "quilt push -f" first'
+ exit 1
+ fi
./debian/rules config.status
cd rules/compat
quilt add base.l[2-4]*.part base.m*.part
@@ -523,552 +529,24 @@
caps:grouplock = +capslock(grouplock)
Index: xkb-data/rules/base.lst
===================================================================
---- /dev/null
+--- xkb-data.orig/rules/base.lst
+++ xkb-data/rules/base.lst
-@@ -0,0 +1,543 @@
-+! model
-+ pc101 Generic 101-key PC
-+ pc102 Generic 102-key (Intl) PC
-+ pc104 Generic 104-key PC
-+ pc105 Generic 105-key (Intl) PC
-+ dell101 Dell 101-key PC
-+ latitude Dell Latitude series laptop
-+ everex Everex STEPnote
-+ flexpro Keytronic FlexPro
-+ microsoft Microsoft Natural
-+ omnikey101 Northgate OmniKey 101
-+ winbook Winbook Model XP5
-+ jp106 Japanese 106-key
-+ pc98 PC-98xx Series
-+ a4techKB21 A4Tech KB-21
-+ a4techKBS8 A4Tech KBS-8
-+ a4_rfkb23 A4Tech Wireless Desktop RFKB-23
-+ abnt2 Brazilian ABNT2
-+ airkey Acer AirKey V
-+ acpi ACPI Standard
-+ azonaRF2300 Azona RF2300 wireless Internet Keyboard
-+ scorpius Advance Scorpius KI
-+ brother Brother Internet Keyboard
-+ btc5113rf BTC 5113RF Multimedia
-+ btc5126t BTC 5126T
-+ btc9000 BTC 9000
-+ btc9000a BTC 9000A
-+ btc9001ah BTC 9001AH
-+ btc5090 BTC 5090
-+ btc9019u BTC 9019U
-+ cherryblue Cherry Blue Line CyBo@rd
-+ cherryblueb Cherry CyMotion Master XPress
-+ cherrybluea Cherry Blue Line CyBo@rd (alternate option)
-+ cherrycyboard Cherry CyBo@rd USB-Hub
-+ chicony Chicony Internet Keyboard
-+ chicony9885 Chicony KB-9885
-+ compaqeak8 Compaq Easy Access Keyboard
-+ compaqik7 Compaq Internet Keyboard (7 keys)
-+ compaqik13 Compaq Internet Keyboard (13 keys)
-+ compaqik18 Compaq Internet Keyboard (18 keys)
-+ cymotionlinux Cherry CyMotion Master Linux
-+ armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-+ presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-+ ipaq Compaq iPaq Keyboard
-+ dell Dell
-+ dellusbmm Dell USB Multimedia Keybard
-+ inspiron Laptop/notebook Dell Inspiron 6xxx/8xxx
-+ dexxa Dexxa Wireless Desktop Keyboard
-+ diamond Diamond 9801 / 9802 series
-+ dtk2000 DTK2000
-+ ennyah_dkb1008 Ennyah DKB-1008
-+ genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
-+ geniuscomfy Genius Comfy KB-12e
-+ geniuscomfy2 Genius Comfy KB-21e-Scroll
-+ geniuskb19e Genius KB-19e NB
-+ gyration Gyration
-+ hpi6 Hewlett-Packard Internet Keyboard
-+ hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard
-+ hp2505 Hewlett-Packard SK-2505 Internet Keyboard
-+ hpxe3gc Hewlett-Packard Omnibook XE3 GC
-+ hpxe3gf Hewlett-Packard Omnibook XE3 GF
-+ hpxt1000 Hewlett-Packard Omnibook XT1000
-+ hpzt11xx Hewlett-Packard Pavilion ZT11xx
-+ hp500fa Hewlett-Packard Omnibook 500 FA
-+ hp5xx Hewlett-Packard Omnibook 5xx
-+ hp6000 Hewlett-Packard Omnibook 6000/6100
-+ honeywell_euroboard Honeywell Euroboard
-+ rapidaccess IBM Rapid Access
-+ rapidaccess2 IBM Rapid Access II
-+ rapidaccess2a IBM Rapid Access II (alternate option)
-+ thinkpad IBM ThinkPad 560Z/600/600E/A22E
-+ thinkpadintl IBM ThinkPad 560Z/600/600E/A22E, Intl
-+ logiaccess Logitech Access Keyboard
-+ ltcd Logitech Cordless Desktop
-+ logicdit Logitech Cordless Desktop iTouch
-+ logiclx300 Logitech Cordless Desktop LX-300
-+ logicdp Logitech Cordless Desktop Pro
-+ logicdpa Logitech Cordless Desktop Pro (alternate option)
-+ logicdpa2 Logitech Cordless Desktop Pro (alternate option2)
-+ logicdo Logitech Cordless Desktop Optical
-+ logicfn Logitech Cordless Freedom/Desktop Navigator
-+ logicdn Logitech Cordless Desktop Navigator
-+ logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
-+ logiik Logitech Internet Keyboard
-+ itouch Logitech iTouch
-+ logicink Logitech Internet Navigator Keyboard
-+ logiinkse Logitech iTouch Internet Navigator Keyboard SE
-+ logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB)
-+ logiultrax Logitech Ultra-X Keyboard
-+ dinovo Logitech diNovo Keyboard
-+ mx1998 Memorex MX1998
-+ mx2500 Memorex MX2500 EZ-Access Keyboard
-+ mx2750 Memorex MX2750
-+ microsoftinet Microsoft Internet Keyboard
-+ microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-+ microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
-+ microsoftprooem Microsoft Natural Keyboard Pro OEM
-+ microsoftprose Microsoft Internet Keyboard Pro, Swedish
-+ microsoftoffice Microsoft Office Keyboard
-+ microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A
-+ oretec Oretec MCK-800 MM/Internet keyboard
-+ propeller Propeller Voyager (KTEZ-1000)
-+ qtronix QTronix Scorpius 98N+
-+ samsung4500 Samsung SDM 4500P
-+ samsung4510 Samsung SDM 4510P
-+ sk1300 SK-1300
-+ sk2500 SK-2500
-+ sk6200 SK-6200
-+ sk7100 SK-7100
-+ sp_inet Super Power Multimedia Keyboard
-+ sven SVEN Ergonomic 2500
-+ symplon Symplon PaceBook (tablet PC)
-+ toshiba_s3000 Toshiba Satellite S3000
-+ trust Trust Wireless Keyboard Classic
-+ trustda Trust Direct Access Keyboard
-+ yahoo Yahoo! Internet Keyboard
-+ macbook78 MacBook/MacBook Pro
-+ macbook79 MacBook/MacBook Pro (Intl)
-+ macintosh Macintosh
-+ macintosh_old Macintosh Old
-+ powerpcps2 PowerPC PS/2
-+ acer_c300 Acer C300
-+ acer_tm_800 Acer TravelMate 800
-+ acer_ferrari4k Acer Ferrari 4000
-+ apple Apple
-+ apple_laptop Apple Laptop
-+ silvercrest SILVERCREST Multimedia Wireless Keyboard
-+ emachines Laptop/notebook eMachines m68xx
-+ kr106 Korean 106-key
-+ evdev Evdev-managed keyboard
-+
-+! layout
-+ us U.S. English
-+ ad Andorra
-+ af Afghanistan
-+ ara Arabic
-+ al Albania
-+ am Armenia
-+ az Azerbaijan
-+ by Belarus
-+ be Belgium
-+ bd Bangladesh
-+ in India
-+ ba Bosnia and Herzegovina
-+ br Brazil
-+ bg Bulgaria
-+ mm Myanmar
-+ ca Canada
-+ cd Congo, Democratic Republic of the
-+ hr Croatia
-+ cz Czechia
-+ dk Denmark
-+ nl Netherlands
-+ bt Bhutan
-+ ee Estonia
-+ ir Iran
-+ iq Iraq
-+ fo Faroe Islands
-+ fi Finland
-+ fr France
-+ gh Ghana
-+ ge Georgia
-+ de Germany
-+ gr Greece
-+ hu Hungary
-+ is Iceland
-+ il Israel
-+ it Italy
-+ jp Japan
-+ kg Kyrgyzstan
-+ kh Cambodia
-+ kz Kazakhstan
-+ la Laos
-+ latam Latin American
-+ lt Lithuania
-+ lv Latvia
-+ mao Maori
-+ mk Macedonia
-+ mt Malta
-+ mn Mongolia
-+ no Norway
-+ pl Poland
-+ pt Portugal
-+ ro Romania
-+ ru Russia
-+ cs Serbia and Montenegro
-+ si Slovenia
-+ sk Slovakia
-+ es Spain
-+ se Sweden
-+ ch Switzerland
-+ sy Syria
-+ tj Tajikistan
-+ lk Sri Lanka
-+ th Thailand
-+ tr Turkey
-+ ua Ukraine
-+ gb United Kingdom
-+ uz Uzbekistan
-+ vn Vietnam
-+ kr Korea, Republic of
-+ nec_vndr/jp Japan (PC-98xx Series)
-+ ie Ireland
-+ pk Pakistan
-+ mv Maldives
-+ za South Africa
-+ epo Esperanto
-+ np Nepal
-+ ng Nigeria
-+
-+! variant
-+ intl us: International (with dead keys)
-+ alt-intl us: Alternative international (former us_intl)
-+ dvorak us: Dvorak
-+ dvorak-l us: Left handed Dvorak
-+ dvorak-r us: Right handed Dvorak
-+ dvorak-classic us: Classic Dvorak
-+ rus us: Russian phonetic
-+ mac us: Macintosh
-+ ps af: Pashto
-+ uz af: Southern Uzbek
-+ azerty ara: azerty
-+ azerty_digits ara: azerty/digits
-+ digits ara: digits
-+ qwerty ara: qwerty
-+ qwerty_digits ara: qwerty/digits
-+ buckwalter ara: Buckwalter
-+ phonetic am: Phonetic
-+ eastern am: Eastern
-+ western am: Western
-+ eastern-alt am: Alternative Eastern
-+ cyrillic az: Cyrillic
-+ winkeys by: Winkeys
-+ latin by: Latin
-+ iso-alternate be: ISO Alternate
-+ nodeadkeys be: Eliminate dead keys
-+ sundeadkeys be: Sun dead keys
-+ wang be: Wang model 724 azerty
-+ probhat bd: Probhat
-+ ben in: Bengali
-+ ben_probhat in: Bengali Probhat
-+ guj in: Gujarati
-+ guru in: Gurmukhi
-+ kan in: Kannada
-+ mal in: Malayalam
-+ ori in: Oriya
-+ tam_unicode in: Tamil Unicode
-+ tam_TAB in: Tamil TAB Typewriter
-+ tam_TSCII in: Tamil TSCII Typewriter
-+ tam in: Tamil
-+ tel in: Telugu
-+ urd in: Urdu
-+ alternatequotes ba: Use guillemets for quotes
-+ unicode ba: Use Bosnian digraphs
-+ unicodeus ba: US keyboard with Bosnian digraphs
-+ us ba: US keyboard with Bosnian letters
-+ nodeadkeys br: Eliminate dead keys
-+ phonetic bg: Phonetic
-+ fr-dvorak ca: French Dvorak
-+ fr-legacy ca: French (legacy)
-+ multix ca: Multilingual
-+ multi ca: Multilingual, first part
-+ multi-2gr ca: Multilingual, second part
-+ ike ca: Inuktitut
-+ alternatequotes hr: Use guillemets for quotes
-+ unicode hr: Use Croatian digraphs
-+ unicodeus hr: US keyboard with Croatian digraphs
-+ us hr: US keyboard with Croatian letters
-+ bksl cz: With <\|> key
-+ qwerty cz: qwerty
-+ qwerty_bksl cz: qwerty, extended Backslash
-+ nodeadkeys dk: Eliminate dead keys
-+ mac dk: Macintosh
-+ mac_nodeadkeys dk: Macintosh, eliminate dead keys
-+ sundeadkeys nl: Sun dead keys
-+ mac nl: Macintosh
-+ nodeadkeys ee: Eliminate dead keys
-+ dvorak ee: Dvorak
-+ pro ir: Pro
-+ keypad ir: Keypad
-+ pro_keypad ir: Pro Keypad
-+ ku ir: Kurdish, Latin Q
-+ ku_f ir: Kurdish, (F)
-+ ku_alt ir: Kurdish, Latin Alt-Q
-+ ku_ara ir: Kurdish, Arabic-Latin
-+ ku iq: Kurdish, Latin Q
-+ ku_f iq: Kurdish, (F)
-+ ku_alt iq: Kurdish, Latin Alt-Q
-+ ku_ara iq: Kurdish, Arabic-Latin
-+ nodeadkeys fo: Eliminate dead keys
-+ nodeadkeys fi: Eliminate dead keys
-+ smi fi: Northern Saami
-+ kotoistus fi: Kotoistus
-+ mac fi: Macintosh
-+ nodeadkeys fr: Eliminate dead keys
-+ sundeadkeys fr: Sun dead keys
-+ oss fr: Alternative
-+ oss_latin9 fr: Alternative, latin-9 only
-+ oss_nodeadkeys fr: Alternative, eliminate dead keys
-+ oss_sundeadkeys fr: Alternative, Sun dead keys
-+ latin9 fr: (Legacy) Alternative
-+ latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
-+ latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
-+ dvorak fr: Dvorak
-+ mac fr: Macintosh
-+ generic gh: Multilingual
-+ akan gh: Akan
-+ ewe gh: Ewe
-+ fula gh: Fula
-+ ga gh: Ga
-+ hausa gh: Hausa
-+ ru ge: Russian
-+ deadacute de: Dead acute
-+ deadgraveacute de: Dead grave acute
-+ nodeadkeys de: Eliminate dead keys
-+ ro de: Romanian keyboard with German letters
-+ ro_nodeadkeys de: Romanian keyboard with German letters, eliminate dead keys
-+ dvorak de: Dvorak
-+ sundeadkeys de: Sun dead keys
-+ neo de: Neostyle
-+ mac de: Macintosh
-+ mac_nodeadkeys de: Macintosh, eliminate dead keys
-+ extended gr: Extended
-+ nodeadkeys gr: Eliminate dead keys
-+ polytonic gr: Polytonic
-+ standard hu: Standard
-+ nodeadkeys hu: Eliminate dead keys
-+ qwerty hu: qwerty
-+ 101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
-+ 101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
-+ 101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
-+ 101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
-+ 101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
-+ 101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
-+ 101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
-+ 101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
-+ 102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
-+ 102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
-+ 102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
-+ 102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
-+ 102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
-+ 102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
-+ 102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
-+ 102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
-+ Sundeadkeys is: Sun dead keys
-+ nodeadkeys is: Eliminate dead keys
-+ mac is: Macintosh
-+ lyx il: lyx
-+ phonetic il: Phonetic
-+ nodeadkeys it: Eliminate dead keys
-+ mac it: Macintosh
-+ ruskaz kz: Russian with Kazakh
-+ kazrus kz: Kazakh with Russian
-+ nodeadkeys latam: Eliminate dead keys
-+ sundeadkeys latam: Sun dead keys
-+ std lt: Standard
-+ us lt: US keyboard with Lithuanian letters
-+ ibm lt: IBM (LST 1205-92)
-+ apostrophe lv: Apostrophe (') variant
-+ tilde lv: Tilde (~) variant
-+ fkey lv: F-letter (F) variant
-+ nodeadkeys mk: Eliminate dead keys
-+ us mt: Maltese keyboard with US layout
-+ nodeadkeys no: Eliminate dead keys
-+ dvorak no: Dvorak
-+ smi no: Northern Saami
-+ smi_nodeadkeys no: Northern Saami, eliminate dead keys
-+ mac no: Macintosh
-+ mac_nodeadkeys no: Macintosh, eliminate dead keys
-+ qwertz pl: qwertz
-+ dvorak pl: Dvorak
-+ dvorak_quotes pl: Dvorak, Polish quotes on quotemark key
-+ dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
-+ csb pl: Kashubian
-+ nodeadkeys pt: Eliminate dead keys
-+ sundeadkeys pt: Sun dead keys
-+ mac pt: Macintosh
-+ mac_nodeadkeys pt: Macintosh, eliminate dead keys
-+ mac_sundeadkeys pt: Macintosh, Sun dead keys
-+ std ro: Standard
-+ winkeys ro: Winkeys
-+ phonetic ru: Phonetic
-+ typewriter ru: Typewriter
-+ winkeys ru: Winkeys
-+ tt ru: Tatar
-+ os ru: Ossetian
-+ os_winkeys ru: Ossetian, Winkeys
-+ yz cs: Z and ZHE swapped
-+ latin cs: Latin
-+ latinunicode cs: Latin Unicode
-+ latinyz cs: Latin qwerty
-+ latinunicodeyz cs: Latin Unicode qwerty
-+ alternatequotes cs: With guillemets
-+ latinalternatequotes cs: Latin with guillemets
-+ alternatequotes si: Use guillemets for quotes
-+ unicode si: Use Slovenian digraphs
-+ unicodeus si: US keyboard with Slovenian digraphs
-+ us si: US keyboard with Slovenian letters
-+ bksl sk: Extended Backslash
-+ qwerty sk: qwerty
-+ qwerty_bksl sk: qwerty, extended Backslash
-+ nodeadkeys es: Eliminate dead keys
-+ sundeadkeys es: Sun dead keys
-+ dvorak es: Dvorak
-+ cat es: Catalan variant with middle-dot L
-+ mac es: Macintosh
-+ nodeadkeys se: Eliminate dead keys
-+ dvorak se: Dvorak
-+ rus se: Russian phonetic
-+ rus_nodeadkeys se: Russian phonetic, eliminate dead keys
-+ smi se: Northern Saami
-+ mac se: Macintosh
-+ de_nodeadkeys ch: German, eliminate dead keys
-+ de_sundeadkeys ch: German, Sun dead keys
-+ fr ch: French
-+ fr_nodeadkeys ch: French, eliminate dead keys
-+ fr_sundeadkeys ch: French, Sun dead keys
-+ fr_mac ch: French (Macintosh)
-+ de_mac ch: German (Macintosh)
-+ syc sy: Syriac
-+ syc_phonetic sy: Syriac phonetic
-+ ku sy: Kurdish, Latin Q
-+ ku_f sy: Kurdish, (F)
-+ ku_alt sy: Kurdish, Latin Alt-Q
-+ tam_unicode lk: Tamil Unicode
-+ tam_TAB lk: Tamil TAB Typewriter
-+ tis th: TIS-820.2538
-+ pat th: Pattachote
-+ f tr: (F)
-+ alt tr: Alt-Q
-+ sundeadkeys tr: Sun dead keys
-+ ku tr: Kurdish, Latin Q
-+ ku_f tr: Kurdish, (F)
-+ ku_alt tr: Kurdish, Latin Alt-Q
-+ phonetic ua: Phonetic
-+ typewriter ua: Typewriter
-+ winkeys ua: Winkeys
-+ rstu ua: Standard RSTU
-+ rstu_ru ua: Standard RSTU on Russian layout
-+ intl gb: International (with dead keys)
-+ dvorak gb: Dvorak
-+ mac gb: Macintosh
-+ kr104 kr: 101/104 key Compatible
-+ CloGaelach ie: CloGaelach
-+ UnicodeExpert ie: UnicodeExpert
-+ ogam ie: Ogham
-+ ogam_is434 ie: Ogham IS434
-+ igbo ng: Igbo
-+ yoruba ng: Yoruba
-+ hausa ng: Hausa
-+
-+! option
-+ grp Group Shift/Lock behavior
-+ grp:switch R-Alt switches group while pressed.
-+ grp:lswitch Left Alt key switches group while pressed.
-+ grp:lwin_switch Left Win-key switches group while pressed.
-+ grp:rwin_switch Right Win-key switches group while pressed.
-+ grp:win_switch Both Win-keys switch group while pressed.
-+ grp:rctrl_switch Right Ctrl key switches group while pressed.
-+ grp:toggle Right Alt key changes group.
-+ grp:lalt_toggle Left Alt key changes group.
-+ grp:caps_toggle CapsLock key changes group.
-+ grp:shift_caps_toggle Shift+CapsLock changes group.
-+ grp:alt_caps_toggle Alt+CapsLock changes group.
-+ grp:shifts_toggle Both Shift keys together change group.
-+ grp:alts_toggle Both Alt keys together change group.
-+ grp:ctrls_toggle Both Ctrl keys together change group.
-+ grp:ctrl_shift_toggle Ctrl+Shift changes group.
-+ grp:ctrl_alt_toggle Alt+Ctrl changes group.
-+ grp:alt_shift_toggle Alt+Shift changes group.
-+ grp:menu_toggle Menu key changes group.
-+ grp:lwin_toggle Left Win-key changes group.
-+ grp:rwin_toggle Right Win-key changes group.
-+ grp:lshift_toggle Left Shift key changes group.
-+ grp:rshift_toggle Right Shift key changes group.
-+ grp:lctrl_toggle Left Ctrl key changes group.
-+ grp:rctrl_toggle Right Ctrl key changes group.
+@@ -475,6 +475,7 @@
+ grp:rshift_toggle Right Shift key changes group.
+ grp:lctrl_toggle Left Ctrl key changes group.
+ grp:rctrl_toggle Right Ctrl key changes group.
+ grp:sclk_toggle ScrollLock key changes group.
-+ lv3 Third level choosers
-+ lv3:switch Press Right Ctrl to choose 3rd level.
-+ lv3:menu_switch Press Menu key to choose 3rd level.
-+ lv3:win_switch Press any of Win-keys to choose 3rd level.
-+ lv3:lwin_switch Press Left Win-key to choose 3rd level.
-+ lv3:rwin_switch Press Right Win-key to choose 3rd level.
-+ lv3:alt_switch Press any of Alt keys to choose 3rd level.
-+ lv3:lalt_switch Press Left Alt key to choose 3rd level.
-+ lv3:ralt_switch Press Right Alt key to choose 3rd level.
-+ lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+ lv3 Third level choosers
+ lv3:switch Press Right Ctrl to choose 3rd level.
+ lv3:menu_switch Press Menu key to choose 3rd level.
+@@ -485,6 +486,7 @@
+ lv3:lalt_switch Press Left Alt key to choose 3rd level.
+ lv3:ralt_switch Press Right Alt key to choose 3rd level.
+ lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+ lv3:enter_switch Press Enter key on keypad to choose 3rd level.
-+ ctrl Ctrl key position
-+ ctrl:nocaps Make CapsLock an additional Ctrl.
-+ ctrl:swapcaps Swap Ctrl and CapsLock.
-+ ctrl:ctrl_ac Ctrl key at left of 'A'
-+ ctrl:ctrl_aa Ctrl key at bottom left
-+ ctrl:ctrl_ra Right Ctrl key works as Right Alt.
-+ grp_led Use keyboard LED to show alternative group.
-+ grp_led:num NumLock LED shows alternative group.
-+ grp_led:caps CapsLock LED shows alternative group.
-+ grp_led:scroll ScrollLock LED shows alternative group.
-+ keypad Keypad layout selection
-+ keypad:legacy Force standard legacy keypad
-+ keypad:oss Use keypad with unicode additions (arrows and math operators)
-+ caps CapsLock key behavior
-+ caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock.
-+ caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
-+ caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
-+ caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
-+ caps:shift_lock CapsLock just locks the Shift modifier.
-+ caps:capslock CapsLock toggles normal capitalization of alphabetic characters.
-+ caps:shiftlock CapsLock toggles Shift so all keys are affected.
-+ altwin Alt/Win key behavior
-+ altwin:menu Add the standard behavior to Menu key.
-+ altwin:meta_alt Alt and Meta are on the Alt keys (default).
-+ altwin:meta_win Meta is mapped to the Win-keys.
-+ altwin:left_meta_win Meta is mapped to the left Win-key.
-+ altwin:super_win Super is mapped to the Win-keys (default).
-+ altwin:hyper_win Hyper is mapped to the Win-keys.
-+ altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
-+ altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
-+ Compose key Compose key position
-+ compose:ralt Right Alt is Compose.
-+ compose:lwin Left Win-key is Compose.
-+ compose:rwin Right Win-key is Compose.
-+ compose:menu Menu is Compose.
-+ compose:rctrl Right Ctrl is Compose.
-+ compose:caps Caps Lock is Compose.
-+ compat Miscellaneous compatibility options
-+ numpad:pc Default numpad keys.
-+ numpad:mac Numpad keys work as with Mac.
-+ numpad:microsoft Shift with numpad keys works as in MS Windows.
-+ srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server.
-+ apple:badmap Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
-+ eurosign Adding the EuroSign to certain keys
-+ eurosign:e Add the EuroSign to the E key.
-+ eurosign:5 Add the EuroSign to the 5 key.
-+ eurosign:2 Add the EuroSign to the 2 key.
-+ nbsp Adding the nobreakspace keysym to space key
-+ nbsp:none Space key output space at any level.
-+ nbsp:level2 Space key output nobreakspace at second level.
-+ nbsp:level3 Space key output nobreakspace at third level.
-+ nbsp:level4 Space key output nobreakspace at fourth level.
-+ japan Japanese Keyboard Options
-+ japan:kana_lock Kana Lock key is locking
+ ctrl Ctrl key position
+ ctrl:nocaps Make CapsLock an additional Ctrl.
+ ctrl:swapcaps Swap Ctrl and CapsLock.
Index: xkb-data/rules/compat/base.ml1_s.part
===================================================================
--- xkb-data.orig/rules/compat/base.ml1_s.part
Reply to: