rules: sort some keyboard names alphabetically, and align some stuff

Vertically align the rules in several of the files, using tab size 8.

Also fix a typo in a Cherry keyboard name.

19 files changed, 77 insertions, 75 deletions

diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part
index 7505944..c97cd69 100644
--- a/rules/0002-base.lists.part
+++ b/rules/0002-base.lists.part
@@ -1,5 +1,5 @@
 ! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
-              airkey \
+              airkey apex300 \
               apple armada azonaRF2300 \
               benqx brother \
               btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
@@ -10,38 +10,35 @@
               compaqeak8 compaqik7 compaqik13 compaqik18 \
               creativedw7000 \
               cymotionlinux \
-              dell dellm65 inspiron dellusbmm \
+              dell dellm65 dellusbmm \
               emachines ennyah_dkb1008 evdev \
               genius geniuscomfy2 \
               gyration honeywell_euroboard \
               hp250x hp5xx hp500fa hpdv5 \
               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
-              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 \
+              ibm_spacesaver inspiron intel ipaq itouch \
+              logiaccess logicda logicink logiclx300 \
+              logidinovo logidinovoedge logiex110 \
+              logiik logiinkse logiinkseusb logiitc \
+              logitech_base logitech_g15 logiultrax \
+              microsoft4000 microsoft7000 microsoftinet microsoftmult \
+              microsoftoffice microsoftprooem microsoftprose microsoftprousb \
               mx1998 mx2500 mx2750 \
               oretec \
               pc105 \
               presario propeller \
               qtronix \
-              rapidaccess rapidaccess2 thinkpad60 \
+              rapidaccess rapidaccess2 \
               samsung4500 samsung4510 \
               silvercrest \
               sk1300 sk2500 sk6200 sk7100 \
               sven sven303 symplon \
-              teck227 teck229 \
+              teck227 teck229 thinkpad60 \
               toshiba_s3000 trust trustda \
-              unitekkb1925 yahoo \
-              apex300
+              unitekkb1925 yahoo
 
 ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
-		cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
+		cherrybluea cherrycyboard chicony042 compaqik13 compaqik18 \
 		armada presario dellm65 inspiron dellusbmm diamond \
 		ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
 		hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
diff --git a/rules/0004-base.m_k.part b/rules/0004-base.m_k.part
index 08c5c51..e779701 100644
--- a/rules/0004-base.m_k.part
+++ b/rules/0004-base.m_k.part
@@ -1,13 +1,13 @@
 ! model		=	keycodes
   amiga		=	amiga(de)
   ataritt	=	ataritt(de)
-  empty         =       empty
+  empty		=	empty
  $sun_jp	=	sun(type6_jp_usb)
  $sun		=	sun(type6_usb)
   pc98		=	xfree98(pc98)
  $applealu	=	macintosh(alukbd)
   macintosh_hhk	=	macintosh(hhk)
   macintosh_old	=	macintosh(old)
- $macs   	=	macintosh
+ $macs		=	macintosh
   thinkpadz60	=	xfree86(thinkpadz60)
   *		=	xfree86
diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.m_k.part
index 2f98057..1cff7b2 100644
--- a/rules/0004-evdev.m_k.part
+++ b/rules/0004-evdev.m_k.part
@@ -1,6 +1,6 @@
 ! model		=	keycodes
   applealu_jis	=	evdev+macintosh(jisevdev)
- $jollamodels   =       evdev+jolla(jolla)
-  olpc          =       evdev+olpc(olpc)
-  olpcm         =       evdev+olpc(olpcm)
+ $jollamodels	=	evdev+jolla(jolla)
+  olpc		=	evdev+olpc(olpc)
+  olpcm		=	evdev+olpc(olpcm)
   *		=	evdev
diff --git a/rules/0008-ml_g.part b/rules/0008-ml_g.part
index 66cac54..14e56d2 100644
--- a/rules/0008-ml_g.part
+++ b/rules/0008-ml_g.part
@@ -1,2 +1,2 @@
 ! model		layout	=	geometry
