12 files changed, 51 insertions, 131 deletions
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
index 20bf3d9a1..755be6d07 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -1,17 +1,10 @@
 
-transform_files=layoutRename.lst variantRename.lst
-
-transform_scripts= \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
+transform_files=layoutsMapping.lst variantsMapping.lst
 
 dist_parts=base.o_s.part
 
+scripts_dir=$(srcdir)/../bin
+
 scripts= \
 base.l2_s.part \
 base.l3_s.part \
@@ -35,36 +28,36 @@ noinst_SCRIPTS=
 
 endif
 
-base.l2_s.part: ln_s.sh $(transform_files)
-	sh $< 2
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
 
-base.l3_s.part: ln_s.sh $(transform_files)
-	sh $< 3
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
 
-base.l4_s.part: ln_s.sh $(transform_files)
-	sh $< 4
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
 
-base.l2v2_s.part: lnv_s.sh $(transform_files)
-	sh $< 2
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
 
-base.l3v3_s.part: lnv_s.sh $(transform_files)
-	sh $< 3
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
 
-base.l4v4_s.part: lnv_s.sh $(transform_files)
-	sh $< 4
+base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
 
-base.ml_s.part: ml_s.sh $(transform_files)
-	sh $<
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.ml1_s.part: ml1_s.sh $(transform_files)
-	sh $<
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.mlv_s.part: mlv_s.sh $(transform_files)
-	sh $<
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
-	sh $<
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts)
 
 CLEANFILES=$(scripts)
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in
index 1488a728d..f78214247 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in
@@ -154,17 +154,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
-transform_files = layoutRename.lst variantRename.lst
-transform_scripts = \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
-
+transform_files = layoutsMapping.lst variantsMapping.lst
 dist_parts = base.o_s.part
+scripts_dir = $(srcdir)/../bin
 scripts = \
 base.l2_s.part \
 base.l3_s.part \
@@ -180,7 +172,7 @@ base.ml_s.part
 
 @USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = 
 @USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(scripts) $(dist_parts)
-EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+EXTRA_DIST = base.lists.part $(transform_files) $(dist_parts)
 CLEANFILES = $(scripts)
 all: all-am
 
@@ -343,35 +335,35 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
-base.l2_s.part: ln_s.sh $(transform_files)
-	sh $< 2
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
 
-base.l3_s.part: ln_s.sh $(transform_files)
-	sh $< 3
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
 
-base.l4_s.part: ln_s.sh $(transform_files)
-	sh $< 4
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
 
-base.l2v2_s.part: lnv_s.sh $(transform_files)
-	sh $< 2
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
 
-base.l3v3_s.part: lnv_s.sh $(transform_files)
-	sh $< 3
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
 
-base.l4v4_s.part: lnv_s.sh $(transform_files)
-	sh $< 4
+base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
 
-base.ml_s.part: ml_s.sh $(transform_files)
-	sh $<
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.ml1_s.part: ml1_s.sh $(transform_files)
-	sh $<
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.mlv_s.part: mlv_s.sh $(transform_files)
-	sh $<
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+	sh $< $(srcdir)
 
-base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
-	sh $<
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+	sh $< $(srcdir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst
index cecda6d8a..cecda6d8a 100644
--- a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst
+++ b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
deleted file mode 100644
index 6fc8f4713..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-set variant=%1
-
-set OUTFILE=base.l%variant%_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ if (index($2, """(""") == 0) { printf """  %%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;} else { printf """  %%s		=	+%%s:%variant%\n""", $1, $2; } }" layoutRename.lst >> %OUTFILE%
-
-gawk "{ printf """  %%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
deleted file mode 100644
index a2b828803..000000000
--- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-set variant=%1
-
-set OUTFILE=base.l%variant%v%variant%_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ printf """  %%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile
index 1abfe775f..4a1a7b832 100644
--- a/xorg-server/xkbdata.src/rules/compat/makefile
+++ b/xorg-server/xkbdata.src/rules/compat/makefile
@@ -1,14 +1,6 @@
+TRANSFORM_FILES=layoutsMapping.lst variantsMapping.lst
 
-TRANSFORM_FILES=layoutRename.lst variantRename.lst
-
-TRANSFORM_SCRIPTS= \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
+scripts_dir=..\bin
 
 SCRIPTS= \
 base.l2_s.part \
@@ -25,7 +17,7 @@ base.ml_s.part
 
 SH=cmd /c
 
-%.bat: %.sh
+%.bat: $(scripts_dir)\%.sh
 	copy $< $@
 
 base.l2_s.part: ln_s.bat $(TRANSFORM_FILES)
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
deleted file mode 100644
index dedccdb45..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-set OUTFILE=base.ml1_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{if (index($2, """(""") == 0) { printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """  *		%%s			=	pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE%
-
-gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
deleted file mode 100644
index 26de0ea38..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-set OUTFILE=base.ml1v1_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
deleted file mode 100644
index afd7d7b19..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-set OUTFILE=base.ml1v_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
deleted file mode 100644
index c0b945a26..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-set OUTFILE=base.ml_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
-
-gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
deleted file mode 100644
index 4dbe7acb3..000000000
--- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-set OUTFILE=base.mlv_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
-
diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst
index f85a2d0a8..be2a2bc40 100644
--- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst
+++ b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst
@@ -40,6 +40,7 @@ syr	basic		sy	syc
 syr	phonetic	sy	syc_phonetic
 tam	INSCRIPT	in	tam
 tam	UNI		in	tam_unicode
+tam     NUMERAL-KEYBOARD    in      tam_keyboard_with_numerals
 tam	TAB		in	tam_TAB
 tam	TSCII		in	tam_TSCII
 tel	basic		in	tel