xkeyboard-config git update 4/5/2010

10 files changed, 550 insertions, 423 deletions

diff --git a/xorg-server/xkbdata.src/rules/HDR b/xorg-server/xkbdata.src/rules/HDR
index cef1b52ad..769b8fc7f 100644
--- a/xorg-server/xkbdata.src/rules/HDR
+++ b/xorg-server/xkbdata.src/rules/HDR
@@ -1,28 +1,33 @@
-! model		=	keycodes

-! layout[1]	=	keycodes

-! layout	=	keycodes

-! option	=	keycodes

-! model		layout	=	geometry

-! model		=	geometry

-! model		layout		variant		=	symbols

-! model		layout				=	symbols

-! model		layout[1]			=	symbols

-! model		layout[1]	variant[1]	=	symbols

-! model		layout[2]	=	symbols

-! model		layout[3]	=	symbols

-! model		layout[4]	=	symbols

-! model		layout[2]	variant[2]	=	symbols

-! model		layout[3]	variant[3]	=	symbols

-! model		layout[4]	variant[4]	=	symbols

-! model		=	symbols

-! model		layout		=	compat

-! model		layout[1]	=	compat

-! model		=	types

-! layout	option	=	symbols

-! layout[1]	option	=	symbols

-! layout[2]	option	=	symbols

-! layout[3]	option	=	symbols

-! layout[4]	option	=	symbols

-! option	=	symbols

-! option	=	compat

-! option	=	types

+! model		=	keycodes
+! layout[1]	=	keycodes
+! layout	=	keycodes
+! option	=	keycodes
+! model		layout	=	geometry
+! model		=	geometry
+! model		layout		variant		=	symbols
+! model		layout				=	symbols
+! model		layout[1]			=	symbols
+! model		layout[1]	variant[1]	=	symbols
+! model		layout[2]	=	symbols
+! model		layout[3]	=	symbols
+! model		layout[4]	=	symbols
+! model		layout[2]	variant[2]	=	symbols
+! model		layout[3]	variant[3]	=	symbols
+! model		layout[4]	variant[4]	=	symbols
+! model		=	symbols
+! layout	variant		=	compat
+! layout[1]	variant[1]	=	compat
+! layout[2]	variant[2]	=	compat
+! layout[3]	variant[3]	=	compat
+! layout[4]	variant[4]	=	compat
+! model		layout		=	compat
+! model		layout[1]	=	compat
+! model		=	types
+! layout	option	=	symbols
+! layout[1]	option	=	symbols
+! layout[2]	option	=	symbols
+! layout[3]	option	=	symbols
+! layout[4]	option	=	symbols
+! option	=	symbols
+! option	=	compat
+! option	=	types
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am
index ecc4593f8..6ca04e7fa 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/Makefile.am
@@ -1,216 +1,236 @@
-SUBDIRS = bin compat extras

-

-if CREATE_RULES_SYMLINK

-#  extra_rules_file = $(xkb_rules_symlink)

-#  extra_dir_file   = $(extra_rules_file).xml 

-#  extra_lst_file   = $(extra_rules_file).lst

-

-install-data-hook:

-	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \

-		extra_rules_file=$$file ; \

-		extra_dir_file=$$extra_rules_file.xml ; \

-		extra_lst_file=$$extra_rules_file.lst ; \

-		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \

-		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \

-		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \

-	done

-

-else

-install-data-hook:

-

-endif

-

-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 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.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \

-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \

-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \

-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \

-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \

-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_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 compat/base.o_s.part     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.ml_g.part \

-HDR base.m_g.part \

-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.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \

-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \

-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \

-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \

-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \

-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_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 compat/base.o_s.part     base.o_s.part \

-HDR base.o_c.part \

-HDR base.o_t.part

-

-else

-

-base_parts = base.hdr.part base.lists.part \

-HDR base.m_k.part \

-HDR base.l1_k.part \

-HDR base.l_k.part \

-HDR \

-HDR base.ml_g.part \

-HDR base.m_g.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.ml2_s.part    base.ml2_s.part  \

-HDR extras/base.ml3_s.part    base.ml3_s.part  \

-HDR extras/base.ml4_s.part    base.ml4_s.part  \

-HDR extras/base.ml2v2_s.part \

-HDR extras/base.ml3v3_s.part \

-HDR extras/base.ml4v4_s.part \

-HDR base.m_s.part \

-HDR base.ml_c.part \

-HDR base.ml1_c.part \

-HDR base.m_t.part \

-HDR \

-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 = base.hdr.part base.lists.part \