-  thinkpad     us              =       thinkpad(us)
+  thinkpad	us	=	thinkpad(us)
diff --git a/rules/0011-mlv_s.part b/rules/0011-mlv_s.part
index b2e5023..3343704 100644
--- a/rules/0011-mlv_s.part
+++ b/rules/0011-mlv_s.part
@@ -3,4 +3,4 @@
   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)
-  *			$sun_custom	$sun_var	=	pc+sun_vndr/%l%(v)
+  *		$sun_custom	$sun_var	=	pc+sun_vndr/%l%(v)
diff --git a/rules/0013-ml_s.part b/rules/0013-ml_s.part
index 7708f4c..4cf2ca1 100644
--- a/rules/0013-ml_s.part
+++ b/rules/0013-ml_s.part
@@ -1,12 +1,12 @@
-! model		layout				=	symbols
+! model		layout			=	symbols
   ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
   ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
   amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
   classmate	us			=	pc+%l(classmate)
-  empty         *                       =       empty(basic)
-  *             empty                   =       empty(basic)
-  jollasbj 	$nonlatin		=	jolla_vndr/sbj(common)+us+%l%(v):2
+  empty		*			=	empty(basic)
+  *		empty			=	empty(basic)
+  jollasbj	$nonlatin		=	jolla_vndr/sbj(common)+us+%l%(v):2
   jollasbj	*			=	jolla_vndr/sbj(common)+%l%(v)
  $sun		$sun_custom		=	pc+sun_vndr/%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
@@ -29,11 +29,11 @@
   olpc		*			=	olpc+%l%(v)
   olpcm		$olpclayouts		=	olpc+%l%(m)
   olpcm		*			=	olpc+%l%(v)
- $thinkpads   	br			=	pc+br(thinkpad)
+ $thinkpads	br			=	pc+br(thinkpad)
   sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
   ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
   ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
   ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
   ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
-  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
diff --git a/rules/0015-ml1_s.part b/rules/0015-ml1_s.part
index 667eb19..7abf55f 100644
--- a/rules/0015-ml1_s.part
+++ b/rules/0015-ml1_s.part
@@ -1,8 +1,8 @@
-! model		layout[1]	=	symbols
+! model		layout[1]		=	symbols
   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])
- $sun		$sun_custom	=	pc+sun_vndr/%l[1]%(v[1])
+ $sun		$sun_custom		=	pc+sun_vndr/%l[1]%(v[1])
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
diff --git a/rules/0018-ml2_s.part b/rules/0018-ml2_s.part
index 0aaa8d6..1b32252 100644
--- a/rules/0018-ml2_s.part
+++ b/rules/0018-ml2_s.part
@@ -1,5 +1,5 @@
 ! model		layout[2]	=	symbols
   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
+ $sun		$sun_custom	=	+sun_vndr/%l[2]%(v[2]):2
   *		*		=	+%l[2]%(v[2]):2
diff --git a/rules/0020-ml3_s.part b/rules/0020-ml3_s.part
index ccd8f92..eccb08e 100644
--- a/rules/0020-ml3_s.part
+++ b/rules/0020-ml3_s.part
@@ -1,5 +1,5 @@
 ! model		layout[3]	=	symbols
   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
+ $sun		$sun_custom	=	+sun_vndr/%l[3]%(v[3]):3
   *		*		=	+%l[3]%(v[3]):3
diff --git a/rules/0022-ml4_s.part b/rules/0022-ml4_s.part
index 34693c5..daf0775 100644
--- a/rules/0022-ml4_s.part
+++ b/rules/0022-ml4_s.part
@@ -1,5 +1,5 @@
 ! model		layout[4]	=	symbols
   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
+ $sun		$sun_custom	=	+sun_vndr/%l[4]%(v[4]):4
   *		*		=	+%l[4]%(v[4]):4
diff --git a/rules/0027-base.ml_s1.part b/rules/0027-base.ml_s1.part
index 8c75c39..55bac5f 100644
--- a/rules/0027-base.ml_s1.part
+++ b/rules/0027-base.ml_s1.part
@@ -1,2 +1,2 @@
 ! model		layout		=	symbols
