aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/HDR66
-rw-r--r--xorg-server/xkeyboard-config/rules/README4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.hdr.part12
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l1_k.part6
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l1o_s.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l2o_s.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l3o_s.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l4o_s.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.l_k.part6
-rw-r--r--xorg-server/xkeyboard-config/rules/base.lists.part214
-rw-r--r--xorg-server/xkeyboard-config/rules/base.lo_s.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/base.m_k.part28
-rw-r--r--xorg-server/xkeyboard-config/rules/base.m_s.part102
-rw-r--r--xorg-server/xkeyboard-config/rules/base.ml1_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.ml_c.part8
-rw-r--r--xorg-server/xkeyboard-config/rules/base.ml_g.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.mlv_s.part8
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_t.part16
-rw-r--r--xorg-server/xkeyboard-config/rules/bin/ml1_s.sh36
-rw-r--r--xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh20
-rw-r--r--xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh20
-rw-r--r--xorg-server/xkeyboard-config/rules/bin/ml_s.sh28
-rw-r--r--xorg-server/xkeyboard-config/rules/bin/mlv_s.sh20
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/.gitignore6
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.lists.part4
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.lv_c.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/base.o_s.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst54
-rw-r--r--xorg-server/xkeyboard-config/rules/merge.sh50
-rw-r--r--xorg-server/xkeyboard-config/rules/xfree9856
34 files changed, 403 insertions, 397 deletions
diff --git a/xorg-server/xkeyboard-config/rules/HDR b/xorg-server/xkeyboard-config/rules/HDR
index 769b8fc7f..664d48ef2 100644
--- a/xorg-server/xkeyboard-config/rules/HDR
+++ b/xorg-server/xkeyboard-config/rules/HDR
@@ -1,33 +1,33 @@
-! model = keycodes
-! layout[1] = keycodes
-! layout = keycodes
-! option = keycodes
-! model layout = geometry
-! model = geometry
-! model layout variant = symbols
-! model layout = symbols
-! model layout[1] = symbols
-! model layout[1] variant[1] = symbols
-! model layout[2] = symbols
-! model layout[3] = symbols
-! model layout[4] = symbols
-! model layout[2] variant[2] = symbols
-! model layout[3] variant[3] = symbols
-! model layout[4] variant[4] = symbols
-! model = symbols
-! layout variant = compat
-! layout[1] variant[1] = compat
-! layout[2] variant[2] = compat
-! layout[3] variant[3] = compat
-! layout[4] variant[4] = compat
-! model layout = compat
-! model layout[1] = compat
-! model = types
-! layout option = symbols
-! layout[1] option = symbols
-! layout[2] option = symbols
-! layout[3] option = symbols
-! layout[4] option = symbols
-! option = symbols
-! option = compat
-! option = types
+! model = keycodes
+! layout[1] = keycodes
+! layout = keycodes
+! option = keycodes
+! model layout = geometry
+! model = geometry
+! model layout variant = symbols
+! model layout = symbols
+! model layout[1] = symbols
+! model layout[1] variant[1] = symbols
+! model layout[2] = symbols
+! model layout[3] = symbols
+! model layout[4] = symbols
+! model layout[2] variant[2] = symbols
+! model layout[3] variant[3] = symbols
+! model layout[4] variant[4] = symbols
+! model = symbols
+! layout variant = compat
+! layout[1] variant[1] = compat
+! layout[2] variant[2] = compat
+! layout[3] variant[3] = compat
+! layout[4] variant[4] = compat
+! model layout = compat
+! model layout[1] = compat
+! model = types
+! layout option = symbols
+! layout[1] option = symbols
+! layout[2] option = symbols
+! layout[3] option = symbols
+! layout[4] option = symbols
+! option = symbols
+! option = compat
+! option = types
diff --git a/xorg-server/xkeyboard-config/rules/README b/xorg-server/xkeyboard-config/rules/README
index bcf19ce0c..cd73bca8f 100644
--- a/xorg-server/xkeyboard-config/rules/README
+++ b/xorg-server/xkeyboard-config/rules/README
@@ -1,2 +1,2 @@
-This directory lists sets of rules which can be used to obtain an exact XKB
-configuration.
+This directory lists sets of rules which can be used to obtain an exact XKB
+configuration.
diff --git a/xorg-server/xkeyboard-config/rules/base.hdr.part b/xorg-server/xkeyboard-config/rules/base.hdr.part
index 6550f864d..8c90c2f29 100644
--- a/xorg-server/xkeyboard-config/rules/base.hdr.part
+++ b/xorg-server/xkeyboard-config/rules/base.hdr.part
@@ -1,6 +1,6 @@
-//
-// Rules for resolving XKB components for use with XFree86
-// Copyright 1996 by Joseph Moss
-//
-// 2002 Modifier: Ivan Pascal The XFree86 Project
-//
+//
+// Rules for resolving XKB components for use with XFree86
+// Copyright 1996 by Joseph Moss
+//
+// 2002 Modifier: Ivan Pascal The XFree86 Project
+//
diff --git a/xorg-server/xkeyboard-config/rules/base.l1_k.part b/xorg-server/xkeyboard-config/rules/base.l1_k.part
index 91b775396..032ca5331 100644
--- a/xorg-server/xkeyboard-config/rules/base.l1_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1_k.part
@@ -1,3 +1,3 @@
- $azerty = +aliases(azerty)
- $qwertz = +aliases(qwertz)
- * = +aliases(qwerty)
+ $azerty = +aliases(azerty)
+ $qwertz = +aliases(qwertz)
+ * = +aliases(qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.l1o_s.part b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
index 592fab272..098539443 100644
--- a/xorg-server/xkeyboard-config/rules/base.l1o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
@@ -1,2 +1,2 @@
- $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
- * misc:typo = +typo(base):1
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+ * misc:typo = +typo(base):1
diff --git a/xorg-server/xkeyboard-config/rules/base.l2o_s.part b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
index aac680e9d..5f4a5e60f 100644
--- a/xorg-server/xkeyboard-config/rules/base.l2o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
@@ -1,2 +1,2 @@
- $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
- * misc:typo = +typo(base):2
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+ * misc:typo = +typo(base):2
diff --git a/xorg-server/xkeyboard-config/rules/base.l3o_s.part b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
index 1010e2e03..270af2bdc 100644
--- a/xorg-server/xkeyboard-config/rules/base.l3o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
@@ -1,2 +1,2 @@
- $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
- * misc:typo = +typo(base):3
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+ * misc:typo = +typo(base):3
diff --git a/xorg-server/xkeyboard-config/rules/base.l4o_s.part b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
index 49650ad9c..7e6175637 100644
--- a/xorg-server/xkeyboard-config/rules/base.l4o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
@@ -1,2 +1,2 @@
- $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
- * misc:typo = +typo(base):4
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+ * misc:typo = +typo(base):4
diff --git a/xorg-server/xkeyboard-config/rules/base.l_k.part b/xorg-server/xkeyboard-config/rules/base.l_k.part
index 91b775396..032ca5331 100644
--- a/xorg-server/xkeyboard-config/rules/base.l_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l_k.part
@@ -1,3 +1,3 @@
- $azerty = +aliases(azerty)
- $qwertz = +aliases(qwertz)
- * = +aliases(qwerty)
+ $azerty = +aliases(azerty)
+ $qwertz = +aliases(qwertz)
+ * = +aliases(qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part
index 64319d376..c7983df87 100644
--- a/xorg-server/xkeyboard-config/rules/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/base.lists.part
@@ -1,107 +1,107 @@
-
-// 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 microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
-
-// 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
-
-// Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us
-
-! $macbooks = macbook78 macbook79
-! $maclaptop = ibook powerbook macbook78 macbook79
-! $applealu = applealu_ansi applealu_iso applealu_jis
-! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
-
-! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
-
-! $azerty = be fr
-! $qwertz = al cz de hr hu ro si sk
-
-! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
- airkey \
- apple armada azonaRF2300 \
- benqx brother \
- btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
- cherryblue cherrybluea cherryblueb \
- cherrycyboard cherrycmexpert \
- chicony chicony0108 chicony0420 chicony9885 \
- compalfl90 \
- compaqeak8 compaqik7 compaqik13 compaqik18 \
- creativedw7000 \
- cymotionlinux \
- dell dellm65 inspiron dellusbmm \
- emachines ennyah_dkb1008 evdev \
- genius geniuscomfy2 \
- gyration honeywell_euroboard \
- hp250x hp5xx hp500fa hpdv5 \
- hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
- ibm_spacesaver ipaq inspiron intel \
- logiaccess logicda logicink \
- logiex110 logiclx300 \
- logiinkse logiinkseusb logiitc logiik \
- logitech_base itouch logiultrax \
- logitech_g15 \
- logidinovo logidinovoedge \
- microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
- microsoftoffice microsoftmult \
- mx1998 mx2500 mx2750 \
- oretec \
- pc105 \
- presario propeller \
- qtronix \
- rapidaccess rapidaccess2 thinkpad60 \
- samsung4500 samsung4510 \
- silvercrest \
- sk1300 sk2500 sk6200 sk7100 \
- sven sven303 symplon \
- toshiba_s3000 trust trustda \
- unitekkb1925 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 \
- latam \
- lk lt \
- mn mt \
- nl no \
- pl pt \
- ro \
- se sk \
- tr \
- us \
- vn \
- za
-
-! $evdevkbds = ibm_spacesaver
-
-! $thinkpads = thinkpad thinkpad60 thinkpadz60
-
-! $sun_t6_custom = ara be br ca ch cz de dk \
- ee es fi fr gb gr it kr \
- lt lv nl no pl pt ro ru \
- se sk tr tw ua
-
-! $htcdreamlayouts = us it de
+
+// 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 microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// 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
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $applealu = applealu_ansi applealu_iso applealu_jis
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk
+
+! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
+ airkey \
+ apple armada azonaRF2300 \
+ benqx brother \
+ btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+ cherryblue cherrybluea cherryblueb \
+ cherrycyboard cherrycmexpert \
+ chicony chicony0108 chicony0420 chicony9885 \
+ compalfl90 \
+ compaqeak8 compaqik7 compaqik13 compaqik18 \
+ creativedw7000 \
+ cymotionlinux \
+ dell dellm65 inspiron dellusbmm \
+ emachines ennyah_dkb1008 evdev \
+ genius geniuscomfy2 \
+ gyration honeywell_euroboard \
+ hp250x hp5xx hp500fa hpdv5 \
+ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+ ibm_spacesaver ipaq inspiron intel \
+ logiaccess logicda logicink \
+ logiex110 logiclx300 \
+ logiinkse logiinkseusb logiitc logiik \
+ logitech_base itouch logiultrax \
+ logitech_g15 \
+ logidinovo logidinovoedge \
+ microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+ microsoftoffice microsoftmult \
+ mx1998 mx2500 mx2750 \
+ oretec \
+ pc105 \
+ presario propeller \
+ qtronix \
+ rapidaccess rapidaccess2 thinkpad60 \
+ samsung4500 samsung4510 \
+ silvercrest \
+ sk1300 sk2500 sk6200 sk7100 \
+ sven sven303 symplon \
+ toshiba_s3000 trust trustda \
+ unitekkb1925 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 \
+ latam \
+ lk lt \
+ mn mt \
+ nl no \
+ pl pt \
+ ro \
+ se sk \
+ tr \
+ us \
+ vn \
+ za
+
+! $evdevkbds = ibm_spacesaver
+
+! $thinkpads = thinkpad thinkpad60 thinkpadz60
+
+! $sun_t6_custom = ara be br ca ch cz de dk \
+ ee es fi fr gb gr it kr \
+ lt lv nl no pl pt ro ru \
+ se sk tr tw ua
+
+! $htcdreamlayouts = us it de
diff --git a/xorg-server/xkeyboard-config/rules/base.lo_s.part b/xorg-server/xkeyboard-config/rules/base.lo_s.part
index dee7b6daa..1a37c3d48 100644
--- a/xorg-server/xkeyboard-config/rules/base.lo_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.lo_s.part
@@ -1,2 +1,2 @@
- $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
- * misc:typo = +typo(base)
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+ * misc:typo = +typo(base)
diff --git a/xorg-server/xkeyboard-config/rules/base.m_k.part b/xorg-server/xkeyboard-config/rules/base.m_k.part
index 2c621208f..bae06c55d 100644
--- a/xorg-server/xkeyboard-config/rules/base.m_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_k.part
@@ -1,14 +1,14 @@
- amiga = amiga(de)
- ataritt = ataritt(de)
- empty = empty
- sun4 = sun(type4_euro)
- sun5 = sun(type5_euro)
- sun6 = sun(type6_usb)
- sun6euro = sun(type6tuv_usb)
- pc98 = xfree98(pc98)
- $applealu = macintosh(alukbd)
- macintosh_hhk = macintosh(hhk)
- macintosh_old = macintosh(old)
- $macs = macintosh
- thinkpadz60 = xfree86(thinkpadz60)
- * = xfree86
+ amiga = amiga(de)
+ ataritt = ataritt(de)
+ empty = empty
+ sun4 = sun(type4_euro)
+ sun5 = sun(type5_euro)
+ sun6 = sun(type6_usb)
+ sun6euro = sun(type6tuv_usb)
+ pc98 = xfree98(pc98)
+ $applealu = macintosh(alukbd)
+ macintosh_hhk = macintosh(hhk)
+ macintosh_old = macintosh(old)
+ $macs = macintosh
+ thinkpadz60 = xfree86(thinkpadz60)
+ * = xfree86
diff --git a/xorg-server/xkeyboard-config/rules/base.m_s.part b/xorg-server/xkeyboard-config/rules/base.m_s.part
index 4bbbcce31..0eee0456d 100644
--- a/xorg-server/xkeyboard-config/rules/base.m_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_s.part
@@ -1,51 +1,51 @@
- a4techKB21 = +inet(media_nav_common)
- a4techKBS8 = +inet(media_nav_acpi_common)
- a4_rfkb23 = +inet(media_nav_acpi_common)
- asus_laptop = +inet(media_common)
- acer_tm_800 = +inet(acer_laptop)
- benqx730 = +inet(benqx)
- benqx800 = +inet(benqx)
- btc5126t = +inet(nav_acpi_common)
- btc9116u = +inet(btc9019u)
- btc6301urf = +inet(media_nav_acpi_common)
- dellsk8125 = +inet(dell)
- dellsk8135 = +inet(dell)
- cherrybunlim = +inet(nav_common)
- dexxa = +inet(media_nav_common)
- dtk2000 = +inet(media_nav_acpi_common)
- fscaa1667g = +inet(media_nav_common)
- geniuskb19e = +inet(media_nav_acpi_common)
- geniuscomfy = +inet(media_nav_acpi_common)
- geniuskkb2050hs = +inet(dellusbmm)
- hpnx9020 = +inet(hpi6)
- latitude = +inet(media_common)
- logicd = +inet(logitech_base)
- logicd_it = +inet(logitech_base)
- logicd_nav = +inet(logitech_base)
- logicd_opt = +inet(logitech_base)
- logiultrax = +inet(logitech_base)
- logiclx300 = +inet(logiex110)
- logii350 = +inet(logiex110)
- logimel = +inet(logiex110)
- logicdit = +inet(logicd)
- logicdo = +inet(logicd)
- logicdp = +inet(logicd)
- logicdpa = +inet(logicda)
- logiciink = +inet(logicink)
- ltcd = +inet(logicda)
- microsoftccurve2k = +inet(microsoftprooem)
- microsoftpro = +inet(media_nav_acpi_common)
- precision_m = +inet(media_nav_common)
- scorpius = +inet(media_nav_acpi_common)
- sp_inet = +inet(media_nav_acpi_common)
- targa_v811 = +inet(media_nav_acpi_common)
- thinkpad = +inet(media_nav_common)
- thinkpadz60 = +inet(thinkpad60)
- tm2030USB-102 = +inet(media_nav_acpi_common)
- tm2030USB-106 = +inet(media_nav_acpi_common)
- trust_slimline = +inet(media_nav_acpi_common)
- vsonku306 = +inet(microsoftprooem)
- $inetkbds = +inet(%m)
- $maclaptop = +inet(apple)+level3(enter_switch)
- $applealu = +inet(apple)
- $macs = +inet(apple)
+ a4techKB21 = +inet(media_nav_common)
+ a4techKBS8 = +inet(media_nav_acpi_common)
+ a4_rfkb23 = +inet(media_nav_acpi_common)
+ asus_laptop = +inet(media_common)
+ acer_tm_800 = +inet(acer_laptop)
+ benqx730 = +inet(benqx)
+ benqx800 = +inet(benqx)
+ btc5126t = +inet(nav_acpi_common)
+ btc9116u = +inet(btc9019u)
+ btc6301urf = +inet(media_nav_acpi_common)
+ dellsk8125 = +inet(dell)
+ dellsk8135 = +inet(dell)
+ cherrybunlim = +inet(nav_common)
+ dexxa = +inet(media_nav_common)
+ dtk2000 = +inet(media_nav_acpi_common)
+ fscaa1667g = +inet(media_nav_common)
+ geniuskb19e = +inet(media_nav_acpi_common)
+ geniuscomfy = +inet(media_nav_acpi_common)
+ geniuskkb2050hs = +inet(dellusbmm)
+ hpnx9020 = +inet(hpi6)
+ latitude = +inet(media_common)
+ logicd = +inet(logitech_base)
+ logicd_it = +inet(logitech_base)
+ logicd_nav = +inet(logitech_base)
+ logicd_opt = +inet(logitech_base)
+ logiultrax = +inet(logitech_base)
+ logiclx300 = +inet(logiex110)
+ logii350 = +inet(logiex110)
+ logimel = +inet(logiex110)
+ logicdit = +inet(logicd)
+ logicdo = +inet(logicd)
+ logicdp = +inet(logicd)
+ logicdpa = +inet(logicda)
+ logiciink = +inet(logicink)
+ ltcd = +inet(logicda)
+ microsoftccurve2k = +inet(microsoftprooem)
+ microsoftpro = +inet(media_nav_acpi_common)
+ precision_m = +inet(media_nav_common)
+ scorpius = +inet(media_nav_acpi_common)
+ sp_inet = +inet(media_nav_acpi_common)
+ targa_v811 = +inet(media_nav_acpi_common)
+ thinkpad = +inet(media_nav_common)
+ thinkpadz60 = +inet(thinkpad60)
+ tm2030USB-102 = +inet(media_nav_acpi_common)
+ tm2030USB-106 = +inet(media_nav_acpi_common)
+ trust_slimline = +inet(media_nav_acpi_common)
+ vsonku306 = +inet(microsoftprooem)
+ $inetkbds = +inet(%m)
+ $maclaptop = +inet(apple)+level3(enter_switch)
+ $applealu = +inet(apple)
+ $macs = +inet(apple)
diff --git a/xorg-server/xkeyboard-config/rules/base.ml1_c.part b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
index f59e596d5..0e6147b23 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml1_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
@@ -1 +1 @@
- * * = complete
+ * * = complete
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_c.part b/xorg-server/xkeyboard-config/rules/base.ml_c.part
index ec8f02291..f71278ff1 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_c.part
@@ -1,4 +1,4 @@
- pc98 nec_vndr/jp = pc98(basic)
- * jp = complete+japan
- olpc * = olpc
- * * = complete
+ pc98 nec_vndr/jp = pc98(basic)
+ * jp = complete+japan
+ olpc * = olpc
+ * * = complete
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_g.part b/xorg-server/xkeyboard-config/rules/base.ml_g.part
index e66bb0b50..353bdae23 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_g.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_g.part
@@ -1 +1 @@
- thinkpad us = thinkpad(us)
+ thinkpad us = thinkpad(us)
diff --git a/xorg-server/xkeyboard-config/rules/base.mlv_s.part b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
index 1eecc55c0..2bdd8612b 100644
--- a/xorg-server/xkeyboard-config/rules/base.mlv_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
@@ -1,4 +1,4 @@
- classmate us intl = pc+us(classmate-intl)
- classmate us alt-intl = pc+us(classmate-alt-intl)
- classmate us altgr-intl = pc+us(classmate-altgr-intl)
- nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
+ classmate us intl = pc+us(classmate-intl)
+ classmate us alt-intl = pc+us(classmate-alt-intl)
+ classmate us altgr-intl = pc+us(classmate-altgr-intl)
+ nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.o_t.part b/xorg-server/xkeyboard-config/rules/base.o_t.part
index e0d4b15ed..9b3155e74 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_t.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_t.part
@@ -1,8 +1,8 @@
- caps:internal = +caps(internal)
- caps:internal_nocancel = +caps(internal_nocancel)
- caps:shift = +caps(shift)
- caps:shift_nocancel = +caps(shift_nocancel)
- numpad:pc = +numpad(pc)
- numpad:mac = +numpad(mac)
- numpad:microsoft = +numpad(microsoft)
- numpad:shift3 = +numpad(shift3)
+ caps:internal = +caps(internal)
+ caps:internal_nocancel = +caps(internal_nocancel)
+ caps:shift = +caps(shift)
+ caps:shift_nocancel = +caps(shift_nocancel)
+ numpad:pc = +numpad(pc)
+ numpad:mac = +numpad(mac)
+ numpad:microsoft = +numpad(microsoft)
+ numpad:shift3 = +numpad(shift3)
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
index b2d222432..39e931103 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
@@ -1,18 +1,18 @@
-#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1_s.part
-
-> $OUTFILE
-
-awk '{
- if (index($2, "(") == 0) {
- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
- } else {
- printf " * %s = pc+%s\n", $1, $2;
- }
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh
+
+INDIR=$1
+OUTFILE=base.ml1_s.part
+
+> $OUTFILE
+
+awk '{
+ if (index($2, "(") == 0) {
+ printf " * %s = pc+%s%%(v[1])\n", $1, $2;
+ } else {
+ printf " * %s = pc+%s\n", $1, $2;
+ }
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
+
+awk '{
+ printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
index 7c2b1a84c..6e0d7ed79 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1v1_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh
+
+INDIR=$1
+OUTFILE=base.ml1v1_s.part
+
+> $OUTFILE
+
+awk '{
+ printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
index 084d4c0be..fc904f392 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1v_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh
+
+INDIR=$1
+OUTFILE=base.ml1v_s.part
+
+> $OUTFILE
+
+awk '{
+ printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
index 666ba870f..80515aa84 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
@@ -1,14 +1,14 @@
-#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s = pc+%s\n", $1, $2;
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh
+
+INDIR=$1
+OUTFILE=base.ml_s.part
+
+> $OUTFILE
+
+awk '{
+ printf " * %s = pc+%s\n", $1, $2;
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
+
+awk '{
+ printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
index 5b466d59c..3c10343cc 100644
--- a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.mlv_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh
+
+INDIR=$1
+OUTFILE=base.mlv_s.part
+
+> $OUTFILE
+
+awk '{
+ printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/compat/.gitignore b/xorg-server/xkeyboard-config/rules/compat/.gitignore
new file mode 100644
index 000000000..d207853f2
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/.gitignore
@@ -0,0 +1,6 @@
+base.ml2_s.part
+base.ml2v2_s.part
+base.ml3_s.part
+base.ml3v3_s.part
+base.ml4_s.part
+base.ml4v4_s.part
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
index 64ff0f2f5..d85efe4e7 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
@@ -1 +1 @@
- de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
index fea61be76..fd80f998d 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
@@ -1 +1 @@
- de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
index 5a1fb2f8a..0fc152316 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
@@ -1 +1 @@
- de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
index ac8a91102..8954744ea 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
@@ -1 +1 @@
- de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lists.part b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
index f1cf7ee22..98c54127a 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
@@ -1,2 +1,2 @@
-
-! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
index 64ff0f2f5..d85efe4e7 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
@@ -1 +1 @@
- de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
index 8f1e9e452..8a3cecf3a 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
@@ -1 +1 @@
- grp:shift_toggle = +group(shifts_toggle)
+ grp:shift_toggle = +group(shifts_toggle)
diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
index cecda6d8a..2318de247 100644
--- a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
@@ -1,27 +1,27 @@
-ar ara
-ben in(ben)
-bs ba
-cs rs
-cz_qwerty cz(qwerty)
-dev in(deva)
-dvorak us(dvorak)
-dzdwi bt
-el gr
-en_US latin
-guj in(guj)
-gur in(guru)
-iu ca(ike)
-lo la
-kan in(kan)
-mi mao
-ml in(mal)
-ogham ie(ogam)
-ori ie(ori)
-sapmi no(smi)
-sr srp
-syr sy(syc)
-tel in(tel)
-tml in(tam)
-yu srp
-fr-latin9 fr(latin9)
-us_intl us(alt-intl)
+ar ara
+ben in(ben)
+bs ba
+cs rs
+cz_qwerty cz(qwerty)
+dev in(deva)
+dvorak us(dvorak)
+dzdwi bt
+el gr
+en_US latin
+guj in(guj)
+gur in(guru)
+iu ca(ike)
+lo la
+kan in(kan)
+mi mao
+ml in(mal)
+ogham ie(ogam)
+ori ie(ori)
+sapmi no(smi)
+sr srp
+syr sy(syc)
+tel in(tel)
+tml in(tam)
+yu srp
+fr-latin9 fr(latin9)
+us_intl us(alt-intl)
diff --git a/xorg-server/xkeyboard-config/rules/merge.sh b/xorg-server/xkeyboard-config/rules/merge.sh
index b18af7c3d..be06dfc71 100644
--- a/xorg-server/xkeyboard-config/rules/merge.sh
+++ b/xorg-server/xkeyboard-config/rules/merge.sh
@@ -1,25 +1,25 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-DEST=$1
-shift
-
-if [ -z "$HDR" ]; then
- HDR="HDR"
-fi
-
-basename=`basename $0`
-echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
-
-for i in $*; do
- if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
- echo >> $DEST;
- read hdr
- echo "$hdr" >> $DEST
- elif test -f $i; then
- cat $i >> $DEST || exit 1
- else
- cat $INDIR/$i >> $DEST || exit 1
- fi
-done < $HDR
-
+#!/bin/sh
+
+INDIR=`dirname $0`
+DEST=$1
+shift
+
+if [ -z "$HDR" ]; then
+ HDR="HDR"
+fi
+
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
+
+for i in $*; do
+ if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
+ echo >> $DEST;
+ read hdr
+ echo "$hdr" >> $DEST
+ elif test -f $i; then
+ cat $i >> $DEST || exit 1
+ else
+ cat $INDIR/$i >> $DEST || exit 1
+ fi
+done < $HDR
+
diff --git a/xorg-server/xkeyboard-config/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98
index 1196f7488..88189a7fe 100644
--- a/xorg-server/xkeyboard-config/rules/xfree98
+++ b/xorg-server/xkeyboard-config/rules/xfree98
@@ -1,28 +1,28 @@
-//
-// Rules for resolving XKB components for use with XFree86
-// Copyright 1996 by Joseph Moss
-//
-
-! model = keycodes geometry
- pc98 = xfree98(pc98) nec(pc98)
- jp106 = xfree98(jp106) pc(jp106)
-
-! model layout = symbols
- pc98 nec_vndr/jp = nec_vndr/jp(pc98)
- jp106 jp = jp
-
-! model layout = compat types
- * * = complete complete
-
-! option = symbols
- grp:switch = +group(switch)
- grp:toggle = +group(toggle)
- grp:shift_toggle = +group(shifts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- ctrl:nocaps = +ctrl(nocaps)
- ctrl:lctrl_meta = +ctrl(lctrl_meta)
- ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
-
+//
+// Rules for resolving XKB components for use with XFree86
+// Copyright 1996 by Joseph Moss
+//
+
+! model = keycodes geometry
+ pc98 = xfree98(pc98) nec(pc98)
+ jp106 = xfree98(jp106) pc(jp106)
+
+! model layout = symbols
+ pc98 nec_vndr/jp = nec_vndr/jp(pc98)
+ jp106 jp = jp
+
+! model layout = compat types
+ * * = complete complete
+
+! option = symbols
+ grp:switch = +group(switch)
+ grp:toggle = +group(toggle)
+ grp:shift_toggle = +group(shifts_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ ctrl:nocaps = +ctrl(nocaps)
+ ctrl:lctrl_meta = +ctrl(lctrl_meta)
+ ctrl:swapcaps = +ctrl(swapcaps)
+ ctrl:ctrl_ac = +ctrl(ctrl_ac)
+ ctrl:ctrl_aa = +ctrl(ctrl_aa)
+