-HDR evdev.m_k.part \

-HDR base.l1_k.part \

-HDR base.l_k.part  \

-HDR \

-HDR base.ml_g.part \

-HDR base.m_g.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.ml2_s.part    base.ml2_s.part  \

-HDR extras/base.ml3_s.part    base.ml3_s.part  \

-HDR extras/base.ml4_s.part    base.ml4_s.part  \

-HDR extras/base.ml2v2_s.part \

-HDR extras/base.ml3v3_s.part \

-HDR extras/base.ml4v4_s.part \

-HDR evdev.m_s.part \

-HDR base.ml_c.part \

-HDR base.ml1_c.part \

-HDR base.m_t.part \

-HDR \

-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

-

-endif

-

-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.ml2_s.part \

-base.ml3_s.part \

-base.ml4_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

-

-%.lst: %.xml

-	perl $(srcdir)/xml2lst.pl < $< > $@

-

-base: $(base_parts)

-	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)

-

-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 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 \

-            $(all_parts_dist) \

-            xml2lst.pl merge.sh $(dist_files)

-

-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)

-

-@INTLTOOL_XML_NOMERGE_RULE@

+SUBDIRS = bin compat extras
+
+if CREATE_RULES_SYMLINK
+#  extra_rules_file = $(xkb_rules_symlink)
+#  extra_dir_file   = $(extra_rules_file).xml 
+#  extra_lst_file   = $(extra_rules_file).lst
+
+install-data-hook:
+	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \
+		extra_rules_file=$$file ; \
+		extra_dir_file=$$extra_rules_file.xml ; \
+		extra_lst_file=$$extra_rules_file.lst ; \
+		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \
+		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \
+		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \
+	done
+
+else
+install-data-hook:
+
+endif
+
+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 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.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
+HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
+HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR base.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.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 compat/base.o_s.part     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.ml_g.part \
+HDR base.m_g.part \
+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.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
+HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
+HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR evdev.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.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 compat/base.o_s.part     base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
+
+else
+
+base_parts = base.hdr.part base.lists.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR \
+HDR base.ml_g.part \
+HDR base.m_g.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.ml2_s.part    base.ml2_s.part  \
+HDR extras/base.ml3_s.part    base.ml3_s.part  \
+HDR extras/base.ml4_s.part    base.ml4_s.part  \
+HDR extras/base.ml2v2_s.part \
+HDR extras/base.ml3v3_s.part \
+HDR extras/base.ml4v4_s.part \
+HDR base.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR \
+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 = base.hdr.part base.lists.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part  \
+HDR \
+HDR base.ml_g.part \
+HDR base.m_g.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.ml2_s.part    base.ml2_s.part  \
+HDR extras/base.ml3_s.part    base.ml3_s.part  \
+HDR extras/base.ml4_s.part    base.ml4_s.part  \
+HDR extras/base.ml2v2_s.part \
+HDR extras/base.ml3v3_s.part \
+HDR extras/base.ml4v4_s.part \
+HDR evdev.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR \
+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
+
+endif
+
+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.ml2_s.part \
+base.ml3_s.part \
+base.ml4_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
+
+%.lst: %.xml
+	perl $(srcdir)/xml2lst.pl < $< > $@
+
+base: $(base_parts)
+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
+
+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 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 \
+            $(all_parts_dist) \
+            xml2lst.pl merge.sh $(dist_files)
+
+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)
+
+@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
index 45f52218c..79f61d959 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -1,114 +1,121 @@
-  altwin:menu		=	+altwin(menu)

-  altwin:meta_alt	=	+altwin(meta_alt)

-  altwin:ctrl_win	=	+altwin(ctrl_win)

-  altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)

-  altwin:meta_win	=	+altwin(meta_win)

-  altwin:left_meta_win	=	+altwin(left_meta_win)

-  altwin:hyper_win	=	+altwin(hyper_win)

-  altwin:alt_super_win	=	+altwin(alt_super_win)

-  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)

-  grp:switch		=	+group(switch)

-  grp:lswitch		=	+group(lswitch)

-  grp:win_switch	=	+group(win_switch)

-  grp:lwin_switch	=	+group(lwin_switch)

-  grp:rwin_switch	=	+group(rwin_switch)

-  grp:toggle		=	+group(toggle)

-  grp:shifts_toggle	=	+group(shifts_toggle)

-  grp:ctrls_toggle	=	+group(ctrls_toggle)

-  grp:alts_toggle	=	+group(alts_toggle)

-  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)

