8 files changed, 67 insertions, 67 deletions
diff --git a/xorg-server/xkeyboard-config/rules/bin/Makefile.am b/xorg-server/xkeyboard-config/rules/bin/Makefile.am
index 787e34f8a..99077804a 100644
--- a/xorg-server/xkeyboard-config/rules/bin/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/bin/Makefile.am
@@ -1,10 +1,10 @@
-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)
+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/xkeyboard-config/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
index 449874909..b09459a5d 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
@@ -1,9 +1,9 @@
-@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;   }}" < layoutsMapping.lst >> %OUTFILE%
-
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@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;   }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
index 68696c9e2..4d492e02b 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
@@ -1,7 +1,7 @@
-@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; }" < variantsMapping.lst >> %OUTFILE%
+@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; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
index cae53259c..cec1334c0 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
@@ -1,7 +1,7 @@
-@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; }" < variantsMapping.lst >> %OUTFILE%
+@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; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
index d15355918..b7f0d9c46 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
@@ -1,9 +1,9 @@
-@echo off
-
-set OUTFILE=base.ml_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
-
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.ml_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
index 66794a4fc..15e0629be 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
@@ -1,10 +1,10 @@
-@echo off
-set variant=%1
-
-set OUTFILE=base.ml%variant%_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-echo "{  if (index($2, """(""") == 0) {    printf """  *		%%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;  } else {    printf """  *		%%s		=	+%%s:%variant%\n""", $1, $2;  }}" < layoutsMapping.lst >> %OUTFILE%
-
-gawk "{  printf """  *		%%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+echo "{  if (index($2, """(""") == 0) {    printf """  *		%%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;  } else {    printf """  *		%%s		=	+%%s:%variant%\n""", $1, $2;  }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{  printf """  *		%%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
index 8e252943b..78119bcc7 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
@@ -1,8 +1,8 @@
-@echo off
-set variant=%1
-
-set OUTFILE=base.ml%variant%v%variant%_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{  printf """  *		%%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%v%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{  printf """  *		%%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
index 21205ef97..573cb930f 100644..100755
--- a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
@@ -1,7 +1,7 @@
-@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; }" < variantsMapping.lst >> %OUTFILE%
+@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; }" < variantsMapping.lst >> %OUTFILE%