- $inetmediakbds	jp	=	+jp(henkan)
+ $inetmediakbds	jp		=	+jp(henkan)
diff --git a/rules/0036-lo_s.part b/rules/0036-lo_s.part
index 5c6d427..f4f0536 100644
--- a/rules/0036-lo_s.part
+++ b/rules/0036-lo_s.part
@@ -1,7 +1,8 @@
-! layout	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
-  *			lv3:ralt_alt	= +level3(ralt_alt)
-  *			misc:typo 	= +typo(base)
-  *			misc:apl	= +apl(level3)
+! layout		option			= symbols
+
+  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle)
+  *			lv3:ralt_alt		= +level3(ralt_alt)
+  *			misc:typo		= +typo(base)
+  *			misc:apl		= +apl(level3)
   *			grp:win_space_toggle	= +group(win_space_toggle)
   *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle)
diff --git a/rules/0037-l1o_s.part b/rules/0037-l1o_s.part
index 84a03e0..3f36a94 100644
--- a/rules/0037-l1o_s.part
+++ b/rules/0037-l1o_s.part
@@ -1,7 +1,8 @@
-! layout[1]	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
-  *			lv3:ralt_alt	= +level3(ralt_alt):1
-  *			misc:typo 	= +typo(base):1
-  *			misc:apl	= +apl(level3):1
+! layout[1]		option			= symbols
+
+  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):1
+  *			lv3:ralt_alt		= +level3(ralt_alt):1
+  *			misc:typo		= +typo(base):1
+  *			misc:apl		= +apl(level3):1
   *			grp:win_space_toggle	= +group(win_space_toggle):1
   *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle):1
diff --git a/rules/0038-l2o_s.part b/rules/0038-l2o_s.part
index 41a35a0..3f0a0e0 100644
--- a/rules/0038-l2o_s.part
+++ b/rules/0038-l2o_s.part
@@ -1,7 +1,8 @@
-! layout[2]	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
-  *			lv3:ralt_alt	= +level3(ralt_alt):2
-  *			misc:typo 	= +typo(base):2
-  *			misc:apl	= +apl(level3):2
+! layout[2]		option			= symbols
+
+  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):2
+  *			lv3:ralt_alt		= +level3(ralt_alt):2
+  *			misc:typo		= +typo(base):2
+  *			misc:apl		= +apl(level3):2
   *			grp:win_space_toggle	= +group(win_space_toggle):2
   *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle):2
diff --git a/rules/0039-l3o_s.part b/rules/0039-l3o_s.part
index 9db4765..df02acf 100644
--- a/rules/0039-l3o_s.part
+++ b/rules/0039-l3o_s.part
@@ -1,7 +1,8 @@
-! layout[3]	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
-  *			lv3:ralt_alt	= +level3(ralt_alt):3
-  *			misc:typo 	= +typo(base):3
-  *			misc:apl	= +apl(level3):3
+! layout[3]		option			= symbols
+
+  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):3
+  *			lv3:ralt_alt		= +level3(ralt_alt):3
+  *			misc:typo		= +typo(base):3
+  *			misc:apl		= +apl(level3):3
   *			grp:win_space_toggle	= +group(win_space_toggle):3
   *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle):3
diff --git a/rules/0040-l4o_s.part b/rules/0040-l4o_s.part
index 70e685c..733d30c 100644
--- a/rules/0040-l4o_s.part
+++ b/rules/0040-l4o_s.part
@@ -1,7 +1,8 @@
-! layout[4]	option	=	symbols
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
-  *			lv3:ralt_alt	= +level3(ralt_alt):4
-  *			misc:typo 	= +typo(base):4
-  *			misc:apl	= +apl(level3):4
+! layout[4]		option			= symbols
+
+  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):4
+  *			lv3:ralt_alt		= +level3(ralt_alt):4
+  *			misc:typo		= +typo(base):4
+  *			misc:apl		= +apl(level3):4
   *			grp:win_space_toggle	= +group(win_space_toggle):4
   *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle):4
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part
index 9218c65..59da684 100644
--- a/rules/0042-o_s.part
+++ b/rules/0042-o_s.part
@@ -1,4 +1,4 @@
-! option	=	symbols
+! option		=	symbols
   altwin:menu		=	+altwin(menu)
   altwin:menu_win	=	+altwin(menu_win)
   altwin:meta_alt	=	+altwin(meta_alt)
@@ -25,11 +25,11 @@
   grp:ctrls_toggle	=	+group(ctrls_toggle)
   grp:alts_toggle	=	+group(alts_toggle)
   grp:caps_toggle	=	+capslock(grouplock)
-  grp:caps_switch       =       +capslock(groupshift)
+  grp:caps_switch	=	+capslock(groupshift)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)
   grp:shift_caps_switch	=	+group(shift_caps_switch)
   grp:win_menu_switch	=	+group(win_menu_switch)
-  grp:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:alt_caps_toggle	=	+group(alt_caps_toggle)
   grp:alt_space_toggle	=	+group(alt_space_toggle)
   grp:menu_toggle	=	+group(menu_toggle)
   grp:lwin_toggle	=	+group(lwin_toggle)
@@ -43,19 +43,19 @@
   grp:sclk_toggle	=	+group(sclk_toggle)
   grp:lctrl_rctrl_switch	=	+group(lctrl_rctrl_switch)
   grp:lctrl_lwin_rctrl_menu	=	+group(lctrl_lwin_rctrl_menu)
-  grp:lctrl_lalt_toggle	=	+group(lctrl_lalt_toggle)
-  grp:rctrl_ralt_toggle	=	+group(rctrl_ralt_toggle)
-  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:lctrl_lalt_toggle		=	+group(lctrl_lalt_toggle)
+  grp:rctrl_ralt_toggle		=	+group(rctrl_ralt_toggle)
+  grp:ctrl_alt_toggle		=	+group(ctrl_alt_toggle)
   grp:ctrl_alt_toggle_bidir	=	+group(ctrl_alt_toggle_bidir)
   grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
   grp:rctrl_rshift_toggle	=	+group(rctrl_rshift_toggle)
-  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:ctrl_shift_toggle		=	+group(ctrl_shift_toggle)
   grp:ctrl_shift_toggle_bidir	=	+group(ctrl_shift_toggle_bidir)
   grp:lalt_lshift_toggle	=	+group(lalt_lshift_toggle)
   grp:ralt_rshift_toggle	=	+group(ralt_rshift_toggle)
-  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:alt_shift_toggle		=	+group(alt_shift_toggle)
   grp:alt_shift_toggle_bidir	=	+group(alt_shift_toggle_bidir)
-  grp:lctrl_lwin_toggle	=	+group(lctrl_lwin_toggle)
+  grp:lctrl_lwin_toggle		=	+group(lctrl_lwin_toggle)
   lv3:switch		=	+level3(switch)
   lv3:ralt_switch	=	+level3(ralt_switch)
   lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
@@ -118,8 +118,8 @@
   eurosign:2		=	+eurosign(2)
   eurosign:4		=	+eurosign(4)
   eurosign:5		=	+eurosign(5)
-  rupeesign:4           =       +rupeesign(4)
-  keypad:oss            =       +keypad(oss)
+  rupeesign:4		=	+rupeesign(4)
+  keypad:oss		=	+keypad(oss)
   keypad:legacy         =	+keypad(legacy)
   keypad:legacy_wang    =	+keypad(legacy_wang)
   keypad:oss_wang       =	+keypad(oss_wang)
diff --git a/rules/0043-o_c.part b/rules/0043-o_c.part
index d3e8a46..198c752 100644
--- a/rules/0043-o_c.part
+++ b/rules/0043-o_c.part
@@ -1,9 +1,9 @@
-! option	=	compat
+! option		=	compat
   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)
+  grab:break_actions	=	+xfree86(grab_break)
 
diff --git a/rules/0044-o_t.part b/rules/0044-o_t.part
index a43a993..aa12056 100644
--- a/rules/0044-o_t.part
+++ b/rules/0044-o_t.part
@@ -1,4 +1,4 @@
-! option	=	types
+! option			=	types
   caps:internal			=	+caps(internal)
   caps:internal_nocancel	=	+caps(internal_nocancel)
   caps:shift			=	+caps(shift)
@@ -6,4 +6,4 @@
   numpad:pc			=	+numpad(pc)
   numpad:mac			=	+numpad(mac)
   numpad:microsoft		=	+numpad(microsoft)
-  numpad:shift3       		=	+numpad(shift3)
+  numpad:shift3			=	+numpad(shift3)