-  grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)

-  grp:rctrl_rshift_toggle	=	+group(rctrl_rshift_toggle)

-  grp:caps_toggle	=	+capslock(grouplock)

-  grp:caps_switch       =       +capslock(groupshift)

-  grp:shift_caps_toggle	=	+group(shift_caps_toggle)

-  grp:shift_caps_switch	=	+group(shift_caps_switch)

-  grp:win_menu_switch	=	+group(win_menu_switch)

-  grp:alt_caps_toggle   =       +group(alt_caps_toggle)

-  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)

-  grp:alt_shift_toggle	=	+group(alt_shift_toggle)

-  grp:alt_space_toggle	=	+group(alt_space_toggle)

-  grp:menu_toggle	=	+group(menu_toggle)

-  grp:lwin_toggle	=	+group(lwin_toggle)

-  grp:rwin_toggle	=	+group(rwin_toggle)

-  grp:lshift_toggle	=	+group(lshift_toggle)

-  grp:rshift_toggle	=	+group(rshift_toggle)

-  grp:rctrl_switch	=	+group(rctrl_switch)

-  grp:lctrl_toggle	=	+group(lctrl_toggle)

-  grp:rctrl_toggle	=	+group(rctrl_toggle)

-  grp:lalt_toggle	=	+group(lalt_toggle)

-  grp:sclk_toggle	=	+group(sclk_toggle)

-  grp:lctrl_rctrl_switch	=	+group(lctrl_rctrl_switch)

-  lv3:switch		=	+level3(switch)

-  lv3:ralt_switch	=	+level3(ralt_switch)

-  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)

-  lv3:ralt_alt		=	+level3(ralt_alt)

-  lv3:lalt_switch	=	+level3(lalt_switch)

-  lv3:alt_switch	=	+level3(alt_switch)

-  lv3:menu_switch	=	+level3(menu_switch)

-  lv3:win_switch	=	+level3(win_switch)

-  lv3:lwin_switch	=	+level3(lwin_switch)

-  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)

-  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)

-  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)

-  compose:ralt		=	+compose(ralt)

-  compose:lwin		=	+compose(lwin)

-  compose:rwin		=	+compose(rwin)

-  compose:menu		=	+compose(menu)

-  compose:lctrl		=	+compose(lctrl)

-  compose:rctrl		=	+compose(rctrl)

-  compose:caps		=	+compose(caps)

-  compose:102		=	+compose(102)

-  compose:paus		=	+compose(paus)

-  compose:prsc		=	+compose(prsc)

-  compose:sclk		=	+compose(sclk)

-  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)

-  eurosign:e		=	+eurosign(e)

-  eurosign:2		=	+eurosign(2)

-  eurosign:4		=	+eurosign(4)

-  eurosign:5		=	+eurosign(5)

-  keypad:oss            =       +keypad(oss)

-  keypad:legacy         =	+keypad(legacy)

-  keypad:legacy_wang    =	+keypad(legacy_wang)

-  keypad:oss_wang       =	+keypad(oss_wang)

-  keypad:future         =	+keypad(future)

-  keypad:future_wang    =	+keypad(future_wang)

-  keypad:hex            =	+keypad(ops)+keypad(hex)

-  keypad:atm            =	+keypad(ops)+keypad(hex)+keypad(atm)  

-  nbsp:none             =	+nbsp(none)

-  nbsp:level2           =	+nbsp(level2)

-  nbsp:level3           =	+nbsp(level3)

-  nbsp:level3s          =	+nbsp(level3s)

-  nbsp:level3n          =	+nbsp(level3n)

-  nbsp:level4           =	+nbsp(level4)

-  nbsp:level4n          =	+nbsp(level4n)

-  nbsp:level4nl         =	+nbsp(level4nl)

-  japan:nicola_f_bs     =	+jp(nicola_f_bs)

-  kpdl:dot              =	+kpdl(dot)

-  kpdl:comma            =	+kpdl(comma)

-  kpdl:dotoss           =	+kpdl(dotoss)

-  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)

-  kpdl:commaoss         =	+kpdl(commaoss)

-  kpdl:momayyezoss      =	+kpdl(momayyezoss)

-  kpdl:kposs            =	+kpdl(kposs)

-  kpdl:semi             =	+kpdl(semi)

-  shift:breaks_caps     =	+shift(breaks_caps)

-  esperanto:qwerty      =	+epo(qwerty)

-  esperanto:dvorak      =	+epo(dvorak)

-  terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)

-  apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)

-

-

