Now, we compoze the parts using bash script

20 files changed, 55 insertions, 54 deletions

diff --git a/rules/HDR b/rules/HDR
new file mode 100644
index 00000000..ca662731
--- /dev/null
+++ b/rules/HDR
@@ -0,0 +1,17 @@
+! model		=	keycodes
+! layout[1]	=	keycodes
+! layout	=	keycodes
+! model		=	geometry
+! model		variant		layout	=	symbols
+! model		layout			=	symbols
+! model		layout[1]		=	symbols
+! layout[2]	=	symbols
+! layout[3]	=	symbols
+! layout[4]	=	symbols
+! model		=	symbols
+! model		layout		=	compat
+! model		layout[1]	=	compat
+! model		=	types
+! option	=	symbols
+! option	=	compat
+! option	=	types
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 5df5441f..f3bbf161 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -18,25 +18,25 @@ endif
 if USE_COMPAT_RULES
 base_parts = base.hdr.part  base.lists.part \
 compat/base.lists.part \
-base.m_k.part base.l1_k.part base.l_k.part  \
-base.m_g.part base.mvl_s.part \
-base.ml_s.part compat/base.ml_s.part \
-base.ml1_s.part compat/base.ml1_s.part \
-base.l2_s.part compat/base.l2_s.part \
-base.l3_s.part compat/base.l3_s.part \
-base.l4_s.part compat/base.l4_s.part \
-base.m_s.part base.ml_c.part base.ml1_c.part \
-base.m_t.part \
-base.o_s.part base.o_c.part base.o_t.part
+HDR base.m_k.part   HDR base.l1_k.part        HDR base.l_k.part  \
+HDR base.m_g.part   HDR base.mvl_s.part \
+HDR compat/base.ml_s.part base.ml_s.part  \
+HDR compat/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.l2_s.part base.l2_s.part  \
+HDR compat/base.l3_s.part base.l3_s.part  \
+HDR compat/base.l4_s.part base.l4_s.part  \
+HDR base.m_s.part   HDR base.ml_c.part        HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.o_s.part   HDR base.o_c.part         HDR base.o_t.part
 else
 base_parts = base.hdr.part  base.lists.part \
-base.m_k.part base.l1_k.part base.l_k.part  \
-base.m_g.part base.mvl_s.part base.ml_s.part \
-base.ml1_s.part \
-base.l2_s.part base.l3_s.part base.l4_s.part \
-base.m_s.part base.ml_c.part base.ml1_c.part \
-base.m_t.part \
-base.o_s.part base.o_c.part base.o_t.part
+HDR base.m_k.part   HDR base.l1_k.part  HDR base.l_k.part  \
+HDR base.m_g.part   HDR base.mvl_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part \
+HDR base.l2_s.part  HDR base.l3_s.part  HDR base.l4_s.part \
+HDR base.m_s.part   HDR base.ml_c.part  HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.o_s.part   HDR base.o_c.part   HDR base.o_t.part
 endif
 
 rules_files = base sgi sun xfree98
@@ -47,8 +47,7 @@ lst_files = base.lst
 	perl xml2lst.pl < $< > $@
 
 base: $(base_parts)
-	> $@
-	for i in $^; do cat $$i >> $@; done
+	./merge.sh $@ $+
 
 all_rules_files = $(rules_files) $(lst_files) \
 xkb.dtd README
@@ -58,7 +57,7 @@ rules_DATA = $(all_rules_files)
 xml_in_files = base.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml) 
 
-EXTRA_DIST= $(all_rules_files) $(xml_in_files) $(base_parts) xml2lst.pl
+EXTRA_DIST= $(all_rules_files) $(xml_in_files) $(base_parts) xml2lst.pl merge.sh
 
 rulesdir = $(xkb_base)/rules
 xmldir = $(rulesdir)
diff --git a/rules/base.l1_k.part b/rules/base.l1_k.part
index 4ef53594..91b77539 100644
--- a/rules/base.l1_k.part
+++ b/rules/base.l1_k.part
@@ -1,5 +1,3 @@
-
-! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
   $qwertz       =       +aliases(qwertz)
   *             =       +aliases(qwerty)
diff --git a/rules/base.l2_s.part b/rules/base.l2_s.part
index e7700560..03a7aafe 100644
--- a/rules/base.l2_s.part
+++ b/rules/base.l2_s.part
@@ -1,3 +1 @@
-
-! layout[2]	=	symbols
   *		=	+%l[2]%(v[2]):2
diff --git a/rules/base.l3_s.part b/rules/base.l3_s.part
index 51e99fad..0947c11f 100644
--- a/rules/base.l3_s.part
+++ b/rules/base.l3_s.part
@@ -1,3 +1 @@
-
-! layout[3]	=	symbols
   *		=	+%l[3]%(v[3]):3
