Update to xkeyboard-config 2.19

ok matthieu@

data/xkeyboard-config/man/xkeyboard-config.7

@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.18" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.19" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -266,6 +266,9 @@ at(nodeadkeys)	German (Austria, eliminate dead keys)
 at(sundeadkeys)	German (Austria, Sun dead keys)
 at(mac)	German (Austria, Macintosh)
 
+_
+au	English (Australian)
+
 _
 az	Azerbaijani
 az(cyrillic)	Azerbaijani (Cyrillic)
@@ -285,44 +288,11 @@ be(nodeadkeys)	Belgian (eliminate dead keys)
 be(sundeadkeys)	Belgian (Sun dead keys)
 be(wang)	Belgian (Wang model 724 azerty)
 
-_
-bd	Bangla
-bd(probhat)	Bangla (Probhat)
-
 _
 in	Indian
-in(ben)	Bangla (India)
-in(ben_probhat)	Bangla (India, Probhat)
-in(ben_baishakhi)	Bangla (India, Baishakhi)
-in(ben_bornona)	Bangla (India, Bornona)
-in(ben_gitanjali)	Bangla (India, Uni Gitanjali)
-in(ben_inscript)	Bangla (India, Baishakhi Inscript)
-in(eeyek)	Manipuri (Eeyek)
-in(guj)	Gujarati
-in(guru)	Punjabi (Gurmukhi)
-in(jhelum)	Punjabi (Gurmukhi Jhelum)
-in(kan)	Kannada
-in(kan-kagapa)	Kannada (KaGaPa phonetic)
-in(mal)	Malayalam
-in(mal_lalitha)	Malayalam (Lalitha)
-in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee sign)
-in(ori)	Oriya
-in(olck)	Ol Chiki
-in(tam_unicode)	Tamil (Unicode)
-in(tam_keyboard_with_numerals)	Tamil (keyboard with numerals)
-in(tam_TAB)	Tamil (TAB typewriter)
-in(tam_TSCII)	Tamil (TSCII typewriter)
-in(tam)	Tamil
-in(tel)	Telugu
-in(tel-kagapa)	Telugu (KaGaPa phonetic)
 in(urd-phonetic)	Urdu (phonetic)
 in(urd-phonetic3)	Urdu (alternative phonetic)
 in(urd-winkeys)	Urdu (WinKeys)
-in(bolnagri)	Hindi (Bolnagri)
-in(hin-wx)	Hindi (Wx)
-in(hin-kagapa)	Hindi (KaGaPa phonetic)
-in(san-kagapa)	Sanskrit (KaGaPa phonetic)
-in(mar-kagapa)	Marathi (KaGaPa phonetic)
 in(eng)	English (India, with rupee sign)
 
 _
@@ -367,6 +337,7 @@ cm(french)	French (Cameroon)
 cm(qwerty)	Cameroon Multilingual (qwerty)
 cm(azerty)	Cameroon Multilingual (azerty)
 cm(dvorak)	Cameroon Multilingual (Dvorak)
+cm(mmuock)	Mmuock
 
 _
 mm	Burmese
@@ -455,7 +426,6 @@ fi(nodeadkeys)	Finnish (classic, eliminate dead keys)
 fi(winkeys)	Finnish (Winkeys)
 fi(smi)	Northern Saami (Finland)
 fi(mac)	Finnish (Macintosh)
-fi(das)	Finnish (DAS)
 
 _
 fr	French
@@ -516,7 +486,7 @@ de(dsb_qwertz)	Lower Sorbian (qwertz)
 de(qwerty)	German (qwerty)
 de(tr)	Turkish (Germany)
 de(ru)	Russian (Germany, phonetic)
-de(legacy)	German (legacy)
+de(deadtilde)	German (dead tilde)
 
 _
 gr	Greek
@@ -589,6 +559,7 @@ _
 kz	Kazakh
 kz(ruskaz)	Russian (Kazakhstan, with Kazakh)
 kz(kazrus)	Kazakh (with Russian)
+kz(ext)	Kazakh (extended)
 
 _
 la	Lao
@@ -705,6 +676,7 @@ ru(srp)	Serbian (Russia)
 ru(bak)	Bashkirian
 ru(chm)	Mari
 ru(phonetic_azerty)	Russian (phonetic azerty)
+ru(phonetic_dvorak)	Russian (phonetic dvorak)
 ru(phonetic_fr)	Russian (phonetic French)
 
 _
@@ -1029,7 +1001,6 @@ ctrl:ac_ctrl	At left of 'A'
 ctrl:aa_ctrl	At bottom left
 ctrl:rctrl_ralt	Right Ctrl as Right Alt
 ctrl:menu_rctrl	Menu as Right Ctrl
-ctrl:ctrl_ralt	Right Alt as Right Ctrl
 ctrl:swap_lalt_lctl	Swap Left Alt key with Left Ctrl key
 ctrl:swap_lwin_lctl	Swap Left Win key with Left Ctrl key
 ctrl:swap_rwin_rctl	Swap Right Win key with Right Ctrl key

data/xkeyboard-config/pc/Makefile

@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.8 2016/06/28 16:49:22 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.9 2016/10/09 11:49:40 shadchin Exp $
 
 XKC_TOP =		../../..
-PACKAGE_VERSION =	2.18
+PACKAGE_VERSION =	2.19
 PKGCONFIG =		xkeyboard-config.pc
 EXTRA_PKGCONFIG_SUBST =	-e 's,@VERSION@,${PACKAGE_VERSION},g' \
 			-e 's,@xkb_base@,${XKB_BASE},g'

data/xkeyboard-config/symbols/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2016/06/28 16:49:22 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.14 2016/10/09 11:49:40 shadchin Exp $
 
 SUBDIR=		digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr \
 		nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \
@@ -6,13 +6,13 @@ SUBDIR=		digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr \
 
 XKB_SUBDIR=	symbols
 
-DATA=	af al am apl ara at az ba bd be bg bn br brai bt bw by ca cd ch cm cn \
+DATA=	af al am apl ara at au az ba bd be bg bn br brai bt bw by ca cd ch cm \
-	cz de dk dz ee es et eu epo fi fo fr gb ge gh gn gr hr hu id ie il in \
+	cn cz de dk dz ee es et eu epo fi fo fr gb ge gh gn gr hr hu id ie il \
-	iq ir is it jp ke kg kh kr kz la latam latin lk lt lv ma mao md me mk \
+	in iq ir is it jp ke kg kh kr kz la latam latin lk lt lv ma mao md me \
-	ml mm mn mt mv my ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy \
+	mk ml mm mn mt mv my ng nl no np parens pc ph pk pl pt ro rs ru se si \
-	tg th terminate tj tm tw tr tz ua us uz vn za altwin capslock compose \
+	sk sn sy tg th terminate tj tm tw tr tz ua us uz vn za altwin capslock \
-	ctrl empty eurosign rupeesign group inet keypad kpdl level3 level5 \
+	compose ctrl empty eurosign rupeesign group inet keypad kpdl level3 \
-	nbsp olpc shift srvr_ctrl typo
+	level5 nbsp olpc shift srvr_ctrl typo
 
 .include <bsd.xorg.mk>
 .include <bsd.subdir.mk>

dist/xkeyboard-config/NEWS

@@ -1,3 +1,5 @@
+2.19	21 bugs fixed
+	Translations updated
 2.18	8 bugs fixed
 	Translations updated
 2.17	13 bugs fixed

dist/xkeyboard-config/aclocal.m4

@@ -210,32 +210,63 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # AC_DEFUN([AC_PROG_INTLTOOL], ...)
 
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
+dnl serial 11 (pkg-config-0.29)
-# 
+dnl
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-# This program is free software; you can redistribute it and/or modify
+dnl
-# it under the terms of the GNU General Public License as published by
+dnl This program is free software; you can redistribute it and/or modify
-# the Free Software Foundation; either version 2 of the License, or
+dnl it under the terms of the GNU General Public License as published by
-# (at your option) any later version.
+dnl the Free Software Foundation; either version 2 of the License, or
-#
+dnl (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but
+dnl
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl This program is distributed in the hope that it will be useful, but
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-# General Public License for more details.
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#
+dnl General Public License for more details.
-# You should have received a copy of the GNU General Public License
+dnl
-# along with this program; if not, write to the Free Software
+dnl You should have received a copy of the GNU General Public License
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl along with this program; if not, write to the Free Software
-#
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# As a special exception to the GNU General Public License, if you
+dnl 02111-1307, USA.
-# distribute this file as part of a program that contains a
+dnl
-# configuration script generated by Autoconf, you may include it under
+dnl As a special exception to the GNU General Public License, if you
-# the same distribution terms that you use for the rest of that program.
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl PKG_PREREQ(MIN-VERSION)
-# ----------------------------------
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -257,18 +288,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
+dnl -------------------------------------------------------------------
-# Check to see whether a particular set of modules exists.  Similar
+dnl Since: 0.18
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
-#
+dnl Check to see whether a particular set of modules exists. Similar to
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-# only at the first occurence in configure.ac, so if the first place
+dnl
-# it's called might be skipped (such as if it is within an "if", you
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# have to call PKG_CHECK_EXISTS manually
+dnl only at the first occurence in configure.ac, so if the first place
-# --------------------------------------------------------------
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -278,8 +310,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -291,10 +325,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
+dnl _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -302,19 +337,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
+dnl   [ACTION-IF-NOT-FOUND])
-#
+dnl --------------------------------------------------------------
-#
+dnl Since: 0.4.0
-# Note that if there is a possibility the first call to
+dnl
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl Note that if there is a possibility the first call to
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-#
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-# --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -368,16 +401,40 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
 
-# PKG_INSTALLDIR(DIRECTORY)
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# -------------------------
+dnl   [ACTION-IF-NOT-FOUND])
-# Substitutes the variable pkgconfigdir as the location where a module
+dnl ---------------------------------------------------------------------
-# should install pkg-config .pc files. By default the directory is
+dnl Since: 0.29
-# $libdir/pkgconfig, but the default can be changed by passing
+dnl
-# DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl Checks for existence of MODULES and gathers its build flags with
-# parameter.
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -388,16 +445,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-# -------------------------
+dnl --------------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl Since: 0.27
-# module should install arch-independent pkg-config .pc files. By
+dnl
-# default the directory is $datadir/pkgconfig, but the default can be
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-# changed by passing DIRECTORY. The user can override through the
+dnl module should install arch-independent pkg-config .pc files. By
-# --with-noarch-pkgconfigdir parameter.
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -408,13 +467,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
+dnl -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -423,7 +484,7 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
 
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl

dist/xkeyboard-config/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.18.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.19.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.18'
+PACKAGE_VERSION='2.19'
-PACKAGE_STRING='xkeyboard-config 2.18'
+PACKAGE_STRING='xkeyboard-config 2.19'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1333,7 +1333,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.18 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1404,7 +1404,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkeyboard-config 2.18:";;
+     short | recursive ) echo "Configuration of xkeyboard-config 2.19:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,7 +1523,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.18
+xkeyboard-config configure 2.19
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1703,7 +1703,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.18, which was
+It was created by xkeyboard-config $as_me 2.19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2568,7 +2568,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.18'
+ VERSION='2.19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7847,7 +7847,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 2.18, which was
+This file was extended by xkeyboard-config $as_me 2.19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7904,7 +7904,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xkeyboard-config config.status 2.18
+xkeyboard-config config.status 2.19
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

dist/xkeyboard-config/configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.18)
+AC_INIT(xkeyboard-config, 2.19)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

dist/xkeyboard-config/po/af.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2004-03-18 00:17+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/az.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2004-03-21 20:00+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/crh.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-06 19:25-0500\n"
 "Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
 "Language-Team: Crimean Tatar (Crimean Turkish) <tilde-birlik-tercime@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/el.po

@@ -12,6 +12,7 @@ msgstr ""
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
 "Language: el\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/en_GB.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-04-09 16:58+0100\n"
 "Last-Translator: Christopher Orr <chris@protactin.co.uk>\n"
 "Language-Team: English <en_gb@li.org>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/eo.po

@@ -12,6 +12,7 @@ msgstr ""
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/es.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Facundo Dario Illanes <fdillanes@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/fi.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/gl.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: marcos <marcoslansgarza@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/id.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "Language: id\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/it.po

@@ -40,6 +40,7 @@ msgstr ""
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/ja.po

@@ -13,6 +13,7 @@ msgstr ""
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/ka.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2006-09-20 22:48+0200\n"
 "Last-Translator: Vladimer Sichinava <vlsichinava@gmail.com>\n"
 "Language-Team: Georgian <www.gia.ge>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/ky.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-17 20:10+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/lt.po

@@ -11,6 +11,7 @@ msgstr ""
 "Last-Translator: Rimas Kudelis <rq@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "Language: lt\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/nb.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-04-12 11:33+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/nl.po

@@ -39,6 +39,7 @@ msgstr ""
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/ro.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2010-08-06 23:36+0300\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/rw.po

@@ -20,6 +20,7 @@ msgstr ""
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/sk.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-04 22:49+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/sl.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/sq.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2004-03-03 08:55-0500\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/sr.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-02 19:14+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/tr.po

@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "Language: tr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/zh_CN.po

@@ -15,6 +15,7 @@ msgstr ""
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/po/zh_TW.po

@@ -13,6 +13,7 @@ msgstr ""
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dist/xkeyboard-config/rules/base.extras.xml.in

@@ -357,12 +357,36 @@
             <_description>English (Carpalx)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-intl</name>
+            <_description>English (Carpalx, international with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-altgr-intl</name>
+            <_description>English (Carpalx, international AltGr dead keys)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>carpalx-full</name>
             <_description>English (Carpalx, full optimization)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-full-intl</name>
+            <_description>English (Carpalx, full optimization, international with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-full-altgr-intl</name>
+            <_description>English (Carpalx, full optimization, international AltGr dead keys)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -634,6 +658,12 @@
         <_description>Finnish</_description>
       </configItem>
       <variantList>
+        <variant>
+          <configItem>
+            <name>das</name>
+            <_description>Finnish (DAS)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>sun_type6</name>
@@ -918,6 +948,375 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <!-- Keyboard indicator for Bangla layouts -->
+        <_shortDescription>bn</_shortDescription>
+        <_description>Bangla</_description>
+        <languageList>
+          <iso639Id>ben</iso639Id>
+          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+          <iso639Id>sat</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Bangla (Probhat)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <!-- Keyboard indicator for Indian layouts -->
+        <_shortDescription>in</_shortDescription>
+        <_description>Indian</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <!-- Keyboard indicator for Bangla layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bangla (India)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <!-- Keyboard indicator for Bangla layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bangla (India, Probhat)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_baishakhi</name>
+            <_description>Bangla (India, Baishakhi)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_bornona</name>
+            <_description>Bangla (India, Bornona)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+         <variant>
+          <configItem>
+            <name>ben_gitanjali</name>
+            <_description>Bangla (India, Uni Gitanjali)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_inscript</name>
+            <_description>Bangla (India, Baishakhi Inscript)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eeyek</name>
+            <_description>Manipuri (Eeyek)</_description>
+            <languageList>
+              <iso639Id>mni</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <!-- Keyboard indicator for Gujarati layouts -->
+            <_shortDescription>gu</_shortDescription>
+            <_description>Gujarati</_description>
+            <languageList>
+              <iso639Id>guj</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan-kagapa</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (Lalitha)</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal_enhanced</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+         </variant>
+         <variant>
+           <configItem>
+            <name>ori</name>
+            <!-- Keyboard indicator for Oriya layouts -->
+            <_shortDescription>or</_shortDescription>
+            <_description>Oriya</_description>
+            <languageList>
+              <iso639Id>ori</iso639Id>
+              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+           <configItem>
+            <name>olck</name>
+            <!-- Keyboard indicator for Ol Chiki layouts -->
+            <_shortDescription>sat</_shortDescription>
+            <_description>Ol Chiki</_description>
+            <languageList>
+              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Unicode)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_keyboard_with_numerals</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (keyboard with numerals)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TAB typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TSCII typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel-kagapa</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Bolnagri)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hin-wx</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Wx)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hin-kagapa</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>san-kagapa</name>
+            <!-- Keyboard indicator for Sanskrit layouts -->
+            <_shortDescription>sa</_shortDescription>
+            <_description>Sanskrit (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>san</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mar-kagapa</name>
+            <!-- Keyboard indicator for Marathi layouts -->
+            <_shortDescription>mr</_shortDescription>
+            <_description>Marathi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>mar</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
   </layoutList>
-  <optionList/>
+  <optionList>
+      <group allowMultipleSelection="true">
+          <!-- Tweaking the position of the "(" and ")" keys -->
+          <configItem>
+              <name>parens</name>
+              <description>Parentheses position</description>
+          </configItem>
+          <option>
+              <configItem>
+                  <name>parens:swap_brackets</name>
+                  <description>Swap with square brackets</description>
+              </configItem>
+          </option>
+      </group>
+  </optionList>
 </xkbConfigRegistry>

dist/xkeyboard-config/rules/base.ml_s.part

@@ -30,7 +30,6 @@
   olpcm		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
   sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
-  zaurus	*			=	pc+sharp_vndr/sl-c3x00(basic)
   ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
   ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
   ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)

dist/xkeyboard-config/rules/base.o_s.part

@@ -170,5 +170,5 @@
   lv5:ralt_switch_lock_cancel     =       +level5(ralt_switch_lock_cancel)
   lv5:lwin_switch_lock_cancel     =       +level5(lwin_switch_lock_cancel)
   lv5:rwin_switch_lock_cancel     =       +level5(rwin_switch_lock_cancel)
-
+  parens:swap_brackets   =   +parens(swap_brackets)
 

dist/xkeyboard-config/rules/base.xml.in

@@ -1691,6 +1691,17 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>au</name>
+        <!-- Keyboard indicator for Australian layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Australian)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
     <layout>
       <configItem>
         <name>az</name>
@@ -1792,27 +1803,6 @@
         </variant>
       </variantList>
     </layout>
-    <layout>
-      <configItem>
-        <name>bd</name>
-        <!-- Keyboard indicator for Bangla layouts -->
-        <_shortDescription>bn</_shortDescription>
-        <_description>Bangla</_description>
-        <languageList>
-          <iso639Id>ben</iso639Id>
-          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-          <iso639Id>sat</iso639Id>
-        </languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>probhat</name>
-            <_description>Bangla (Probhat)</_description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
     <layout>
       <configItem>
         <name>in</name>
@@ -1821,275 +1811,6 @@
         <_description>Indian</_description>
       </configItem>
       <variantList>