+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  grp:shifts_toggle	=	+group(shifts_toggle)
+  grp:ctrls_toggle	=	+group(ctrls_toggle)
+  grp:alts_toggle	=	+group(alts_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
+  grp:rctrl_rshift_toggle	=	+group(rctrl_rshift_toggle)
+  grp:caps_toggle	=	+capslock(grouplock)
+  grp:caps_switch       =       +capslock(groupshift)
+  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
+  grp:win_menu_switch	=	+group(win_menu_switch)
+  grp:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:alt_space_toggle	=	+group(alt_space_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  grp:sclk_toggle	=	+group(sclk_toggle)
+  grp:lctrl_rctrl_switch	=	+group(lctrl_rctrl_switch)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  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)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:lctrl		=	+compose(lctrl)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  compose:paus		=	+compose(paus)
+  compose:prsc		=	+compose(prsc)
+  compose:sclk		=	+compose(sclk)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:hex            =	+keypad(ops)+keypad(hex)
+  keypad:atm            =	+keypad(ops)+keypad(hex)+keypad(atm)  
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  kpdl:semi             =	+kpdl(semi)
+  shift:breaks_caps     =	+shift(breaks_caps)
+  esperanto:qwerty      =	+epo(qwerty)
+  esperanto:dvorak      =	+epo(dvorak)
+  terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
+  apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)
+  shift:both_capslock                =       +shift(both_capslock)
+  shift:lshift_both_capslock         =       +shift(lshift_both_capslock)
+  shift:rshift_both_capslock         =       +shift(rshift_both_capslock)
+  lv3:caps_switch                    =       +level3(caps_switch)
+  lv3:bksl_switch                    =       +level3(bksl_switch)
+  lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
+  lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
+
+
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index e5f02f871..844bf4536 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -2478,6 +2478,19 @@
             <languageList><iso639Id>hau</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>avn</name>
+            <_description>Avatime</_description>
+            <languageList><iso639Id>avn</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>gillbt</name>
+            <_description>GILLBT</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2898,7 +2911,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <description>Macintosh</description>
+            <_description>Macintosh</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4692,6 +4705,18 @@
           <_description>Enter on keypad</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch</name>
+          <_description>CapsLock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch</name>
+          <_description>Backslash</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       <!-- Tweaking the position of the "Ctrl" key -->
@@ -5129,7 +5154,7 @@
       <option>
         <configItem>
           <name>apple:alupckeys</name>
-          <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)</description>
+          <_description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)</_description>
         </configItem>
       </option>
       <option>
@@ -5144,6 +5169,12 @@
           <_description>Enable extra typographic characters</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>shift:both_capslock</name>
+          <_description>Both Shift-Keys together toggle CapsLock</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
@@ -5176,6 +5207,60 @@
         </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>lv5</name>
+        <_description>Key to choose 5th level</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock</name>
+	  <_description>&lt;Less/Greater&gt; chooses 5th level and locks it when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <_description>Right Alt chooses 5th level and locks it when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock</name>
+          <_description>Left Win chooses 5th level and locks it when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock</name>
+          <_description>Right Win chooses 5th level and locks it when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <_description>&lt;Less/Greater&gt; chooses 5th level and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <_description>Right Alt chooses 5th level and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock_cancel</name>
+          <_description>Left Win chooses 5th level and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock_cancel</name>
+          <_description>Right Win chooses 5th level and locks it when pressed together with another 5th-level-chooser, one press releases the lock</_description>
+        </configItem>
+      </option>
+    </group>
     <group allowMultipleSelection="false">
       <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level -->
       <configItem>
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
index 7c84f4996..087263427 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -1,63 +1,68 @@
-

-transform_files=layoutsMapping.lst variantsMapping.lst

-

-dist_parts=base.o_s.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)

+
+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/xkbdata.src/rules/compat/base.l1v1_c.part b/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part
new file mode 100644
index 000000000..64ff0f2f5
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xkbdata.src/rules/compat/base.l2v2_c.part b/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part
new file mode 100644
index 000000000..fea61be76
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xkbdata.src/rules/compat/base.l3v3_c.part b/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part
new file mode 100644
index 000000000..5a1fb2f8a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xkbdata.src/rules/compat/base.l4v4_c.part b/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part
new file mode 100644
index 000000000..ac8a91102
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xkbdata.src/rules/compat/base.lv_c.part b/xorg-server/xkbdata.src/rules/compat/base.lv_c.part
new file mode 100644
index 000000000..64ff0f2f5
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/base.lv_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)