diff --git a/rules/base.l4_s.part b/rules/base.l4_s.part
index d4585c67..23ccc22e 100644
--- a/rules/base.l4_s.part
+++ b/rules/base.l4_s.part
@@ -1,3 +1 @@
-
-! layout[4]	=	symbols
   *		=	+%l[4]%(v[4]):4
diff --git a/rules/base.l_k.part b/rules/base.l_k.part
index 9e9fa73a..91b77539 100644
--- a/rules/base.l_k.part
+++ b/rules/base.l_k.part
@@ -1,5 +1,3 @@
-
-! layout	=	keycodes
   $azerty       =       +aliases(azerty)
   $qwertz       =       +aliases(qwertz)
   *             =       +aliases(qwerty)
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index d305a718..4c07434c 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -1,5 +1,3 @@
-
-! model 	=	geometry
   microsoft	=	microsoft(natural)
   microsoftpro	=	microsoft(natural)
   microsoftprousb =	microsoft(natural)
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index b0432411..4c8c38b0 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -1,5 +1,3 @@
-
-! model 	=	keycodes
   macintosh_old	=	macintosh
   powerpcps2	=	powerpcps2
   pc98		=	xfree98(pc98)
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 5cb9e13a..97dd9f35 100644
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -1,3 +1 @@
-
-! model         =       symbols
   $inetkbds     =       +inet(%m)
diff --git a/rules/base.m_t.part b/rules/base.m_t.part
index 68c8bca7..24a11f1e 100644
--- a/rules/base.m_t.part
+++ b/rules/base.m_t.part
@@ -1,3 +1 @@
-
-! model		=	types
   *		=	complete
diff --git a/rules/base.ml1_c.part b/rules/base.ml1_c.part
index d8b8edd2..b7759d9a 100644
--- a/rules/base.ml1_c.part
+++ b/rules/base.ml1_c.part
@@ -1,3 +1 @@
-
-! model	     layout[1]	=	compat
   *		*	=	complete
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 7f39d3d0..2fd73fb6 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -1,4 +1,2 @@
-
-! 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 84a736b2..2c0df93e 100644
--- a/rules/base.ml_c.part
+++ b/rules/base.ml_c.part
@@ -1,4 +1,2 @@
-
-! model		layout	=	compat
   pc98		nec/jp	=	pc98(basic)
   *		*	=	complete
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 2aed1f3b..85fbf047 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -1,5 +1,3 @@
-
-! model		layout	=	symbols
   pc98		nec/jp	=	nec_vndr/jp(pc98)
   abnt2		br	=	pc(pc104)+br
  $maclaptop	us	=	macintosh_vndr/us(extended)+macintosh_vndr/apple(laptop_bad_switch)
diff --git a/rules/base.mvl_s.part b/rules/base.mvl_s.part
index 93893aaa..6b198e16 100644
--- a/rules/base.mvl_s.part
+++ b/rules/base.mvl_s.part
@@ -1,4 +1,2 @@
-
-! 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 01ddad47..b632f2f7 100644
--- a/rules/base.o_c.part
+++ b/rules/base.o_c.part
@@ -1,5 +1,3 @@
-
-! option		=	compat
   grp_led:num		=	+leds(num)
   grp_led:caps		=	+leds(caps)
   grp_led:scroll	=	+leds(scroll)
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index b451f2e0..4144dffd 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -1,5 +1,3 @@
-
-! option		=	symbols
   grp:switch		=	+group(switch)
   grp:lswitch		=	+group(lswitch)
   grp:win_switch	=	+group(win_switch)
diff --git a/rules/base.o_t.part b/rules/base.o_t.part
index 65b43d56..d2efaaef 100644
--- a/rules/base.o_t.part
+++ b/rules/base.o_t.part
@@ -1,5 +1,3 @@
-
-! option			=	types
   caps:internal			=	+caps(internal)
   caps:internal_nocancel	=	+caps(internal_nocancel)
   caps:shift			=	+caps(shift)
diff --git a/rules/merge.sh b/rules/merge.sh
new file mode 100755
index 00000000..35410b18
--- /dev/null
+++ b/rules/merge.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+DEST=$1
+shift
+
+lineNo=0
+
+> $DEST
+
+for i in $*; do
+  if [ "$i" == "HDR" ] ; then
+    echo >> $DEST;
+    lineNo=$((lineNo + 1))
+    head -$lineNo HDR | tail -1 >> $DEST
+  else
+    cat $i >> $DEST;
+  fi
+done
+