-        <variant>
-          <configItem>
-            <name>ben</name>
-            <!-- Keyboard indicator for Bangla layouts -->
-            <_shortDescription>bn</_shortDescription>
-            <_description>Bangla (India)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_probhat</name>
-            <!-- Keyboard indicator for Bangla layouts -->
-            <_shortDescription>bn</_shortDescription>
-            <_description>Bangla (India, Probhat)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_baishakhi</name>
-            <_description>Bangla (India, Baishakhi)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_bornona</name>
-            <_description>Bangla (India, Bornona)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-         <variant>
-          <configItem>
-            <name>ben_gitanjali</name>
-            <_description>Bangla (India, Uni Gitanjali)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_inscript</name>
-            <_description>Bangla (India, Baishakhi Inscript)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>eeyek</name>
-            <_description>Manipuri (Eeyek)</_description>
-            <languageList>
-              <iso639Id>mni</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guj</name>
-            <!-- Keyboard indicator for Gujarati layouts -->
-            <_shortDescription>gu</_shortDescription>
-            <_description>Gujarati</_description>
-            <languageList>
-              <iso639Id>guj</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guru</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <_shortDescription>pa</_shortDescription>
-            <_description>Punjabi (Gurmukhi)</_description>
-            <languageList>
-              <iso639Id>pan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>jhelum</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <_shortDescription>pa</_shortDescription>
-            <_description>Punjabi (Gurmukhi Jhelum)</_description>
-            <languageList>
-              <iso639Id>pan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kan</name>
-            <!-- Keyboard indicator for Kannada layouts -->
-            <_shortDescription>kn</_shortDescription>
-            <_description>Kannada</_description>
-            <languageList>
-              <iso639Id>kan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kan-kagapa</name>
-            <!-- Keyboard indicator for Kannada layouts -->
-            <_shortDescription>kn</_shortDescription>
-            <_description>Kannada (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>kan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal_lalitha</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam (Lalitha)</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal_enhanced</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-         </variant>
-         <variant>
-           <configItem>
-            <name>ori</name>
-            <!-- Keyboard indicator for Oriya layouts -->
-            <_shortDescription>or</_shortDescription>
-            <_description>Oriya</_description>
-            <languageList>
-              <iso639Id>ori</iso639Id>
-              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-           <configItem>
-            <name>olck</name>
-            <!-- Keyboard indicator for Ol Chiki layouts -->
-            <_shortDescription>sat</_shortDescription>
-            <_description>Ol Chiki</_description>
-            <languageList>
-              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_unicode</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (Unicode)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_keyboard_with_numerals</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (keyboard with numerals)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TAB</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TAB typewriter)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TSCII</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TSCII typewriter)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tel</name>
-            <!-- Keyboard indicator for Telugu layouts -->
-            <_shortDescription>te</_shortDescription>
-            <_description>Telugu</_description>
-            <languageList>
-              <iso639Id>tel</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tel-kagapa</name>
-            <!-- Keyboard indicator for Telugu layouts -->
-            <_shortDescription>te</_shortDescription>
-            <_description>Telugu (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>tel</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
         <variant>
           <configItem>
             <name>urd-phonetic</name>
@@ -2123,61 +1844,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>bolnagri</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (Bolnagri)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-wx</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (Wx)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-kagapa</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>san-kagapa</name>
-            <!-- Keyboard indicator for Sanskrit layouts -->
-            <_shortDescription>sa</_shortDescription>
-            <_description>Sanskrit (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>san</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mar-kagapa</name>
-            <!-- Keyboard indicator for Marathi layouts -->
-            <_shortDescription>mr</_shortDescription>
-            <_description>Marathi (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>mar</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
         <variant>
           <configItem>
             <name>eng</name>
@@ -2521,6 +2187,12 @@
             <_description>Cameroon Multilingual (Dvorak)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>mmuock</name>
+            <description>Mmuock</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3048,12 +2720,6 @@
             <_description>Finnish (Macintosh)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>das</name>
-            <_description>Finnish (DAS)</_description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3454,8 +3120,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>legacy</name>
+            <name>deadtilde</name>
-            <_description>German (legacy)</_description>
+            <_description>German (dead tilde)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3857,6 +3523,15 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>ext</name>
+            <_description>Kazakh (extended)</_description>
+            <languageList>
+              <iso639Id>kaz</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4566,6 +4241,12 @@
             <_description>Russian (phonetic azerty)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>phonetic_dvorak</name>
+            <_description>Russian (phonetic dvorak)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>phonetic_fr</name>
@@ -6351,12 +6032,6 @@
           <_description>Menu as Right Ctrl</_description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>ctrl:ctrl_ralt</name>
-          <_description>Right Alt as Right Ctrl</_description>
-        </configItem>
-      </option>
       <option>
         <configItem>
           <name>ctrl:swap_lalt_lctl</name>

dist/xkeyboard-config/rules/evdev.extras.xml.in

@@ -357,12 +357,36 @@
             <_description>English (Carpalx)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-intl</name>
+            <_description>English (Carpalx, international with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-altgr-intl</name>
+            <_description>English (Carpalx, international AltGr dead keys)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>carpalx-full</name>
             <_description>English (Carpalx, full optimization)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-full-intl</name>
+            <_description>English (Carpalx, full optimization, international with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>carpalx-full-altgr-intl</name>
+            <_description>English (Carpalx, full optimization, international AltGr dead keys)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -634,6 +658,12 @@
         <_description>Finnish</_description>
       </configItem>
       <variantList>
+        <variant>
+          <configItem>
+            <name>das</name>
+            <_description>Finnish (DAS)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>sun_type6</name>
@@ -918,6 +948,375 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <!-- Keyboard indicator for Bangla layouts -->
+        <_shortDescription>bn</_shortDescription>
+        <_description>Bangla</_description>
+        <languageList>
+          <iso639Id>ben</iso639Id>
+          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+          <iso639Id>sat</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Bangla (Probhat)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <!-- Keyboard indicator for Indian layouts -->
+        <_shortDescription>in</_shortDescription>
+        <_description>Indian</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <!-- Keyboard indicator for Bangla layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bangla (India)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <!-- Keyboard indicator for Bangla layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bangla (India, Probhat)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_baishakhi</name>
+            <_description>Bangla (India, Baishakhi)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_bornona</name>
+            <_description>Bangla (India, Bornona)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+         <variant>
+          <configItem>
+            <name>ben_gitanjali</name>
+            <_description>Bangla (India, Uni Gitanjali)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_inscript</name>
+            <_description>Bangla (India, Baishakhi Inscript)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eeyek</name>
+            <_description>Manipuri (Eeyek)</_description>
+            <languageList>
+              <iso639Id>mni</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <!-- Keyboard indicator for Gujarati layouts -->
+            <_shortDescription>gu</_shortDescription>
+            <_description>Gujarati</_description>
+            <languageList>
+              <iso639Id>guj</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan-kagapa</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (Lalitha)</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal_enhanced</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
+         </variant>
+         <variant>
+           <configItem>
+            <name>ori</name>
+            <!-- Keyboard indicator for Oriya layouts -->
+            <_shortDescription>or</_shortDescription>
+            <_description>Oriya</_description>
+            <languageList>
+              <iso639Id>ori</iso639Id>
+              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+           <configItem>
+            <name>olck</name>
+            <!-- Keyboard indicator for Ol Chiki layouts -->
+            <_shortDescription>sat</_shortDescription>
+            <_description>Ol Chiki</_description>
+            <languageList>
+              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
+              <iso639Id>sat</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Unicode)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_keyboard_with_numerals</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (keyboard with numerals)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TAB typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TSCII typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel-kagapa</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Bolnagri)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hin-wx</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Wx)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hin-kagapa</name>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>san-kagapa</name>
+            <!-- Keyboard indicator for Sanskrit layouts -->
+            <_shortDescription>sa</_shortDescription>
+            <_description>Sanskrit (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>san</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mar-kagapa</name>
+            <!-- Keyboard indicator for Marathi layouts -->
+            <_shortDescription>mr</_shortDescription>
+            <_description>Marathi (KaGaPa phonetic)</_description>
+            <languageList>
+              <iso639Id>mar</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
   </layoutList>
-  <optionList/>
+  <optionList>
+      <group allowMultipleSelection="true">
+          <!-- Tweaking the position of the "(" and ")" keys -->
+          <configItem>
+              <name>parens</name>
+              <description>Parentheses position</description>
+          </configItem>
+          <option>
+              <configItem>
+                  <name>parens:swap_brackets</name>
+                  <description>Swap with square brackets</description>
+              </configItem>
+          </option>
+      </group>
+  </optionList>
 </xkbConfigRegistry>

dist/xkeyboard-config/rules/evdev.xml.in

@@ -1691,6 +1691,17 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>au</name>
+        <!-- Keyboard indicator for Australian layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Australian)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
     <layout>
       <configItem>
         <name>az</name>
@@ -1792,27 +1803,6 @@
         </variant>
       </variantList>
     </layout>
-    <layout>
-      <configItem>
-        <name>bd</name>
-        <!-- Keyboard indicator for Bangla layouts -->
-        <_shortDescription>bn</_shortDescription>
-        <_description>Bangla</_description>
-        <languageList>
-          <iso639Id>ben</iso639Id>
-          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-          <iso639Id>sat</iso639Id>
-        </languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>probhat</name>
-            <_description>Bangla (Probhat)</_description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
     <layout>
       <configItem>
         <name>in</name>
@@ -1821,275 +1811,6 @@
         <_description>Indian</_description>
       </configItem>
       <variantList>
-        <variant>
-          <configItem>
-            <name>ben</name>
-            <!-- Keyboard indicator for Bangla layouts -->
-            <_shortDescription>bn</_shortDescription>
-            <_description>Bangla (India)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_probhat</name>
-            <!-- Keyboard indicator for Bangla layouts -->
-            <_shortDescription>bn</_shortDescription>
-            <_description>Bangla (India, Probhat)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_baishakhi</name>
-            <_description>Bangla (India, Baishakhi)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_bornona</name>
-            <_description>Bangla (India, Bornona)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-         <variant>
-          <configItem>
-            <name>ben_gitanjali</name>
-            <_description>Bangla (India, Uni Gitanjali)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_inscript</name>
-            <_description>Bangla (India, Baishakhi Inscript)</_description>
-            <languageList>
-              <iso639Id>ben</iso639Id>
-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>eeyek</name>
-            <_description>Manipuri (Eeyek)</_description>
-            <languageList>
-              <iso639Id>mni</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guj</name>
-            <!-- Keyboard indicator for Gujarati layouts -->
-            <_shortDescription>gu</_shortDescription>
-            <_description>Gujarati</_description>
-            <languageList>
-              <iso639Id>guj</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guru</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <_shortDescription>pa</_shortDescription>
-            <_description>Punjabi (Gurmukhi)</_description>
-            <languageList>
-              <iso639Id>pan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>jhelum</name>
-            <!-- Keyboard indicator for Punjabi layouts -->
-            <_shortDescription>pa</_shortDescription>
-            <_description>Punjabi (Gurmukhi Jhelum)</_description>
-            <languageList>
-              <iso639Id>pan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kan</name>
-            <!-- Keyboard indicator for Kannada layouts -->
-            <_shortDescription>kn</_shortDescription>
-            <_description>Kannada</_description>
-            <languageList>
-              <iso639Id>kan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kan-kagapa</name>
-            <!-- Keyboard indicator for Kannada layouts -->
-            <_shortDescription>kn</_shortDescription>
-            <_description>Kannada (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>kan</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal_lalitha</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam (Lalitha)</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal_enhanced</name>
-            <!-- Keyboard indicator for Malayalam layouts -->
-            <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
-            <languageList>
-              <iso639Id>mal</iso639Id>
-            </languageList>
-          </configItem>
-         </variant>
-         <variant>
-           <configItem>
-            <name>ori</name>
-            <!-- Keyboard indicator for Oriya layouts -->
-            <_shortDescription>or</_shortDescription>
-            <_description>Oriya</_description>
-            <languageList>
-              <iso639Id>ori</iso639Id>
-              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-           <configItem>
-            <name>olck</name>
-            <!-- Keyboard indicator for Ol Chiki layouts -->
-            <_shortDescription>sat</_shortDescription>
-            <_description>Ol Chiki</_description>
-            <languageList>
-              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
-              <iso639Id>sat</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_unicode</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (Unicode)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_keyboard_with_numerals</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (keyboard with numerals)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TAB</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TAB typewriter)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TSCII</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TSCII typewriter)</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam</name>
-            <!-- Keyboard indicator for Tamil layouts -->
-            <_shortDescription>ta</_shortDescription>
-            <_description>Tamil</_description>
-            <languageList>
-              <iso639Id>tam</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tel</name>
-            <!-- Keyboard indicator for Telugu layouts -->
-            <_shortDescription>te</_shortDescription>
-            <_description>Telugu</_description>
-            <languageList>
-              <iso639Id>tel</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tel-kagapa</name>
-            <!-- Keyboard indicator for Telugu layouts -->
-            <_shortDescription>te</_shortDescription>
-            <_description>Telugu (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>tel</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
         <variant>
           <configItem>
             <name>urd-phonetic</name>
@@ -2123,61 +1844,6 @@
             </languageList>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>bolnagri</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (Bolnagri)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-wx</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (Wx)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>hin-kagapa</name>
-            <!-- Keyboard indicator for Hindi layouts -->
-            <_shortDescription>hi</_shortDescription>
-            <_description>Hindi (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>hin</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>san-kagapa</name>
-            <!-- Keyboard indicator for Sanskrit layouts -->
-            <_shortDescription>sa</_shortDescription>
-            <_description>Sanskrit (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>san</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mar-kagapa</name>
-            <!-- Keyboard indicator for Marathi layouts -->
-            <_shortDescription>mr</_shortDescription>
-            <_description>Marathi (KaGaPa phonetic)</_description>
-            <languageList>
-              <iso639Id>mar</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
         <variant>
           <configItem>
             <name>eng</name>
@@ -2521,6 +2187,12 @@
             <_description>Cameroon Multilingual (Dvorak)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>mmuock</name>
+            <description>Mmuock</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3048,12 +2720,6 @@
             <_description>Finnish (Macintosh)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>das</name>
-            <_description>Finnish (DAS)</_description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3454,8 +3120,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>legacy</name>
+            <name>deadtilde</name>
-            <_description>German (legacy)</_description>
+            <_description>German (dead tilde)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3857,6 +3523,15 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>ext</name>
+            <_description>Kazakh (extended)</_description>
+            <languageList>
+              <iso639Id>kaz</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4566,6 +4241,12 @@
             <_description>Russian (phonetic azerty)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>phonetic_dvorak</name>
+            <_description>Russian (phonetic dvorak)</_description>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>phonetic_fr</name>
@@ -6351,12 +6032,6 @@
           <_description>Menu as Right Ctrl</_description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>ctrl:ctrl_ralt</name>
-          <_description>Right Alt as Right Ctrl</_description>
-        </configItem>
-      </option>
       <option>
         <configItem>
           <name>ctrl:swap_lalt_lctl</name>

dist/xkeyboard-config/symbols/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr nec_vndr n
 symbolsdir = $(xkb_base)/symbols
 symbols_DATA = \
 af al am apl \
-ara at az \
+ara at au az \
 ba bd be \
 bg bn br brai \
 bt bw by \
@@ -26,7 +26,7 @@ ma mao md me \
 mk ml mm \
 mn mt mv my \
 ng nl no np \
-pc ph pk pl pt \
+parens pc ph pk pl pt \
 ro rs ru \
 se si sk sn \
 sy th \

dist/xkeyboard-config/symbols/Makefile.in

@@ -365,7 +365,7 @@ SUBDIRS = digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr nec_vndr n
 symbolsdir = $(xkb_base)/symbols
 symbols_DATA = \
 af al am apl \
-ara at az \
+ara at au az \
 ba bd be \
 bg bn br brai \
 bt bw by \
@@ -388,7 +388,7 @@ ma mao md me \
 mk ml mm \
 mn mt mv my \
 ng nl no np \
-pc ph pk pl pt \
+parens pc ph pk pl pt \
 ro rs ru \
 se si sk sn \
 sy th \

dist/xkeyboard-config/symbols/au

@@ -0,0 +1,9 @@
+//
+// Default Australian is the same as American
+//
+default  partial alphanumeric_keys
+xkb_symbols "basic" {
+    include "us(basic)"
+
+    name[Group1]= "English (Australian)";
+};

dist/xkeyboard-config/symbols/cm

@@ -1,4 +1,13 @@
 // ========== Cameroon Keyboards ==========
+
+
+// ----------------------------------------------------------------------------
+// This comment was added by <fotang at mmuock dot org>, on 18-Jun-2016:
+//  
+// All comments below this one, were in the original cm file;they do not
+// apply to the Mmuock keyboard which is defined towards the end of this file.
+// ----------------------------------------------------------------------------
+
 // ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******
 
 
@@ -324,9 +333,8 @@ xkb_symbols "semicolon_switch_dvorak" {
 modifier_map Mod5	{ ISO_Level3_Latch };
 };
 
-// EXTRAS:
 
-// ------- begin Mmuock keyboard map ------------------------------------------
+// ------- begin Mmuock alphabet layout ------------------------------------------
 //   This layout is used for the Mmuock alphabet as described in the book
 //   _The Sound of Mmuock: Orthography (2. ed.)_ [isbn: 978-9956-645-28-1].
 //   Mmuock is the language of the Mmuock (local: Muòk) people of Western
@@ -334,7 +342,7 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 // 
 //      Author: Tano Fotang <fotang at mmuock dot org>
 //     Created: 2014-06-24
-//     Version: 1.1
+//     Version: 1.2
 //
 // CHANGES v 1.0:
 //	2014-07-06 corrected shifted level3 of <AC11> to quotedbl
@@ -348,11 +356,23 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 //               keep the original latin mappings except for those few that we
 //               want to overwrite for our own keyboard.
 //
+// CHANGES v 1.2:
+// 2016-06-17  1- added dead keys dead_macron, dead_acute, and dead_grave for
+//                tones 1, 3, and 4, for compatibility with the Keyman version.
+//             2- rearranged combining diacritics for tones 0 to 5 such that
+//                the diacritics are on consequetive keys (AC01 to AC05).
+//             3- moved tone 8 to level 3 of AE12.
+//             4- moved layout definition out of the EXTRAS section.
+//             5- for a cleaner keyboard,
+//                replaced ṭhe included latin layout with us(basic).
+//
+//
 // NOTES:
-// 0. This map is based on the Latin layout for the US keyboard.
+// 0. This map is based on the Latin alphabet layout for the US keyboard.
 //
 // 1. We use combining diacritical marks to create tone markings. There are 13
-//    tones that need to be indicated.
+//    tones that need to be indicated, although the first 5 are usually enough
+//    to represent the rest in simplified orthography.
 //
 // 2. When composing Mmuock text, about every fourth symbol is for tone. To
 //    facilitate easy and fast input, the combining diacritics are placed on
@@ -363,18 +383,18 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 // 3. Symbols that are used infrequently (`r', `h', `ɛ', `ǝ', etc.) are placed
 //    in level3. Additionally, the letter eng (`ŋ'), although commonly used, 
 //    is found in level3 because it can alternatively be represented by <ng>.
-//    (Indeed, the keyman keyboard actually replaces <ng> with `ŋ'.)
+//    (Indeed, the keyman version of keyboard actually replaces <ng> with `ŋ'.)
 //
 // 4. The unshifted AB10 key (normally assigned to the slash `/') is used as
 //    level 3 switch since the slash is not used in the ordinary course of
 //    typing Mmuock text. 
 //
-// 5. The 'Cameroon Multilingual' keyboard that is defined elsewhere, does not
+// 5. The 'Cameroon Multilingual' keyboards that are defined elsewhere, do not
-//    fit our needs because: (a) it is based on a different alphabet, (b) the
+//    fit our needs because: (a) they are based on a different alphabet, (b) the
-//    vast majority of its symbols are not used in Mmuock, and (c) for the few
+//    vast majority of their symbols are not used in Mmuock, and (c) for the few
-//    symbols that are shared, the placing of the symbols is not egonomic for 
+//    symbols that are used in Mmuock, their placings are not egonomic for 
-//    typing Mmuock as the _PRIMARY_ language. The aim of this keyboard, is to
+//    typing Mmuock as the _PRIMARY_ language. The aim of this keyboard, is
-//    give priority to symbols that are actually used in the Mmuock alphabet.
+//    to give priority to symbols that are actually used in the Mmuock alphabet.
 //
 // 6. The following fonts have been found to produce the best results with this
 //    keyboard:
@@ -384,7 +404,7 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 //      Ubuntu (except light)            8/10
 //      Droid (except sans mono)         7/10
 //      Gentium, Gentium Alt           6.5/10
-//    In the terminal emulator, the following font variants are most suitable:
+//    In the terminal emulator, the following font variants have been tested:
 //      Ubuntu Mono                      9/10
 //      Unifont (Medium)                 9/10
 //      DejaVu Sans Mono               7.5/10
@@ -392,19 +412,21 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 //   These fonts are all freely available.
 // 
 // ------the layout-----------
-// Note: this drawing does not show the symbols that are mapped by the included
+//
-// latin sybols files. Shown are only the symbols that are requiired by the
+//   ┌─────┐
-// Mmuock keyboard.
+//   │ 2 4 │   2 = Shift,  4 = Level3 + Shift
+//   │ 1 3 │   1 = Normal, 3 = Level3
+//   └─────┘
 //
 //   ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-//   │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   | *   │ (   │ )   │ _   │ +   ┃ ⌫ Back- ┃
+//   │ ~ ~ │ !   │ @   │ #   │ $   │ %   │ ^   │ &   | *   │ (   │ )   │ _ – │ +   ̣┃ ⌫ Back- ┃
-// AE│ `   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   ̂│ 7   ̑│ 8   ̍│ 9   ̓│ 0   ̊│ -   │ =   ┃  space  ┃
+// AE│ ` ` │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   ̂│ 7   ̑│ 8   ̍│ 9   ̓│ 0   ̊│ ¯ - │ =   ̋┃  space  ┃
 //   ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
 //   ┃       ┃ Q   │ W   │ E Ǝ │ Š R │ T   │ Y   │ U Ω │ I Ɛ │ O Φ │ P ∏ │ Ø { │ Σ } ┃ Enter ┃
 // AD┃Tab ↹  ┃ q   │ w   │ e ǝ │ š r │ t   │ y   │ u ω │ i ɛ │ o φ │ p π │ ø [ │ σ ] ┃   ⏎   ┃
 //   ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
 //   ┃        ┃ A   │ S   │ D   │ F   │ G   │  ̇ H │ J   │ K   │ L   │ Œ : │ " ” │ Æ | ┃      ┃
-// AC┃Caps ⇬  ┃ a   │ s   ̃| d   ̀| f   ̌| g   ̈|  ̣ h │ j   ̆│ k   ̏│ l   ̄│ œ ; │ ' ’ │ æ \ ┃      ┃
+// AC┃Caps ⇬  ┃ a   ̃│ s   ̄| d   ́| f   ̀| g   ̌|  ̣ h │ j   ̆│ k   ̏│ l   ̈│ œ ; │ ' ’ │ æ \ ┃      ┃
 //   ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
 //   ┃             │ Z Dz │ X   │ C   │ V   │ B   │ N ŋ │ M   │ < « │ > » │ ?   ┃             ┃
 // AB┃Shift ⇧      │ z dz │ x   │ c   │ v   │ b   │ n Ŋ │ m   │ , ‹ │ . › │   / ┃Shift ⇧      ┃
@@ -417,15 +439,17 @@ modifier_map Mod5	{ ISO_Level3_Latch };
 partial alphanumeric_keys
 xkb_symbols "mmuock" {
 
-   include "latin"
+   include "us(basic)"
    include "level3(ralt_switch)"
 
    name[Group1]= "Mmuock";
    key <AE06> { [          6, asciicircum,          U0302                ] }; // tone 10
    key <AE07> { [          7,   ampersand,          U0311                ] }; // tone 12
-   key <AE08> { [          8,    asterisk,          U030D,     trademark ] }; // tone 13
+   key <AE08> { [          8,    asterisk,          U030D                ] }; // tone 13
-   key <AE09> { [          9,   parenleft,          U0313,     plusminus ] }; // tone 14
+   key <AE09> { [          9,   parenleft,          U0307                ] }; // tone 7
-   key <AE10> { [          0,  parenright,          U030A,        degree ] }; // tone 6
+   key <AE10> { [          0,  parenright,          U030A                ] }; // tone 6
+   key <AE11> { [dead_macron,  underscore,          minus,        endash ] };
+   key <AE12> { [      equal,        plus,          U030B, dead_belowdot ] }; // U030B = tone 8
    key <AD03> { [          e,           E,          U01DD,         U018E ] }; // U01DD = reversed E
    key <AD04> { [     scaron,      Scaron,              r,             R ] };
    key <AD07> { [          u,           U,    Greek_omega,   Greek_OMEGA ] };
@@ -434,17 +458,18 @@ xkb_symbols "mmuock" {
    key <AD10> { [          p,           P,       Greek_pi,      Greek_PI ] };
    key <AD11> { [     oslash,    Ooblique,    bracketleft,     braceleft ] };
    key <AD12> { [Greek_sigma, Greek_SIGMA,   bracketright,    braceright ] }; 
-   key <AC02> { [          s,           S,          U0303                ] }; // tone 1
+   key <AC01> { [          a,           A,          U0303                ] }; // tone 0
-   key <AC03> { [          d,           D,          U0300                ] }; // tone 4
+   key <AC02> { [          s,           S,          U0304                ] }; // tone 1
-   key <AC04> { [          f,           F,          U030C                ] }; // tone 5
+   key <AC03> { [          d,           D,          U0301                ] }; // tone 3
-   key <AC05> { [          g,           G,          U0308                ] }; // tone 7
+   key <AC04> { [          f,           F,          U0300                ] }; // tone 4
+   key <AC05> { [          g,           G,          U030C                ] }; // tone 5
    key <AC06> { [      U0323,       U0307,              h,             H ] }; // COMBINING DOT BELOW, ABOVE
    key <AC07> { [          j,           J,          U0306                ] }; // tone 9
    key <AC08> { [          k,           K,          U030F                ] }; // tone 11
-   key <AC09> { [          l,           L,          U0304                ] }; // tone 0
+   key <AC09> { [          l,           L,          U0308                ] }; // tone 14
    key <AC10> { [         oe,          OE,      semicolon,         colon ] };
-   key <AC11> { [      U0301,       U030B,     apostrophe,      quotedbl ] }; // tone 3, 8
+   key <AC11> { [ dead_acute,    quotedbl,     apostrophe                ] };
-   key <TLDE> { [      grave,  dead_tilde                                ] };
+   key <TLDE> { [ dead_grave,  dead_tilde,          grave,    asciitilde ] };
    key <AB01> { [          z,           Z,          U01F3,         U01F2 ] }; // U01F3 = letter dz
    key <AB06> { [          n,           N,            eng,           ENG ] };
    key <AB08> { [      comma,        less,  guillemotleft,         U2039 ] };
@@ -457,9 +482,9 @@ xkb_symbols "mmuock" {
 partial modifier_keys
 xkb_symbols "solidus_switch" {
    key <AB10> {
-     symbols[Group1] = [ ISO_Level3_Latch, question, slash, NoSymbol ]
+     symbols[Group1] = [ ISO_Level3_Latch, question, slash, dead_abovedot ]
    };
    modifier_map Mod5	{ ISO_Level3_Latch };
 };
-// ------- end Mmuock keyboard map --------------------------------------------
+// ------- end of Mmuock keyboard map --------------------------------------------
 

dist/xkeyboard-config/symbols/de

@@ -51,11 +51,11 @@ xkb_symbols "basic" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "legacy" {
+xkb_symbols "deadtilde" {
     // previous standard German layout with tilde as dead key
 
     include "de(basic)"
-    name[Group1]="German (legacy)";
+    name[Group1]="German (dead tilde)";
 
     key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
 };
@@ -597,8 +597,6 @@ xkb_symbols "ru" {
 
     name[Group1]= "Russian (Germany, phonetic)";
 
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
     key <LatA> { [        Cyrillic_a,        Cyrillic_A ] };
     key <LatB> { [       Cyrillic_be,       Cyrillic_BE ] };
     key <LatW> { [       Cyrillic_ve,       Cyrillic_VE ] };

dist/xkeyboard-config/symbols/kz

@@ -18,7 +18,7 @@ xkb_symbols "basic" {
 key.type[group1] = "FOUR_LEVEL";
 
     key <TLDE> { [ parenleft,               parenright,              Cyrillic_io, Cyrillic_IO ] };
-    key <AE01> { [ doublelowquotemark,      exclam ] };
+    key <AE01> { [ quotedbl,      exclam ] };
     key <AE06> { [ comma,                   semicolon ] };
     key <AE07> { [ period,                  colon ] };
     key <BKSL> { [ backslash,               slash ] };
@@ -209,3 +209,28 @@ xkb_symbols "olpc" {
 
    include "group(olpc)"
 };
+
+partial alphanumeric_keys
+xkb_symbols "ext" {
+
+// Levels 3 and 4 represent main keyboard's numeric part of US layout,
+// parens are duplicated for consistency.
+
+    include "kz(basic)"
+    name[Group1] = "Kazakh (extended)";
+
+key.type[group1] = "FOUR_LEVEL_ALPHABETIC";
+
+    key <AE01> { [ quotedbl,                exclam,                  1,      exclam ] };
+    key <AE02> { [ Cyrillic_schwa,          Cyrillic_SCHWA,          2,      at ] };
+    key <AE03> { [ Ukrainian_i,             Ukrainian_I,             3,      numbersign ] };
+    key <AE04> { [ Cyrillic_en_descender,   Cyrillic_EN_descender,   4,      dollar ] };
+    key <AE05> { [ Cyrillic_ghe_bar,        Cyrillic_GHE_bar,        5,      percent ] };
+    key <AE06> { [ comma,                   semicolon,               6,      asciicircum ] };
+    key <AE07> { [ period,                  colon,                   7,      ampersand ] };
+    key <AE08> { [ Cyrillic_u_straight,     Cyrillic_U_straight,     8,      asterisk ] };
+    key <AE09> { [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar, 9,      parenleft ] };
+    key <AE10> { [ Cyrillic_ka_descender,   Cyrillic_KA_descender,   0,      parenright ] };
+    key <AE11> { [ Cyrillic_o_bar,          Cyrillic_O_bar,          minus,  underscore  ] };
+    key <AE12> { [ Cyrillic_shha,           Cyrillic_SHHA,           equal,  plus ] };
+};

dist/xkeyboard-config/symbols/lk

@@ -164,16 +164,16 @@ xkb_symbols "us" {
   key <AD11> { [   bracketleft,     braceleft,    VoidSymbol ] };
   key <AD12> { [  bracketright,    braceright,    VoidSymbol ] };
 
-  key <AE01> { [           one,        exclam,   dead_macron ] };
+  key <AE01> { [             1,        exclam,   dead_macron ] };
-  key <AE02> { [           two,            at, dead_belowdot ] };
+  key <AE02> { [             2,            at, dead_belowdot ] };
-  key <AE03> { [         three,    numbersign, dead_abovedot ] };
+  key <AE03> { [             3,    numbersign, dead_abovedot ] };
-  key <AE04> { [          four,        dollar,      currency ] };
+  key <AE04> { [             4,        dollar,      currency ] };
-  key <AE05> { [          five,       percent,           UB0 ] };
+  key <AE05> { [             5,       percent,           UB0 ] };
-  key <AE06> { [           six,   asciicircum,    onequarter ] };
+  key <AE06> { [             6,   asciicircum,    onequarter ] };
-  key <AE07> { [         seven,     ampersand,       onehalf ] };
+  key <AE07> { [             7,     ampersand,       onehalf ] };
-  key <AE08> { [         eight,      asterisk, threequarters ] };
+  key <AE08> { [             8,      asterisk, threequarters ] };
-  key <AE09> { [          nine,     parenleft,    VoidSymbol ] };
+  key <AE09> { [             9,     parenleft,    VoidSymbol ] };
-  key <AE10> { [          zero,    parenright,    VoidSymbol ] };
+  key <AE10> { [             0,    parenright,    VoidSymbol ] };
   key <AE11> { [         minus,    underscore,         U2014 ] };
   key <AE12> { [         equal,          plus,    VoidSymbol ] };
 

dist/xkeyboard-config/symbols/parens

@@ -0,0 +1,8 @@
+// swap parentheses and square brackets
+partial default
+xkb_symbols "swap_brackets" {
+    replace key <AE09> {        [         9,    bracketleft     ]       };
+    replace key <AE10> {        [         0,    bracketright    ]       };
+    replace key <AD11> {        [ parenleft,    braceleft       ]       };
+    replace key <AD12> {        [ parenright,   braceright      ]       };
+};

dist/xkeyboard-config/symbols/rs

@@ -41,8 +41,8 @@ xkb_symbols "yz" {
     include "rs(basic)"
     name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)";
 
-    key <AD06> { [ Cyrillic_zhe,    Cyrillic_ZHE,  any, any ] }; // y
+    key <AD06> { [ Cyrillic_zhe,    Cyrillic_ZHE ] }; // y
-    key <AB01> { [ Cyrillic_ze,     Cyrillic_ZE,   any, any ] }; // z
+    key <AB01> { [ Cyrillic_ze,     Cyrillic_ZE  ] }; // z
 };
 
 hidden partial alphanumeric_keys
@@ -50,25 +50,23 @@ xkb_symbols "common" {
     // "Common" keys: keys that are the same
     // for both latin and cyrillic keyboards.
 
-    key.type[Group1] = "FOUR_LEVEL";
+    key <TLDE> { [ grave,          asciitilde    ] };
+    key <AE01> { [ 1,              exclam        ] };
+    key <AE02> { [ 2,              quotedbl      ] };
+    key <AE03> { [ 3,              numbersign    ] };
+    key <AE04> { [ 4,              dollar        ] };
+    key <AE05> { [ 5,              percent       ] };
+    key <AE06> { [ 6,              ampersand     ] };
+    key <AE07> { [ 7,              slash         ] };
+    key <AE08> { [ 8,              parenleft     ] };
+    key <AE09> { [ 9,              parenright    ] };
+    key <AE10> { [ 0,              equal         ] };
+    key <AE11> { [ apostrophe,     question      ] };
+    key <AE12> { [ plus,           asterisk      ] };
 
-    key <TLDE> { [ grave,          asciitilde,     any, any ] };
+    key <AB08> { [ comma,          semicolon     ] };
-    key <AE01> { [ 1,              exclam,         any, any ] };
+    key <AB09> { [ period,         colon         ] };
-    key <AE02> { [ 2,              quotedbl,       any, any ] };
+    key <AB10> { [ minus,          underscore    ] };
-    key <AE03> { [ 3,              numbersign,     any, any ] };
-    key <AE04> { [ 4,              dollar,         any, any ] };
-    key <AE05> { [ 5,              percent,        any, any ] };
-    key <AE06> { [ 6,              ampersand,      any, any ] };
-    key <AE07> { [ 7,              slash,          any, any ] };
-    key <AE08> { [ 8,              parenleft,      any, any ] };
-    key <AE09> { [ 9,              parenright,     any, any ] };
-    key <AE10> { [ 0,              equal,          any, any ] };
-    key <AE11> { [ apostrophe,     question,       any, any ] };
-    key <AE12> { [ plus,           asterisk,       any, any ] };
-
-    key <AB08> { [ comma,          semicolon,      any, any ] };
-    key <AB09> { [ period,         colon,          any, any ] };
-    key <AB10> { [ minus,          underscore,     any, any ] };
 
     include "kpdl(comma)"
 };
@@ -76,55 +74,51 @@ xkb_symbols "common" {
 hidden partial alphanumeric_keys
 xkb_symbols "cyralpha" {
 
-    key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+    key <AD01> { [ Cyrillic_lje,   Cyrillic_LJE  ] }; // q
+    key <AD02> { [ Cyrillic_nje,   Cyrillic_NJE  ] }; // w
+    key <AD03> { [ Cyrillic_ie,    Cyrillic_IE   ] }; // e
+    key <AD04> { [ Cyrillic_er,    Cyrillic_ER   ] }; // r
+    key <AD05> { [ Cyrillic_te,    Cyrillic_TE   ] }; // t
+    key <AD06> { [ Cyrillic_ze,    Cyrillic_ZE   ] }; // y
+    key <AD07> { [ Cyrillic_u,     Cyrillic_U    ] }; // u
+    key <AD08> { [ Cyrillic_i,     Cyrillic_I    ] }; // i
+    key <AD09> { [ Cyrillic_o,     Cyrillic_O    ] }; // o
+    key <AD10> { [ Cyrillic_pe,    Cyrillic_PE   ] }; // p
+    key <AD11> { [ Cyrillic_sha,   Cyrillic_SHA  ] }; // [ {
+    key <AD12> { [ Serbian_dje,    Serbian_DJE   ] }; // ] }
 
-    key <AD01> { [ Cyrillic_lje,   Cyrillic_LJE,   any, any ] }; // q
+    key <AC01> { [ Cyrillic_a,     Cyrillic_A    ] }; // a
-    key <AD02> { [ Cyrillic_nje,   Cyrillic_NJE,   any, any ] }; // w
+    key <AC02> { [ Cyrillic_es,    Cyrillic_ES   ] }; // s
-    key <AD03> { [ Cyrillic_ie,    Cyrillic_IE,    any, any ] }; // e
+    key <AC03> { [ Cyrillic_de,    Cyrillic_DE   ] }; // d
-    key <AD04> { [ Cyrillic_er,    Cyrillic_ER,    any, any ] }; // r
+    key <AC04> { [ Cyrillic_ef,    Cyrillic_EF   ] }; // f
-    key <AD05> { [ Cyrillic_te,    Cyrillic_TE,    any, any ] }; // t
+    key <AC05> { [ Cyrillic_ghe,   Cyrillic_GHE  ] }; // g
-    key <AD06> { [ Cyrillic_ze,    Cyrillic_ZE,    any, any ] }; // y
+    key <AC06> { [ Cyrillic_ha,    Cyrillic_HA   ] }; // h
-    key <AD07> { [ Cyrillic_u,     Cyrillic_U,     any, any ] }; // u
+    key <AC07> { [ Cyrillic_je,    Cyrillic_JE   ] }; // j
-    key <AD08> { [ Cyrillic_i,     Cyrillic_I,     any, any ] }; // i
+    key <AC08> { [ Cyrillic_ka,    Cyrillic_KA   ] }; // k
-    key <AD09> { [ Cyrillic_o,     Cyrillic_O,     any, any ] }; // o
+    key <AC09> { [ Cyrillic_el,    Cyrillic_EL   ] }; // l
-    key <AD10> { [ Cyrillic_pe,    Cyrillic_PE,    any, any ] }; // p
+    key <AC10> { [ Cyrillic_che,   Cyrillic_CHE  ] }; // ; :
-    key <AD11> { [ Cyrillic_sha,   Cyrillic_SHA,   any, any ] }; // [ {
+    key <AC11> { [ Serbian_tshe,   Serbian_TSHE  ] }; // ' "
-    key <AD12> { [ Serbian_dje,    Serbian_DJE,    any, any ] }; // ] }
+    key <BKSL> { [ Cyrillic_zhe,   Cyrillic_ZHE  ] }; // \ |
 
-    key <AC01> { [ Cyrillic_a,     Cyrillic_A,     any, any ] }; // a
+    key <AB01> { [ Cyrillic_zhe,   Cyrillic_ZHE  ] }; // z
-    key <AC02> { [ Cyrillic_es,    Cyrillic_ES,    any, any ] }; // s
+    key <AB02> { [ Cyrillic_dzhe,  Cyrillic_DZHE ] }; // x
-    key <AC03> { [ Cyrillic_de,    Cyrillic_DE,    any, any ] }; // d
+    key <AB03> { [ Cyrillic_tse,   Cyrillic_TSE  ] }; // c
-    key <AC04> { [ Cyrillic_ef,    Cyrillic_EF,    any, any ] }; // f
+    key <AB04> { [ Cyrillic_ve,    Cyrillic_VE   ] }; // v
-    key <AC05> { [ Cyrillic_ghe,   Cyrillic_GHE,   any, any ] }; // g
+    key <AB05> { [ Cyrillic_be,    Cyrillic_BE   ] }; // b
-    key <AC06> { [ Cyrillic_ha,    Cyrillic_HA,    any, any ] }; // h
+    key <AB06> { [ Cyrillic_en,    Cyrillic_EN   ] }; // n
-    key <AC07> { [ Cyrillic_je,    Cyrillic_JE,    any, any ] }; // j
+    key <AB07> { [ Cyrillic_em,    Cyrillic_EM   ] }; // m
-    key <AC08> { [ Cyrillic_ka,    Cyrillic_KA,    any, any ] }; // k
-    key <AC09> { [ Cyrillic_el,    Cyrillic_EL,    any, any ] }; // l
-    key <AC10> { [ Cyrillic_che,   Cyrillic_CHE,   any, any ] }; // ; :
-    key <AC11> { [ Serbian_tshe,   Serbian_TSHE,   any, any ] }; // ' "
-    key <BKSL> { [ Cyrillic_zhe,   Cyrillic_ZHE,   any, any ] }; // \ |
-
-    key <AB01> { [ Cyrillic_zhe,   Cyrillic_ZHE,   any, any ] }; // z
-    key <AB02> { [ Cyrillic_dzhe,  Cyrillic_DZHE,  any, any ] }; // x
-    key <AB03> { [ Cyrillic_tse,   Cyrillic_TSE,   any, any ] }; // c
-    key <AB04> { [ Cyrillic_ve,    Cyrillic_VE,    any, any ] }; // v
-    key <AB05> { [ Cyrillic_be,    Cyrillic_BE,    any, any ] }; // b
-    key <AB06> { [ Cyrillic_en,    Cyrillic_EN,    any, any ] }; // n
-    key <AB07> { [ Cyrillic_em,    Cyrillic_EM,    any, any ] }; // m
 };
 
 
 hidden partial alphanumeric_keys
 xkb_symbols "latalpha" {
 
-    key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+    key <AD11> { [ scaron,         Scaron        ] }; // [ {
+    key <AD12> { [ dstroke,        Dstroke       ] }; // ] }
 
-    key <AD11> { [ scaron,         Scaron,         any, any ] }; // [ {
+    key <AC10> { [ ccaron,         Ccaron        ] }; // ; :
-    key <AD12> { [ dstroke,        Dstroke,        any, any ] }; // ] }
+    key <AC11> { [ cacute,         Cacute        ] }; // ' "
-
+    key <BKSL> { [ zcaron,         Zcaron        ] }; // \ |
-    key <AC10> { [ ccaron,         Ccaron,         any, any ] }; // ; :
-    key <AC11> { [ cacute,         Cacute,         any, any ] }; // ' "
-    key <BKSL> { [ zcaron,         Zcaron,         any, any ] }; // \ |
 };
 
 hidden partial alphanumeric_keys
@@ -139,7 +133,7 @@ xkb_symbols "twoletter" {
                [ U1C6,           U1C5,          any, U1C4 ] }; // x
 
     // Also replace letter Y with Zcaron, since Y is of no use any longer.
-    key <AB01> { [ zcaron,         Zcaron,        any, any ] }; // z
+    key <AB01> { [ zcaron,         Zcaron        ] }; // z
 };
 
 hidden partial alphanumeric_keys
@@ -162,22 +156,26 @@ xkb_symbols "latlevel3" {
     key <AD02> { [ any, any,   bar,                 Lstroke          ] }; // w
     key <AD03> { [ any, any,   EuroSign,            EuroSign         ] }; // e
     key <AD04> { [ any, any,   paragraph,           registered       ] }; // r
-    key <AD05> { [ any, any,   tslash,              Tslash           ] }; // t // ALPHABETIC
+    key <AD05> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
+                 [ any, any,   tslash,              Tslash           ] }; // t
     key <AD06> { [ any, any,   leftarrow,           yen              ] }; // y
     key <AD07> { [ any, any,   downarrow,           uparrow          ] }; // u
     key <AD08> { [ any, any,   rightarrow,          idotless         ] }; // i
-    key <AD09> { [ any, any,   oslash,              Ooblique         ] }; // o // ALPHABETIC
+    key <AD09> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
-    key <AD10> { [ any, any,   thorn,               THORN            ] }; // p // ALPHABETIC
+                 [ any, any,   oslash,              Ooblique         ] }; // o
+    key <AD10> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
+                 [ any, any,   thorn,               THORN            ] }; // p
     key <AD11> { [ any, any,   division,            dead_abovering   ] }; // [
     key <AD12> { [ any, any,   multiply,            dead_macron      ] }; // ]
 
-    key <AC01> { [ any, any,   ae,                  AE               ] }; // a // ALPHABETIC
+    key <AC01> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
+                 [ any, any,   ae,                  AE               ] }; // a
     key <AC02> { [ any, any,   doublelowquotemark,  guillemotright   ] }; // s
     key <AC03> { [ any, any,   leftdoublequotemark, guillemotleft    ] }; // d
     key <AC04> { [ any, any,   bracketleft,         ordfeminine      ] }; // f
     key <AC05> { [ any, any,   bracketright,        ENG              ] }; // g
-    key <AC06> { [ any, any,   hstroke,             Hstroke          ] }; // h // ALPHABETIC
+    key <AC06> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
-    key <AC07> { [ any, any,   NoSymbol,            NoSymbol         ] }; // j
+                 [ any, any,   hstroke,             Hstroke          ] }; // h
     key <AC08> { [ any, any,   lstroke,             ampersand        ] }; // k
     key <AC09> { [ any, any,   lstroke,             Lstroke          ] }; // l
     key <AC10> { [ any, any,   dead_acute,          dead_doubleacute ] }; // ;
@@ -199,40 +197,40 @@ xkb_symbols "latlevel3" {
 hidden partial alphanumeric_keys
 xkb_symbols "cyrlevel3" {
     key <TLDE> { [ any, any,   degree,              notsign          ] }; // ` ~
-    key <AE03> { [ any, any,   dead_circumflex,     NoSymbol         ] }; // 3 #
+    key <AE03> { [ any, any,   dead_circumflex                       ] }; // 3 #
-    key <AE07> { [ any, any,   dead_grave,          NoSymbol         ] }; // 7 &
+    key <AE07> { [ any, any,   dead_grave                            ] }; // 7 &
-    key <AE08> { [ any, any,   dead_doublegrave,    NoSymbol         ] }; // 8 *
+    key <AE08> { [ any, any,   dead_doublegrave                      ] }; // 8 *
-    key <AE09> { [ any, any,   dead_acute,          NoSymbol         ] }; // 9 (
+    key <AE09> { [ any, any,   dead_acute                            ] }; // 9 (
-    key <AE10> { [ any, any,   dead_invertedbreve,  NoSymbol         ] }; // 0 )
+    key <AE10> { [ any, any,   dead_invertedbreve                    ] }; // 0 )
-    key <AE11> { [ any, any,   dead_macron,         NoSymbol         ] }; // - _
+    key <AE11> { [ any, any,   dead_macron                           ] }; // - _
 
-    key <AD01> { [ any, any,   backslash,           NoSymbol         ] }; // q
+    key <AD01> { [ any, any,   backslash                             ] }; // q
-    key <AD02> { [ any, any,   bar,                 NoSymbol         ] }; // w
+    key <AD02> { [ any, any,   bar                                   ] }; // w
     key <AD03> { [ any, any,   EuroSign,            sterling         ] }; // e
     key <AD04> { [ any, any,   paragraph,           registered       ] }; // r
-    key <AD05> { [ any, any,   ellipsis,            NoSymbol         ] }; // t // ALPHABETIC
+    key <AD05> { [ any, any,   ellipsis                              ] }; // t
     key <AD06> { [ any, any,   leftarrow,           yen              ] }; // y
     key <AD07> { [ any, any,   downarrow,           uparrow          ] }; // u
-    key <AD08> { [ any, any,   rightarrow,          NoSymbol         ] }; // i
+    key <AD08> { [ any, any,   rightarrow                            ] }; // i
-    key <AD09> { [ any, any,   section,             NoSymbol         ] }; // o // ALPHABETIC
+    key <AD09> { [ any, any,   section                               ] }; // o
-    key <AD11> { [ any, any,   division,            NoSymbol         ] }; // [
+    key <AD11> { [ any, any,   division                              ] }; // [
-    key <AD12> { [ any, any,   multiply,            NoSymbol         ] }; // ]
+    key <AD12> { [ any, any,   multiply                              ] }; // ]
 
     key <AC02> { [ any, any,   doublelowquotemark,  guillemotright   ] }; // s
     key <AC03> { [ any, any,   leftdoublequotemark, guillemotleft    ] }; // d
-    key <AC04> { [ any, any,   bracketleft,         NoSymbol         ] }; // f
+    key <AC04> { [ any, any,   bracketleft                           ] }; // f
-    key <AC05> { [ any, any,   bracketright,        NoSymbol         ] }; // g
+    key <AC05> { [ any, any,   bracketright                          ] }; // g
-    key <BKSL> { [ any, any,   currency,            NoSymbol         ] }; // \
+    key <BKSL> { [ any, any,   currency                              ] }; // \
 
-    key <AB01> { [ any, any,   leftsinglequotemark, NoSymbol         ] }; // z
+    key <AB01> { [ any, any,   leftsinglequotemark                   ] }; // z
-    key <AB02> { [ any, any,   rightsinglequotemark,NoSymbol         ] }; // x
+    key <AB02> { [ any, any,   rightsinglequotemark                  ] }; // x
     key <AB03> { [ any, any,   cent,                copyright        ] }; // c
-    key <AB04> { [ any, any,   at,                  NoSymbol         ] }; // v
+    key <AB04> { [ any, any,   at                                    ] }; // v
-    key <AB05> { [ any, any,   braceleft,           NoSymbol         ] }; // b
+    key <AB05> { [ any, any,   braceleft                             ] }; // b
-    key <AB06> { [ any, any,   braceright,          NoSymbol         ] }; // n
+    key <AB06> { [ any, any,   braceright                            ] }; // n
-    key <AB07> { [ any, any,   asciicircum,         NoSymbol         ] }; // m
+    key <AB07> { [ any, any,   asciicircum                           ] }; // m
-    key <AB08> { [ any, any,   less,                NoSymbol         ] }; // , <
+    key <AB08> { [ any, any,   less                                  ] }; // , <
-    key <AB09> { [ any, any,   greater,             NoSymbol         ] }; // . >
+    key <AB09> { [ any, any,   greater                               ] }; // . >
     key <AB10> { [ any, any,   emdash,              endash           ] }; // / ?
 };
 
@@ -254,8 +252,8 @@ xkb_symbols "latinyz" {
     include "rs(latin)"
     name[Group1]= "Serbian (Latin qwerty)";
 
-    key <AD06> { [ y,              Y,              any, any ] }; // y
+    key <AD06> { [ y,              Y             ] }; // y
-    key <AB01> { [ z,              Z,              any, any ] }; // z
+    key <AB01> { [ z,              Z             ] }; // z
 };
 
 partial alphanumeric_keys
@@ -265,8 +263,8 @@ xkb_symbols "latinunicodeyz" {
     include "rs(latinunicode)"
     name[Group1]= "Serbian (Latin Unicode qwerty)";
 
-    key <AD06> { [ zcaron,         Zcaron,         any, any ] }; // y
+    key <AD06> { [ zcaron,         Zcaron        ] }; // y
-    key <AB01> { [ z,              Z,              any, any ] }; // z
+    key <AB01> { [ z,              Z             ] }; // z
 };
 
 xkb_symbols "alternatequotes" {
@@ -275,8 +273,8 @@ xkb_symbols "alternatequotes" {
     include "rs(basic)"
     name[Group1]= "Serbian (Cyrillic with guillemets)";
 
-    key <AC02> { [ any, any,   guillemotright, NoSymbol ] }; // s
+    key <AC02> { [ any, any,   guillemotright    ] }; // s
-    key <AC03> { [ any, any,   guillemotleft,  NoSymbol ] }; // d
+    key <AC03> { [ any, any,   guillemotleft     ] }; // d
 };
 
 xkb_symbols "latinalternatequotes" {
@@ -285,8 +283,8 @@ xkb_symbols "latinalternatequotes" {
     include "rs(latin)"
     name[Group1]= "Serbian (Latin with guillemets)";
 
-    key <AC02> { [ any, any,   guillemotright, NoSymbol ] }; // s
+    key <AC02> { [ any, any,   guillemotright    ] }; // s
-    key <AC03> { [ any, any,   guillemotleft,  NoSymbol ] }; // d
+    key <AC03> { [ any, any,   guillemotleft     ] }; // d
 };
 
 xkb_symbols "rue" {
@@ -323,9 +321,9 @@ xkb_symbols "combiningkeys" {
     name[Group1]= "Serbian (combining accents instead of dead keys)";
 
     key <AE03> { [ any, any,   U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
-    key <AE07> { [ any, any,   U0300, NoSymbol        ] }; // 7, U0300 = COMBINING GRAVE ACCENT
+    key <AE07> { [ any, any,   U0300                  ] }; // 7, U0300 = COMBINING GRAVE ACCENT
-    key <AE08> { [ any, any,   U030F, NoSymbol        ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
+    key <AE08> { [ any, any,   U030F                  ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
-    key <AE09> { [ any, any,   U0301, NoSymbol        ] }; // 9, U0301 = COMBINING ACUTE ACCENT
+    key <AE09> { [ any, any,   U0301                  ] }; // 9, U0301 = COMBINING ACUTE ACCENT
-    key <AE10> { [ any, any,   U0311, NoSymbol        ] }; // 0, U0311 = COMBINING INVERTED BREVE
+    key <AE10> { [ any, any,   U0311                  ] }; // 0, U0311 = COMBINING INVERTED BREVE
-    key <AE11> { [ any, any,   U0304, NoSymbol        ] }; // -, U0304 = COMBINING MACRON
+    key <AE11> { [ any, any,   U0304                  ] }; // -, U0304 = COMBINING MACRON
 };

dist/xkeyboard-config/symbols/ru

@@ -19,8 +19,6 @@ xkb_symbols "winkeys" {
 
     key <AB10> { [      period,       comma  ] };
     key <BKSL> { [   backslash,       slash  ] };
-
-    include "level3(ralt_switch)"
 };
 
 hidden partial alphanumeric_keys
@@ -561,6 +559,68 @@ xkb_symbols "phonetic_azerty" {
     key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
 };
 
+// Russian dvorak phonetic layout
+// 2016-06-15 by Mart Lubbers
+// contact: <mart@martlubbers.net>
+partial alphanumeric_keys
+xkb_symbols "phonetic_dvorak" {
+    include "level3(ralt_switch)"
+
+    name[Group1]= "Russian (phonetic dvorak)";
+
+    key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] };
+
+    key <AE01> { [ 1, exclam ] };
+    key <AE02> { [ 2, at ] };
+    key <AE03> { [ 3, Cyrillic_io ] };
+    key <AE04> { [ 4, Cyrillic_IO ] };
+    key <AE05> { [ 5, Cyrillic_hardsign ] };
+    key <AE06> { [ 6, Cyrillic_HARDSIGN ] };
+    key <AE07> { [ 7, ampersand ] };
+    key <AE08> { [ 8, asterisk ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright ] };
+    key <AE11> { [ Cyrillic_sha, Cyrillic_SHA ] };
+    key <AE12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+    key <BKSL> { [ Cyrillic_e, Cyrillic_E ] };
+
+    key <AD01> { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
+    key <AD02> { [ comma, less, dead_cedilla, dead_caron ] };
+    key <AD03> { [ period, greater, dead_abovedot, periodcentered ] };
+    key <AD04> { [ Cyrillic_pe, Cyrillic_PE ] };
+    key <AD05> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+    key <AD06> { [ Cyrillic_ef, Cyrillic_EF ] };
+    key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+    key <AD08> { [ Cyrillic_tse, Cyrillic_TSE ] };
+    key <AD09> { [ Cyrillic_er, Cyrillic_ER ] };
+    key <AD10> { [ Cyrillic_el, Cyrillic_EL ] };
+    key <AD11> { [ slash, question ] };
+    key <AD12> { [ Cyrillic_che, Cyrillic_CHE ] };
+
+    key <AC01> { [ Cyrillic_a, Cyrillic_A ] };
+    key <AC02> { [ Cyrillic_o, Cyrillic_O ] };
+    key <AC03> { [ Cyrillic_ie, Cyrillic_IE ] };
+    key <AC04> { [ Cyrillic_u, Cyrillic_U ] };
+    key <AC05> { [ Cyrillic_i, Cyrillic_I ] };
+    key <AC06> { [ Cyrillic_de, Cyrillic_DE ] };
+    key <AC07> { [ Cyrillic_ha, Cyrillic_HA ] };
+    key <AC08> { [ Cyrillic_te, Cyrillic_TE ] };
+    key <AC09> { [ Cyrillic_en, Cyrillic_EN ] };
+    key <AC10> { [ Cyrillic_es, Cyrillic_ES ] };
+    key <AC11> { [ minus, underscore ] };
+
+    key <AB01> { [ semicolon, colon, dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [ Cyrillic_ya, Cyrillic_YA ] };
+    key <AB03> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+    key <AB04> { [ Cyrillic_ka, Cyrillic_KA ] };
+    key <AB05> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
+    key <AB06> { [ Cyrillic_be, Cyrillic_BE ] };
+    key <AB07> { [ Cyrillic_em, Cyrillic_EM ] };
+    key <AB08> { [ Cyrillic_ve, Cyrillic_VE ] };
+    key <AB09> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+    key <AB10> { [ Cyrillic_ze, Cyrillic_ZE ] };
+};
+
 partial alphanumeric_keys
 xkb_symbols "phonetic_fr" {
 

dist/xkeyboard-config/symbols/sharp_vndr/sl-c3x00

@@ -1,5 +1,5 @@
 // $NetBSD: sl-c3x00,v 1.1 2009/12/13 04:54:51 nonaka Exp $
-// $OpenBSD: sl-c3x00,v 1.6 2015/03/30 17:11:30 shadchin Exp $
+// $OpenBSD: sl-c3x00,v 1.7 2016/10/09 11:49:41 shadchin Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -15,6 +15,8 @@ xkb_symbols "basic" {
 	key <AE08> { [ 8, parenleft ] };
 	key <AE09> { [ 9, parenright ] };
 	key <AE10> { [ 0, asciitilde ] };
+	key <BKSP> { type="CTRL+ALT",
+		symbols[Group1]= [ BackSpace, Terminate_Server ] };
 
 	key <AD01> { [ q, Q ] };
 	key <AD02> { [ w, W, asciicircum ] };
@@ -26,7 +28,7 @@ xkb_symbols "basic" {
 	key <AD08> { [ i, I, braceright ] };
 	key <AD09> { [ o, O ] };
 	key <AD10> { [ p, P ] };
-
+	
 	key <TAB> { [ Tab, ISO_Left_Tab, Caps_Lock ] };
 
 	key <AC01> { [ a, A ] };
@@ -49,13 +51,15 @@ xkb_symbols "basic" {
 	key <AB07> { [ m, M ] };
 	key <RTSH> { [ Shift_R ] };
 	key <RTRN> { [ Return ] };
+	
+	key <RALT> { [ ISO_Level3_Shift ] };
 
 	key <LCTL> { [ Control_L ] };
 	key <AE11> { [ minus, minus, at ] };
 	key <SPCE> { [ space ] };
 	key <AB08> { [ comma, slash, less ] };
 	key <AB09> { [ period, question, greater ] };
-
+	
 	key <UP> { [ Up, Up, Prior ] };
 	key <LEFT> { [ Left, Left, Home ] };
 	key <DOWN> { [ Down, Down, Next ] };

dist/xkeyboard-config/symbols/us

@@ -1441,6 +1441,102 @@ xkb_symbols "carpalx" {
     key <BKSL> {	[ backslash,         bar	]	};
 };
 
+// Carpalx layout created by Martin Krzywinski
+// http://mkweb.bcgsc.ca/carpalx/
+// Merged with us(intl) and modified to move
+// accented vowels closer to the plain vowels
+
+partial alphanumeric_keys
+xkb_symbols "carpalx-intl" {
+
+    include "us(carpalx)"
+    name[Group1]= "English (Carpalx, international with dead keys)";
+
+    key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
+    key <AE01> { [	   1,     exclam,    exclamdown,      onesuperior ] };
+    key <AE02> { [	   2,         at,   twosuperior, dead_doubleacute ] };
+    key <AE03> { [	   3, numbersign, threesuperior,      dead_macron ] };
+    key <AE04> { [	   4,     dollar,      currency,         sterling ] };
+    key <AE05> { [	   5,    percent,      EuroSign,     dead_cedilla ] };
+    key <AE06> { [    6, dead_circumflex,    onequarter,      asciicircum ] };
+    key <AE07> { [	   7,  ampersand,       onehalf,	dead_horn ] };
+    key <AE08> { [	   8,   asterisk, threequarters,      dead_ogonek ] };
+    key <AE09> { [	   9,  parenleft, leftsinglequotemark, dead_breve ] };
+    key <AE10> { [	   0, parenright, rightsinglequotemark, dead_abovering ] };
+    key <AE11> { [     minus, underscore,           yen,    dead_belowdot ] };
+    key <AE12> { [     equal,       plus,      multiply,         division ] };
+
+    key <AD01> { [	   q,          Q,        degree,        paragraph ] };
+    key <AD02> { [	   g,          G,         U011F,            U011E ] };
+    key <AD03> { [	   m,          M,            mu,               mu ] };
+    key <AD04> { [	   l,          L,     copyright,             cent ] };
+    key <AD05> { [	   w,          W,             w,                W ] };
+    key <AD06> { [	   y,          Y,    idiaeresis,       Idiaeresis ] };
+    key <AD07> { [	   f,          F,    adiaeresis,       Adiaeresis ] };
+    key <AD08> { [	   u,          U,    udiaeresis,       Udiaeresis ] };
+    key <AD09> { [	   b,          B,    odiaeresis,       Odiaeresis ] };
+    key <AD10> { [ semicolon,      colon,        oslash,         Ooblique ] };
+    key <AD11> { [ bracketleft,  braceleft,  guillemotleft, leftdoublequotemark ] };
+    key <AD12> { [bracketright, braceright, guillemotright, rightdoublequotemark ] };
+
+    key <AC01> { [	   d,          D,           eth,              ETH ] };
+    key <AC02> { [	   s,          S,        ssharp,          section ] };
+    key <AC03> { [	   t,          T,         thorn,            THORN ] };
+    key <AC04> { [	   n,          N,        ntilde,           Ntilde ] };
+    key <AC05> { [	   r,          R,    registered,       registered ] };
+    key <AC06> { [	   i,          I,        iacute,           Iacute ] };
+    key <AC07> { [	   a,          A,        aacute,           Aacute ] };
+    key <AC08> { [	   e,          E,        eacute,           Eacute ] };
+    key <AC09> { [	   o,          O,        oacute,           Oacute ] };
+    key <AC10> { [	   h,          H,        uacute,           Uacute ] };
+    key <AC11> { [dead_acute, dead_diaeresis, apostrophe,        quotedbl ] };
+
+    key <AB01> { [	   z,          Z,             z,                Z ] };
+    key <AB02> { [	   x,          X,         U015F,            U015E ] };
+    key <AB03> { [	   c,          C,      ccedilla,         Ccedilla ] };
+    key <AB04> { [	   v,          V,            ae,               AE ] };
+    key <AB05> { [	   j,          J,            oe,               OE ] };
+    key <AB06> { [	   k,          K,         U0131,            U0130 ] };
+    key <AB07> { [	   p,          P,         aring,            Aring ] };
+    key <AB08> { [     comma,       less,    ediaeresis,       Ediaeresis ] };
+    key <AB09> { [    period,    greater, dead_abovedot,       dead_caron ] };
+    key <AB10> { [     slash,   question,  questiondown,        dead_hook ] };
+    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };
+
+    key <LSGT> { [ backslash,   bar,            backslash,      bar ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Carpalx layout created by Martin Krzywinski
+// http://mkweb.bcgsc.ca/carpalx/
+// Merged with us(intl) and us(altgr-intl) and modified to move
+// accented vowels closer to the plain vowels
+
+partial alphanumeric_keys
+xkb_symbols "carpalx-altgr-intl" {
+
+   include "us(carpalx-intl)"
+   name[Group1]= "English (Carpalx, international AltGr dead keys)";
+
+// five dead keys moved into level3:
+
+   key <TLDE> { [    grave, asciitilde,  dead_grave,   dead_tilde      ] };
+   key <AC11> { [apostrophe,quotedbl,    dead_acute,   dead_diaeresis  ] };
+
+// diversions from the MS Intl keyboard:
+
+   key <AE01> { [        1, exclam,      onesuperior,  exclamdown      ] };
+
+// onequarter etc (not in iso8859-15) moved to get three unshifted deadkeys:
+
+   key <AE06> { [        6, asciicircum, dead_circumflex, onequarter    ] };
+   key <AE07> { [        7, ampersand,   dead_horn,       onehalf       ] };
+   key <AE08> { [        8, asterisk,    dead_ogonek,     threequarters ] };
+
+   include "level3(ralt_switch)"
+};
+
 // Carpalx layout created by Martin Krzywinski
 // Full optimization variant without fixed QWERTY-like ZXCV keys
 // http://mkweb.bcgsc.ca/carpalx/
@@ -1458,6 +1554,44 @@ xkb_symbols "carpalx-full" {
     key <AB04> {	[	  f,	F		]	};
 };
 
+// Carpalx layout created by Martin Krzywinski
+// Full optimization variant without fixed QWERTY-like ZXCV keys
+// http://mkweb.bcgsc.ca/carpalx/
+// Merged with us(intl) and modified to move
+// accented vowels closer to the plain vowels
+
+partial alphanumeric_keys
+xkb_symbols "carpalx-full-intl" {
+
+    include "us(carpalx-intl)"
+    name[Group1]= "English (Carpalx, full optimization, international with dead keys)";
+
+    key <AD06> { [	   b,          B,    idiaeresis,       Idiaeresis ] };
+    key <AD07> { [	   y,          Y,    adiaeresis,       Adiaeresis ] };
+    key <AD09> { [	   v,          V,    odiaeresis,       Odiaeresis ] };
+
+    key <AB04> { [	   f,          F,            ae,               AE ] };
+};
+
+// Carpalx layout created by Martin Krzywinski
+// Full optimization variant without fixed QWERTY-like ZXCV keys
+// http://mkweb.bcgsc.ca/carpalx/
+// Merged with us(intl) and us(altgr-intl) and modified to move
+// accented vowels closer to the plain vowels
+
+partial alphanumeric_keys
+xkb_symbols "carpalx-full-altgr-intl" {
+
+   include "us(carpalx-altgr-intl)"
+   name[Group1]= "English (Carpalx, full optimization, international AltGr dead keys)";
+
+    key <AD06> { [	   b,          B,    idiaeresis,       Idiaeresis ] };
+    key <AD07> { [	   y,          Y,    adiaeresis,       Adiaeresis ] };
+    key <AD09> { [	   v,          V,    odiaeresis,       Odiaeresis ] };
+
+    key <AB04> { [	   f,          F,            ae,               AE ] };
+};
+
 // EXTRAS:
 
 // Czech, Slovak and German charecters added as third level symbols to US keyboard layout.