From 159ce0d5e9f66f74e483a6aff6de889250ba7fc7 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 18 Jul 2004 00:56:42 +0000
Subject: [PATCH] better empty line handling between rule groups

---
 rules/Makefile.am     | 2 +-
 rules/base            | 1 -
 rules/base.l1_k.part  | 1 +
 rules/base.l2_s.part  | 1 +
 rules/base.l3_s.part  | 1 +
 rules/base.l4_s.part  | 1 +
 rules/base.l_k.part   | 1 +
 rules/base.lists.part | 1 +
 rules/base.m_g.part   | 1 +
 rules/base.m_k.part   | 1 +
 rules/base.m_s.part   | 1 +
 rules/base.m_t.part   | 1 +
 rules/base.ml1_c.part | 1 +
 rules/base.ml1_s.part | 1 +
 rules/base.ml_c.part  | 1 +
 rules/base.ml_s.part  | 1 +
 rules/base.mvl_s.part | 1 +
 rules/base.o_c.part   | 1 +
 rules/base.o_s.part   | 1 +
 rules/base.o_t.part   | 1 +
 20 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/rules/Makefile.am b/rules/Makefile.am
index 7e79f4f..5d45843 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -31,7 +31,7 @@ lst_files = base.lst
 
 base: $(base_parts)
 	> $@
-	for i in $^; do cat $$i >> $@; echo >> $@; done
+	for i in $^; do cat $$i >> $@; done
 
 all_rules_files = $(rules_files) $(lst_files) \
 xkb.dtd README
diff --git a/rules/base b/rules/base
index 7068af9..380770b 100644
--- a/rules/base
+++ b/rules/base
@@ -191,4 +191,3 @@
   caps:shift			=	+caps(shift)
   caps:shift_nocancel		=	+caps(shift_nocancel)
   numpad:microsoft		=	+numpad(microsoft)
-
diff --git a/rules/base.l1_k.part b/rules/base.l1_k.part
index 3f2146a..4ef5359 100644
--- a/rules/base.l1_k.part
+++ b/rules/base.l1_k.part
@@ -1,3 +1,4 @@
+
 ! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
   $qwertz       =       +aliases(qwertz)
diff --git a/rules/base.l2_s.part b/rules/base.l2_s.part
index c6d5a7b..e770056 100644
--- a/rules/base.l2_s.part
+++ b/rules/base.l2_s.part
@@ -1,2 +1,3 @@
+
 ! layout[2]	=	symbols
   *		=	+%l[2]%(v[2]):2
diff --git a/rules/base.l3_s.part b/rules/base.l3_s.part
index aa7a7ea..51e99fa 100644
--- a/rules/base.l3_s.part
+++ b/rules/base.l3_s.part
@@ -1,2 +1,3 @@
+
 ! layout[3]	=	symbols
   *		=	+%l[3]%(v[3]):3
diff --git a/rules/base.l4_s.part b/rules/base.l4_s.part
index d8df5c8..d4585c6 100644
--- a/rules/base.l4_s.part
+++ b/rules/base.l4_s.part
@@ -1,2 +1,3 @@
+
 ! layout[4]	=	symbols
   *		=	+%l[4]%(v[4]):4
diff --git a/rules/base.l_k.part b/rules/base.l_k.part
index a095517..9e9fa73 100644
--- a/rules/base.l_k.part
+++ b/rules/base.l_k.part
@@ -1,3 +1,4 @@
+
 ! layout	=	keycodes
   $azerty       =       +aliases(azerty)
   $qwertz       =       +aliases(qwertz)
diff --git a/rules/base.lists.part b/rules/base.lists.part
index 9159afb..959b550 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -1,3 +1,4 @@
+
 // If you want non-latin layouts implicitly include the en_US layout
 // uncomment lines below
 //! $nonlatin = am ara ben bg by deva ge gr guj guru il \
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 1473228..d305a71 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -1,3 +1,4 @@
+
 ! model 	=	geometry
   microsoft	=	microsoft(natural)
   microsoftpro	=	microsoft(natural)
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index fa6f342..b043241 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -1,3 +1,4 @@
+
 ! model 	=	keycodes
   macintosh_old	=	macintosh
   powerpcps2	=	powerpcps2
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 004fa20..5cb9e13 100644
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -1,2 +1,3 @@
+
 ! model         =       symbols
   $inetkbds     =       +inet(%m)
diff --git a/rules/base.m_t.part b/rules/base.m_t.part
index b8d10a2..68c8bca 100644
--- a/rules/base.m_t.part
+++ b/rules/base.m_t.part
@@ -1,2 +1,3 @@
+
 ! model		=	types
   *		=	complete
diff --git a/rules/base.ml1_c.part b/rules/base.ml1_c.part
index fe5c576..d8b8edd 100644
--- a/rules/base.ml1_c.part
+++ b/rules/base.ml1_c.part
@@ -1,2 +1,3 @@
+
 ! model	     layout[1]	=	compat
   *		*	=	complete
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 21b8eb5..7f39d3d 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -1,3 +1,4 @@
+
 ! model	    layout[1]	=	symbols
  $pcmodels	*	=	pc(%m)+%l[1]%(v[1])
   *		*	=	pc(pc105)+%l[1]%(v[1])
diff --git a/rules/base.ml_c.part b/rules/base.ml_c.part
index a74a1a6..84a736b 100644
--- a/rules/base.ml_c.part
+++ b/rules/base.ml_c.part
@@ -1,3 +1,4 @@
+
 ! model		layout	=	compat
   pc98		nec/jp	=	pc98(basic)
   *		*	=	complete
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 69b2f40..2aed1f3 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -1,3 +1,4 @@
+
 ! model		layout	=	symbols
   pc98		nec/jp	=	nec_vndr/jp(pc98)
   abnt2		br	=	pc(pc104)+br
diff --git a/rules/base.mvl_s.part b/rules/base.mvl_s.part
index ef2e068..93893aa 100644
--- a/rules/base.mvl_s.part
+++ b/rules/base.mvl_s.part
@@ -1,3 +1,4 @@
+
 ! model		variant		layout	=	symbols
  $maclaptop	nodeadkeys	*	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)+macintosh_vndr/apple(laptop_bad_switch)
  $mac		nodeadkeys	*	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
diff --git a/rules/base.o_c.part b/rules/base.o_c.part
index 9a707d5..01ddad4 100644
--- a/rules/base.o_c.part
+++ b/rules/base.o_c.part
@@ -1,3 +1,4 @@
+
 ! option		=	compat
   grp_led:num		=	+leds(num)
   grp_led:caps		=	+leds(caps)
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index d8a106d..b451f2e 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -1,3 +1,4 @@
+
 ! option		=	symbols
   grp:switch		=	+group(switch)
   grp:lswitch		=	+group(lswitch)
diff --git a/rules/base.o_t.part b/rules/base.o_t.part
index 8a4083b..65b43d5 100644
--- a/rules/base.o_t.part
+++ b/rules/base.o_t.part
@@ -1,3 +1,4 @@
+
 ! option			=	types
   caps:internal			=	+caps(internal)
   caps:internal_nocancel	=	+caps(internal_nocancel)
-- 
2.32.0.93.g670b81a890