3 files changed, 42 insertions, 10 deletions
diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkbdata.src/rules/bin/Makefile.am
index b9785b107..787e34f8a 100644
--- a/xorg-server/xkbdata.src/rules/bin/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/bin/Makefile.am
@@ -1,10 +1,10 @@
-transform_scripts= \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
-
-EXTRA_DIST=$(transform_scripts)
+transform_scripts= \
+mln_s.sh \
+mlnvn_s.sh \
+ml_s.sh \
+mlv_s.sh \
+ml1_s.sh \
+ml1v_s.sh \
+ml1v1_s.sh
+
+EXTRA_DIST=$(transform_scripts)
diff --git a/xorg-server/xkbdata.src/rules/bin/mln_s.sh b/xorg-server/xkbdata.src/rules/bin/mln_s.sh
new file mode 100644
index 000000000..4a615fe7d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/mln_s.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=$2
+OUTFILE=base.ml${variant}_s.part
+
+> $OUTFILE
+
+awk '{
+  if (index($2, "(") == 0) {
+    printf "  *		%s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2;
+  } else {
+    printf "  *		%s		=	+%s:'${variant}'\n", $1, $2;
+  }
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
+
+awk '{
+  printf "  *		%s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh b/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh
new file mode 100644
index 000000000..30123874b
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=$2
+OUTFILE=base.ml${variant}v${variant}_s.part
+
+> $OUTFILE
+
+awk '{
+  printf "  *		%s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE