Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch.

11 files changed, 206 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/rules/compat/Makefile.am b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
new file mode 100644
index 000000000..087263427
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
@@ -0,0 +1,68 @@
+
+transform_files=layoutsMapping.lst variantsMapping.lst
+
+dist_parts=base.o_s.part \
+base.lv_c.part \
+base.l1v1_c.part \
+base.l2v2_c.part \
+base.l3v3_c.part \
+base.l4v4_c.part
+
+scripts_dir=$(srcdir)/../bin
+
+scripts= \
+base.ml2_s.part \
+base.ml3_s.part \
+base.ml4_s.part \
+base.ml2v2_s.part \
+base.ml3v3_s.part \
+base.ml4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
+base.ml_s.part
+
+if USE_COMPAT_RULES
+
+noinst_SCRIPTS=$(scripts) $(dist_parts)
+
+else
+
+noinst_SCRIPTS=
+
+endif
+
+base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
+
+base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
+
+base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
+
+base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
+
+base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
+
+base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
+
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts)
+
+CLEANFILES=$(scripts)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
new file mode 100644
index 000000000..64ff0f2f5
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
new file mode 100644
index 000000000..fea61be76
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
new file mode 100644
index 000000000..5a1fb2f8a
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
new file mode 100644
index 000000000..ac8a91102
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lists.part b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
new file mode 100644
index 000000000..f1cf7ee22
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
@@ -0,0 +1,2 @@
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
new file mode 100644
index 000000000..64ff0f2f5
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
new file mode 100644
index 000000000..8f1e9e452
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
@@ -0,0 +1 @@
+  grp:shift_toggle	=	+group(shifts_toggle)
diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
new file mode 100644
index 000000000..cecda6d8a
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
@@ -0,0 +1,27 @@
+ar	ara
+ben	in(ben)
+bs	ba
+cs	rs
+cz_qwerty cz(qwerty)
+dev	in(deva)
+dvorak	us(dvorak)
+dzdwi	bt
+el	gr
+en_US	latin
+guj	in(guj)
+gur	in(guru)
+iu	ca(ike)
+lo	la
+kan	in(kan)
+mi	mao
+ml	in(mal)
+ogham	ie(ogam)
+ori	ie(ori)
+sapmi	no(smi)
+sr	srp
+syr	sy(syc)
+tel	in(tel)
+tml	in(tam)
+yu	srp
+fr-latin9 fr(latin9)
+us_intl	us(alt-intl)
diff --git a/xorg-server/xkeyboard-config/rules/compat/makefile b/xorg-server/xkeyboard-config/rules/compat/makefile
new file mode 100644
index 000000000..75610a8e9
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/makefile
@@ -0,0 +1,53 @@
+transform_files=layoutsMapping.lst variantsMapping.lst
+
+scripts_dir=..\bin
+
+SCRIPTS= \
+base.ml2_s.part \
+base.ml3_s.part \
+base.ml4_s.part \
+base.ml2v2_s.part \
+base.ml3v3_s.part \
+base.ml4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
+base.ml_s.part
+
+SH=cmd /c
+
+base.ml2_s.part: mln_s.bat $(transform_files)
+	$(SH) $< 2
+
+base.ml3_s.part: mln_s.bat $(transform_files)
+	$(SH) $< 3
+
+base.ml4_s.part: mln_s.bat $(transform_files)
+	$(SH) $< 4
+
+base.ml2v2_s.part: mlnvn_s.bat $(transform_files)
+	$(SH) $< 2
+
+base.ml3v3_s.part: mlnvn_s.bat $(transform_files)
+	$(SH) $< 3
+
+base.ml4v4_s.part: mlnvn_s.bat $(transform_files)
+	$(SH) $< 4
+
+base.ml_s.part: ml_s.bat $(transform_files)
+	$(SH) $<
+
+base.ml1_s.part: ml1_s.bat $(transform_files)
+	$(SH) $<
+
+base.mlv_s.part: mlv_s.bat $(transform_files)
+	$(SH) $<
+
+base.ml1v1_s.part: ml1v1_s.bat $(transform_files)
+	$(SH) $<
+
+%.bat: $(scripts_dir)\%.sh
+	copy $< $@
+
+all: $(SCRIPTS)
diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
new file mode 100644
index 000000000..be2a2bc40
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
@@ -0,0 +1,50 @@
+ben	basic		in	ben
+ben	probhat		in	ben_probhat	
+dev	basic		in	deva
+dvorak	$dvoraklayouts	%v	dvorak
+dvorak	basic		us	dvorak
+dvorak	pl_basic	pl	dvorak
+dvorak	pl		pl	dvorak_quotes
+dvorak	pl_altquotes	pl	dvorak_altquotes
+dzdwi	basic		bt	basic
+fi	basic		fi	classic
+ge	azerty_tskapo	fr	geo
+guj	basic		in	guj
+gur	basic		in	guru
+ie	laptop		ie	basic
+ie	CloGaelachLaptop	ie	CloGaelach
+il	si1452		ie	basic
+in	urd		in	urd-phonetic
+iu	basic		ca	ike
+lo	basic		la	basic
+kan	basic		in	kan
+mal	basic		in	mal
+mal	mlplusnum	in	mal
+ogham	basic		ie	ogam
+ogham	laptop		ie	ogam
+ogham	is434		ie	ogam_is434
+ogham	is434laptop	ie	ogam_is434
+ori	basic		in	ori
+ro	de		ro	winkeys
+ro	us		ro	std
+ro	academic	ro	std
+ro	std_comma	ro	std
+ro	comma		ro	basic	
+ru	os		ru	os_legacy
+pk	urd		pk	urd-phonetic
+sapmi	basic		no	smi
+sapmi	nodeadkeys	no	smi_nodeadkeys
+sapmi	sefi		fi	smi
+sin	phonetic-static	in	sin_phonetic	
+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
+yu	basic		srp	latin
+yu	unicode		srp	latinunicode
+yu	yz		srp	latinyz
+yu	unicodeyz	srp	latinunicodeyz