aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkbdata.src/rules')
-rw-r--r--xorg-server/xkbdata.src/rules/Makefile.am165
-rw-r--r--xorg-server/xkbdata.src/rules/Makefile.in207
-rw-r--r--xorg-server/xkbdata.src/rules/base.extras.xml.in69
-rw-r--r--xorg-server/xkbdata.src/rules/base.lists.part5
-rw-r--r--xorg-server/xkbdata.src/rules/base.m_g.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.m_k.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.ml1_s.part4
-rw-r--r--xorg-server/xkbdata.src/rules/base.ml_s.part3
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_s.part4
-rw-r--r--xorg-server/xkbdata.src/rules/base.xml.in110
-rw-r--r--xorg-server/xkbdata.src/rules/bin/Makefile.am10
-rw-r--r--xorg-server/xkbdata.src/rules/bin/Makefile.in326
-rw-r--r--xorg-server/xkbdata.src/rules/bin/ln_s.sh10
-rw-r--r--xorg-server/xkbdata.src/rules/bin/lnv_s.sh8
-rw-r--r--xorg-server/xkbdata.src/rules/bin/ml1_s.sh9
-rw-r--r--xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh7
-rw-r--r--xorg-server/xkbdata.src/rules/bin/ml1v_s.sh7
-rw-r--r--xorg-server/xkbdata.src/rules/bin/ml_s.sh9
-rw-r--r--xorg-server/xkbdata.src/rules/bin/mlv_s.sh7
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.am55
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.in54
-rw-r--r--xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst (renamed from xorg-server/xkbdata.src/rules/compat/layoutRename.lst)0
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ln_s.sh10
-rw-r--r--xorg-server/xkbdata.src/rules/compat/lnv_s.sh8
-rw-r--r--xorg-server/xkbdata.src/rules/compat/makefile14
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1_s.sh9
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh7
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1v_s.sh7
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml_s.sh9
-rw-r--r--xorg-server/xkbdata.src/rules/compat/mlv_s.sh8
-rw-r--r--xorg-server/xkbdata.src/rules/compat/variantsMapping.lst (renamed from xorg-server/xkbdata.src/rules/compat/variantRename.lst)1
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.extras.xml.in69
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.xml.in110
-rw-r--r--xorg-server/xkbdata.src/rules/extras/Makefile.am52
-rw-r--r--xorg-server/xkbdata.src/rules/extras/Makefile.in367
-rw-r--r--xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst1
-rw-r--r--xorg-server/xkbdata.src/rules/extras/makefile53
-rw-r--r--xorg-server/xkbdata.src/rules/extras/variantsMapping.lst4
-rw-r--r--xorg-server/xkbdata.src/rules/makefile103
39 files changed, 1536 insertions, 367 deletions
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am
index 5d6e8b4bf..18b8b1a0e 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = compat
+SUBDIRS = bin compat extras
if CREATE_RULES_SYMLINK
# extra_rules_file = $(xkb_rules_symlink)
@@ -20,126 +20,162 @@ install-data-hook:
endif
-base_parts_no_compat = base.hdr.part base.lists.part \
+if USE_COMPAT_RULES
+
+base_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
+HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
HDR base.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
+HDR base.lo_s.part \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR base.o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
-evdev_parts_no_compat = base.hdr.part base.lists.part \
+evdev_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
-HDR base.l_k.part \
+HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
+HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
HDR evdev.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
+HDR base.lo_s.part \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR base.o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
-if USE_COMPAT_RULES
+else
+
base_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
-HDR base.o_k.part \
+HDR \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR compat/base.mlv_s.part base.mlv_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.ml1v1_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 compat/base.l2v2_s.part \
-HDR compat/base.l3v3_s.part \
-HDR compat/base.l4v4_s.part \
+HDR extras/base.mlv_s.part base.mlv_s.part \
+HDR extras/base.ml_s.part base.ml_s.part \
+HDR extras/base.ml1_s.part base.ml1_s.part \
+HDR extras/base.ml1v1_s.part \
+HDR extras/base.l2_s.part base.l2_s.part \
+HDR extras/base.l3_s.part base.l3_s.part \
+HDR extras/base.l4_s.part base.l4_s.part \
+HDR extras/base.l2v2_s.part \
+HDR extras/base.l3v3_s.part \
+HDR extras/base.l4v4_s.part \
HDR base.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part \
+HDR \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
evdev_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
+HDR base.l_k.part \
+HDR \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR compat/base.mlv_s.part base.mlv_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.ml1v1_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 compat/base.l2v2_s.part \
-HDR compat/base.l3v3_s.part \
-HDR compat/base.l4v4_s.part \
+HDR extras/base.mlv_s.part base.mlv_s.part \
+HDR extras/base.ml_s.part base.ml_s.part \
+HDR extras/base.ml1_s.part base.ml1_s.part \
+HDR extras/base.ml1v1_s.part \
+HDR extras/base.l2_s.part base.l2_s.part \
+HDR extras/base.l3_s.part base.l3_s.part \
+HDR extras/base.l4_s.part base.l4_s.part \
+HDR extras/base.l2v2_s.part \
+HDR extras/base.l3v3_s.part \
+HDR extras/base.l4v4_s.part \
HDR evdev.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part \
+HDR \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
-else
-base_parts = $(base_parts_no_compat)
-evdev_parts = $(base_parts_no_compat)
+
endif
-base_parts_compat_dist = base.o_k.part base.lo_s.part
+all_parts_dist = HDR base.hdr.part \
+base.lists.part \
+base.m_k.part \
+base.l1_k.part \
+base.l_k.part \
+base.o_k.part \
+base.ml_g.part \
+base.m_g.part \
+base.mlv_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.lo_s.part \
+base.l1o_s.part \
+base.l2o_s.part \
+base.l3o_s.part \
+base.l4o_s.part \
+base.o_s.part \
+base.o_c.part \
+base.o_t.part \
+evdev.m_k.part \
+evdev.m_s.part
rules_files = base evdev xfree98
@@ -148,30 +184,31 @@ lst_files = base.lst evdev.lst
%.lst: %.xml
perl $(srcdir)/xml2lst.pl < $< > $@
-base: $(base_parts_no_compat)
+base: $(base_parts)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
-evdev: $(evdev_parts_no_compat)
+evdev: $(evdev_parts)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
dist_files = xkb.dtd README
rules_DATA = $(rules_files) $(lst_files) $(dist_files)
-xml_in_files = base.xml.in evdev.xml.in
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
$(srcdir)/evdev.xml.in: base.xml.in
cp $< $@
+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
+ cp $< $@
+
EXTRA_DIST= $(xml_in_files) xfree98 \
- $(base_parts_no_compat) \
- $(evdev_parts_no_compat) \
- $(base_parts_compat_dist) \
+ $(all_parts_dist) \
xml2lst.pl merge.sh $(dist_files)
-CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
-MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in
rulesdir = $(xkb_base)/rules
xmldir = $(rulesdir)
diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in
index bc498f1d1..583a1ce8f 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/Makefile.in
@@ -175,60 +175,37 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
-SUBDIRS = compat
-base_parts_no_compat = base.hdr.part base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
-HDR base.m_s.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-evdev_parts_no_compat = base.hdr.part base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
-HDR evdev.m_s.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat)
+SUBDIRS = bin compat extras
+@USE_COMPAT_RULES_FALSE@base_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
+
@USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_k.part \
@@ -237,16 +214,16 @@ HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@@ -256,11 +233,40 @@ HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.o_t.part
-@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat)
+@USE_COMPAT_RULES_FALSE@evdev_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_FALSE@HDR evdev.m_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR evdev.m_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
+
@USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \
@@ -269,16 +275,16 @@ HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@@ -288,25 +294,51 @@ HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.o_t.part
-base_parts_compat_dist = base.o_k.part base.lo_s.part
+all_parts_dist = HDR base.hdr.part \
+base.lists.part \
+base.m_k.part \
+base.l1_k.part \
+base.l_k.part \
+base.o_k.part \
+base.ml_g.part \
+base.m_g.part \
+base.mlv_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.lo_s.part \
+base.l1o_s.part \
+base.l2o_s.part \
+base.l3o_s.part \
+base.l4o_s.part \
+base.o_s.part \
+base.o_c.part \
+base.o_t.part \
+evdev.m_k.part \
+evdev.m_s.part
+
rules_files = base evdev xfree98
lst_files = base.lst evdev.lst
dist_files = xkb.dtd README
rules_DATA = $(rules_files) $(lst_files) $(dist_files)
-xml_in_files = base.xml.in evdev.xml.in
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
EXTRA_DIST = $(xml_in_files) xfree98 \
- $(base_parts_no_compat) \
- $(evdev_parts_no_compat) \
- $(base_parts_compat_dist) \
+ $(all_parts_dist) \
xml2lst.pl merge.sh $(dist_files)
-CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
-MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in
rulesdir = $(xkb_base)/rules
xmldir = $(rulesdir)
all: all-recursive
@@ -676,15 +708,18 @@ uninstall-am: uninstall-rulesDATA uninstall-xmlDATA
%.lst: %.xml
perl $(srcdir)/xml2lst.pl < $< > $@
-base: $(base_parts_no_compat)
+base: $(base_parts)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
-evdev: $(evdev_parts_no_compat)
+evdev: $(evdev_parts)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
$(srcdir)/evdev.xml.in: base.xml.in
cp $< $@
+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
+ cp $< $@
+
@INTLTOOL_XML_NOMERGE_RULE@
# 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.
diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in
new file mode 100644
index 000000000..7e32c3140
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.extras.xml.in
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+ <modelList/>
+ <layoutList>
+ <layout>
+ <configItem>
+ <name>apl</name>
+ <_shortDescription>APL</_shortDescription>
+ <_description>APL</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>us</name>
+ <_shortDescription>USA</_shortDescription>
+ <_description>USA</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>intl-unicode</name>
+ <_description>International (AltGr Unicode combining)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>alt-intl-unicode</name>
+ <_description>International (AltGr Unicode combining, alternative)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>ats</name>
+ <_description>Atsina</_description>
+ <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crd</name>
+ <_description>Couer D'alene Salish</_description>
+ <languageList><iso639Id>crd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>rs</name>
+ <_shortDescription>SRB</_shortDescription>
+ <_description>Serbia</_description>
+ <languageList><iso639Id>srp</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>combiningkeys</name>
+ <_description>Combining accents instead of dead keys</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ </layoutList>
+ <optionList/>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part
index d2e8383df..d1927c537 100644
--- a/xorg-server/xkbdata.src/rules/base.lists.part
+++ b/xorg-server/xkbdata.src/rules/base.lists.part
@@ -14,6 +14,9 @@
// PC geometries - they have special geometry but symbols are mostly pc105
! $pcgeometries = latitude
+// TypeMatrix geometries
+! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
+
// Layouts that provide further specializations for the OLPC
! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us
@@ -36,6 +39,7 @@
chicony chicony0108 chicony0420 chicony9885 \
compalfl90 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
+ creativedw7000 \
cymotionlinux \
dell dellm65 inspiron dellusbmm \
emachines ennyah_dkb1008 evdev \
@@ -90,4 +94,3 @@
! $evdevkbds = ibm_spacesaver
! $thinkpads = thinkpad thinkpad60 thinkpadz60
-
diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part
index 36525754c..a925bfa8d 100644
--- a/xorg-server/xkbdata.src/rules/base.m_g.part
+++ b/xorg-server/xkbdata.src/rules/base.m_g.part
@@ -12,6 +12,7 @@
thinkpad = thinkpad(intl)
thinkpad60 = thinkpad(60)
thinkpadz60 = thinkpad(60)
+ $tmgeometries = typematrix(%m)
winbook = winbook(XP5)
pc98 = nec(pc98)
$macbooks = macintosh(%m)
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part
index b6433b2c8..30534f715 100644
--- a/xorg-server/xkbdata.src/rules/base.m_k.part
+++ b/xorg-server/xkbdata.src/rules/base.m_k.part
@@ -3,6 +3,7 @@
sun4 = sun(type4_euro)
sun5 = sun(type5_euro)
sun6 = sun(type6_usb)
+ sun6euro = sun(type6tuv_usb)
pc98 = xfree98(pc98)
evdev = evdev
olpc = evdev
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part
index c45b9805e..6a0787d21 100644
--- a/xorg-server/xkbdata.src/rules/base.ml1_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part
@@ -1,7 +1,7 @@
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
- sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1])
- sun5 * = latin+sun_vndr/us(sun5)+%l[1]%(v[1])
+ sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1])
+ sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1])
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part
index 7e9b2d63e..c5fed0bed 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml_s.part
@@ -10,6 +10,9 @@
sun6 us = sun_vndr/us(type6)
sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic)
sun6 * = sun_vndr/us(type6)+%l%(v)
+ sun6euro us = sun_vndr/us(type6)
+ sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic)
+ sun6euro * = sun_vndr/us(type6)+%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old en_US = macintosh_vndr/us(oldmac)
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
index d3078bfc5..f9290dae7 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -49,10 +49,14 @@
lv3:rwin_switch = +level3(rwin_switch)
lv3:enter_switch = +level3(enter_switch)
caps:capslock = +capslock(capslock)
+ caps:numlock = +capslock(numlock)
caps:shiftlock = +capslock(shiftlock)
caps:swapescape = +capslock(swapescape)
caps:escape = +capslock(escape)
caps:backspace = +capslock(backspace)
+ caps:super = +capslock(super)
+ caps:hyper = +capslock(hyper)
+ caps:none = +capslock(none)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index 996cde84f..f43e651bb 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -981,6 +981,41 @@
</model>
<model>
<configItem>
+ <name>tm2020</name>
+ <description>TypeMatrix EZ-Reach 2020</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030PS2</name>
+ <description>TypeMatrix EZ-Reach 2030 PS2</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB</name>
+ <description>TypeMatrix EZ-Reach 2030 USB</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB-102</name>
+ <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB-106</name>
+ <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>yahoo</name>
<_description>Yahoo! Internet Keyboard</_description>
<vendor>Yahoo!</vendor>
@@ -1154,6 +1189,13 @@
<vendor>Compal Electronics Inc.</vendor>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>creativedw7000</name>
+ <_description>Creative Desktop Wireless 7000</_description>
+ <vendor>Creative</vendor>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -1455,8 +1497,8 @@
<variantList>
<variant>
<configItem>
- <name>winkeys</name>
- <_description>Winkeys</_description>
+ <name>legacy</name>
+ <_description>Legacy</_description>
</configItem>
</variant>
<variant>
@@ -1615,6 +1657,13 @@
</variant>
<variant>
<configItem>
+ <name>tam_keyboard_with_numerals</name>
+ <description>Tamil Keyboard with Numerals</description>
+ <languageList><iso639Id>tam</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>tam_TAB</name>
<_description>Tamil TAB Typewriter</_description>
<languageList><iso639Id>tam</iso639Id></languageList>
@@ -1764,7 +1813,7 @@
<variant>
<configItem>
<name>phonetic</name>
- <_description>Traditional Phonetic</_description>
+ <_description>Traditional phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -1772,7 +1821,7 @@
<variant>
<configItem>
<name>bas_phonetic</name>
- <_description>Standard Phonetic</_description>
+ <_description>New phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -2119,20 +2168,8 @@
<variantList>
<variant>
<configItem>
- <name>pro</name>
- <_description>Pro</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>keypad</name>
- <_description>Keypad</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>pro_keypad</name>
- <_description>Pro Keypad</_description>
+ <name>pes_keypad</name>
+ <_description>Persian, with Persian Keypad</_description>
</configItem>
</variant>
<variant>
@@ -2797,6 +2834,12 @@
</variant>
<variant>
<configItem>
+ <name>us</name>
+ <_description>US keyboard with Italian letters</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>geo</name>
<_description>Georgian</_description>
<languageList><iso639Id>geo</iso639Id></languageList>
@@ -3431,6 +3474,13 @@
<_description>DOS</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>bak</name>
+ <_description>Bashkirian</_description>
+ <languageList><iso639Id>bak</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -4750,6 +4800,12 @@
</option>
<option>
<configItem>
+ <name>caps:numlock</name>
+ <_description>Make CapsLock an additional NumLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>caps:swapescape</name>
<_description>Swap ESC and CapsLock</_description>
</configItem>
@@ -4768,10 +4824,28 @@
</option>
<option>
<configItem>
+ <name>caps:super</name>
+ <_description>Make CapsLock an additional Super</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:hyper</name>
+ <_description>Make CapsLock an additional Hyper</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>caps:shiftlock</name>
<_description>CapsLock toggles Shift so all keys are affected</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>caps:none</name>
+ <_description>CapsLock is disabled</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkbdata.src/rules/bin/Makefile.am
new file mode 100644
index 000000000..b9785b107
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/Makefile.am
@@ -0,0 +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)
diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.in b/xorg-server/xkbdata.src/rules/bin/Makefile.in
new file mode 100644
index 000000000..097cf8013
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/Makefile.in
@@ -0,0 +1,326 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = rules/bin
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+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)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/bin/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu rules/bin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
+# 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/bin/ln_s.sh b/xorg-server/xkbdata.src/rules/bin/ln_s.sh
new file mode 100644
index 000000000..78e557d8f
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/ln_s.sh
@@ -0,0 +1,10 @@
+@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; }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{ printf """ %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/bin/lnv_s.sh b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh
new file mode 100644
index 000000000..6bbf285e7
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh
@@ -0,0 +1,8 @@
+@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; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh
new file mode 100644
index 000000000..b09459a5d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh
@@ -0,0 +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%
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh
new file mode 100644
index 000000000..4d492e02b
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh
@@ -0,0 +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%
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh
new file mode 100644
index 000000000..cec1334c0
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh
@@ -0,0 +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%
diff --git a/xorg-server/xkbdata.src/rules/bin/ml_s.sh b/xorg-server/xkbdata.src/rules/bin/ml_s.sh
new file mode 100644
index 000000000..b7f0d9c46
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/ml_s.sh
@@ -0,0 +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%
diff --git a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh
new file mode 100644
index 000000000..573cb930f
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh
@@ -0,0 +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%
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
diff --git a/xorg-server/xkbdata.src/rules/evdev.extras.xml.in b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in
new file mode 100644
index 000000000..7e32c3140
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+ <modelList/>
+ <layoutList>
+ <layout>
+ <configItem>
+ <name>apl</name>
+ <_shortDescription>APL</_shortDescription>
+ <_description>APL</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>us</name>
+ <_shortDescription>USA</_shortDescription>
+ <_description>USA</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>intl-unicode</name>
+ <_description>International (AltGr Unicode combining)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>alt-intl-unicode</name>
+ <_description>International (AltGr Unicode combining, alternative)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>ats</name>
+ <_description>Atsina</_description>
+ <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crd</name>
+ <_description>Couer D'alene Salish</_description>
+ <languageList><iso639Id>crd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
+ <name>rs</name>
+ <_shortDescription>SRB</_shortDescription>
+ <_description>Serbia</_description>
+ <languageList><iso639Id>srp</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>combiningkeys</name>
+ <_description>Combining accents instead of dead keys</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ </layoutList>
+ <optionList/>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in
index 996cde84f..f43e651bb 100644
--- a/xorg-server/xkbdata.src/rules/evdev.xml.in
+++ b/xorg-server/xkbdata.src/rules/evdev.xml.in
@@ -981,6 +981,41 @@
</model>
<model>
<configItem>
+ <name>tm2020</name>
+ <description>TypeMatrix EZ-Reach 2020</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030PS2</name>
+ <description>TypeMatrix EZ-Reach 2030 PS2</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB</name>
+ <description>TypeMatrix EZ-Reach 2030 USB</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB-102</name>
+ <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>tm2030USB-106</name>
+ <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description>
+ <vendor>TypeMatrix</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>yahoo</name>
<_description>Yahoo! Internet Keyboard</_description>
<vendor>Yahoo!</vendor>
@@ -1154,6 +1189,13 @@
<vendor>Compal Electronics Inc.</vendor>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>creativedw7000</name>
+ <_description>Creative Desktop Wireless 7000</_description>
+ <vendor>Creative</vendor>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -1455,8 +1497,8 @@
<variantList>
<variant>
<configItem>
- <name>winkeys</name>
- <_description>Winkeys</_description>
+ <name>legacy</name>
+ <_description>Legacy</_description>
</configItem>
</variant>
<variant>
@@ -1615,6 +1657,13 @@
</variant>
<variant>
<configItem>
+ <name>tam_keyboard_with_numerals</name>
+ <description>Tamil Keyboard with Numerals</description>
+ <languageList><iso639Id>tam</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>tam_TAB</name>
<_description>Tamil TAB Typewriter</_description>
<languageList><iso639Id>tam</iso639Id></languageList>
@@ -1764,7 +1813,7 @@
<variant>
<configItem>
<name>phonetic</name>
- <_description>Traditional Phonetic</_description>
+ <_description>Traditional phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -1772,7 +1821,7 @@
<variant>
<configItem>
<name>bas_phonetic</name>
- <_description>Standard Phonetic</_description>
+ <_description>New phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -2119,20 +2168,8 @@
<variantList>
<variant>
<configItem>
- <name>pro</name>
- <_description>Pro</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>keypad</name>
- <_description>Keypad</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>pro_keypad</name>
- <_description>Pro Keypad</_description>
+ <name>pes_keypad</name>
+ <_description>Persian, with Persian Keypad</_description>
</configItem>
</variant>
<variant>
@@ -2797,6 +2834,12 @@
</variant>
<variant>
<configItem>
+ <name>us</name>
+ <_description>US keyboard with Italian letters</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>geo</name>
<_description>Georgian</_description>
<languageList><iso639Id>geo</iso639Id></languageList>
@@ -3431,6 +3474,13 @@
<_description>DOS</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>bak</name>
+ <_description>Bashkirian</_description>
+ <languageList><iso639Id>bak</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -4750,6 +4800,12 @@
</option>
<option>
<configItem>
+ <name>caps:numlock</name>
+ <_description>Make CapsLock an additional NumLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>caps:swapescape</name>
<_description>Swap ESC and CapsLock</_description>
</configItem>
@@ -4768,10 +4824,28 @@
</option>
<option>
<configItem>
+ <name>caps:super</name>
+ <_description>Make CapsLock an additional Super</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:hyper</name>
+ <_description>Make CapsLock an additional Hyper</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>caps:shiftlock</name>
<_description>CapsLock toggles Shift so all keys are affected</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>caps:none</name>
+ <_description>CapsLock is disabled</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.am b/xorg-server/xkbdata.src/rules/extras/Makefile.am
new file mode 100644
index 000000000..ad71f2e76
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/extras/Makefile.am
@@ -0,0 +1,52 @@
+transform_files=layoutsMapping.lst variantsMapping.lst
+
+scripts_dir=$(srcdir)/../bin
+
+scripts= \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
+base.ml_s.part
+
+noinst_SCRIPTS=$(scripts)
+
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
+
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
+
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
+
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
+
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
+
+base.l4v4_s.part: $(scripts_dir)/lnv_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=$(transform_files)
+
+CLEANFILES=$(scripts)
diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.in b/xorg-server/xkbdata.src/rules/extras/Makefile.in
new file mode 100644
index 000000000..3d3b1e53a
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/extras/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = rules/extras
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+transform_files = layoutsMapping.lst variantsMapping.lst
+scripts_dir = $(srcdir)/../bin
+scripts = \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
+base.ml_s.part
+
+noinst_SCRIPTS = $(scripts)
+EXTRA_DIST = $(transform_files)
+CLEANFILES = $(scripts)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/extras/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu rules/extras/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
+
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
+
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
+
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
+
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
+
+base.l4v4_s.part: $(scripts_dir)/lnv_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)
+# 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/extras/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst
new file mode 100644
index 000000000..d75b4f44d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst
@@ -0,0 +1 @@
+apl extras/apl
diff --git a/xorg-server/xkbdata.src/rules/extras/makefile b/xorg-server/xkbdata.src/rules/extras/makefile
new file mode 100644
index 000000000..f5753f674
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/extras/makefile
@@ -0,0 +1,53 @@
+TRANSFORM_FILES=layoutsMapping.lst variantsMapping.lst
+
+scripts_dir=..\bin
+
+SCRIPTS= \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_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
+
+%.bat: $(scripts_dir)\%.sh
+ copy $< $@
+
+base.l2_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 2
+
+base.l3_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 3
+
+base.l4_s.part: ln_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 4
+
+base.l2v2_s.part: lnv_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 2
+
+base.l3v3_s.part: lnv_s.bat $(TRANSFORM_FILES)
+ $(SH) $< 3
+
+base.l4v4_s.part: lnv_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) $<
+
+all=$(SCRIPTS)
diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
new file mode 100644
index 000000000..c49f70e0c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
@@ -0,0 +1,4 @@
+rs combiningkeys extras/rs combiningkeys
+us alt-intl-unicode extras/us alt-intl-unicode
+us crd extras/us crd
+us intl-unicode extras/us intl-unicode
diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile
index 1bd5e839b..65cd8378e 100644
--- a/xorg-server/xkbdata.src/rules/makefile
+++ b/xorg-server/xkbdata.src/rules/makefile
@@ -3,120 +3,129 @@ $(error Please do not specify MAKESERVER=1)
endif
load_makefile compat\makefile DEBUG=$(DEBUG)
+load_makefile extras\makefile DEBUG=$(DEBUG)
DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
+HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
HDR base.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
+HDR base.lo_s.part \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR base.o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
+HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \
+HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \
+HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \
+HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \
+HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \
HDR evdev.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
+HDR base.lo_s.part \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR base.o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
BASE_PARTS = base.hdr.part base.lists.part \
-compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
-HDR base.o_k.part \
+HDR \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR compat/base.mlv_s.part base.mlv_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.ml1v1_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 compat/base.l2v2_s.part \
-HDR compat/base.l3v3_s.part \
-HDR compat/base.l4v4_s.part \
+HDR extras/base.mlv_s.part base.mlv_s.part \
+HDR extras/base.ml_s.part base.ml_s.part \
+HDR extras/base.ml1_s.part base.ml1_s.part \
+HDR extras/base.ml1v1_s.part \
+HDR extras/base.l2_s.part base.l2_s.part \
+HDR extras/base.l3_s.part base.l3_s.part \
+HDR extras/base.l4_s.part base.l4_s.part \
+HDR extras/base.l2v2_s.part \
+HDR extras/base.l3v3_s.part \
+HDR extras/base.l4v4_s.part \
HDR base.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part \
+HDR \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
EVDEV_PARTS = base.hdr.part base.lists.part \
-compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
-HDR base.o_k.part \
+HDR \
HDR base.ml_g.part \
HDR base.m_g.part \
-HDR compat/base.mlv_s.part base.mlv_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.ml1v1_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 compat/base.l2v2_s.part \
-HDR compat/base.l3v3_s.part \
-HDR compat/base.l4v4_s.part \
+HDR extras/base.mlv_s.part base.mlv_s.part \
+HDR extras/base.ml_s.part base.ml_s.part \
+HDR extras/base.ml1_s.part base.ml1_s.part \
+HDR extras/base.ml1v1_s.part \
+HDR extras/base.l2_s.part base.l2_s.part \
+HDR extras/base.l3_s.part base.l3_s.part \
+HDR extras/base.l4_s.part base.l4_s.part \
+HDR extras/base.l2v2_s.part \
+HDR extras/base.l3v3_s.part \
+HDR extras/base.l4v4_s.part \
HDR evdev.m_s.part \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part \
+HDR \
HDR base.l1o_s.part \
HDR base.l2o_s.part \
HDR base.l3o_s.part \
HDR base.l4o_s.part \
-HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_s.part \
HDR base.o_c.part \
HDR base.o_t.part
@@ -144,7 +153,7 @@ $(DESTDIR)\xorg%: $(DESTDIR)\base%
rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES)
-XML_IN_FILES = base.xml.in evdev.xml.in
+XML_IN_FILES = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
xml_DATA = $(XML_IN_FILES:%.xml.in=%.xml)
$(DESTDIR)\%.xml: %.xml.in