Update to xkeyboard-config 2.13.

ok matthieu@
This commit is contained in:
shadchin 2014-12-28 16:41:04 +00:00
parent f27084855e
commit 1d9689d381
61 changed files with 18923 additions and 15218 deletions

View File

@ -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.12" "X Version 11"
.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.13" "X Version 11"
.SH NAME
xkeyboard-config \- XKB data description files
.SH DESCRIPTION
@ -126,7 +126,7 @@ logidinovoedge Logitech diNovo Edge Keyboard
mx1998 Memorex MX1998
mx2500 Memorex MX2500 EZ-Access Keyboard
mx2750 Memorex MX2750
microsoft4000 Microsoft Natural Wireless Ergonomic Keyboard 4000
microsoft4000 Microsoft Natural Ergonomic Keyboard 4000
microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000
microsoftinet Microsoft Internet Keyboard
microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
@ -538,6 +538,7 @@ _
is Icelandic
is(Sundeadkeys) Icelandic (Sun dead keys)
is(nodeadkeys) Icelandic (eliminate dead keys)
is(mac_legacy) Icelandic (Macintosh, legacy)
is(mac) Icelandic (Macintosh)
is(dvorak) Icelandic (Dvorak)
@ -1001,6 +1002,7 @@ 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
ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
.TE

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2014/09/17 16:11:50 shadchin Exp $
# $OpenBSD: Makefile,v 1.4 2014/12/28 16:41:04 shadchin Exp $
XKC_TOP = ../../..
PACKAGE_VERSION = 2.12
PACKAGE_VERSION = 2.13
PKGCONFIG = xkeyboard-config.pc
EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
-e 's,@xkb_base@,${XKB_BASE},g'

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,5 @@
2.13 7 bugs fixed
Translations updated
2.12 10 bugs fixed
More code cleanup
Translations updated

View File

@ -489,7 +489,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.17])
m4_define([vers_have], [1.17.1])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@ -1995,18 +1995,18 @@ fi
found="no"
m4_foreach([flag], m4_cdr($@), [
if test $found = "no" ; then
if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
fi
if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
fi
PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
AC_CACHE_VAL($cacheid,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],

View File

@ -1,10 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2012-12-29'
timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -52,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_SYSTEM}" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
eval $set_cc_for_build
cat <<-EOF > $dummy.c
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
#elif defined(__dietlibc__)
LIBC=dietlibc
#else
LIBC=gnu
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -809,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:MSYS*:*)
*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@ -857,21 +874,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -884,59 +901,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-gnu
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-gnu
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
LIBC=gnu
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __dietlibc__
LIBC=dietlibc
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@ -955,54 +967,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or32:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-gnu ;;
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
*) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
echo powerpc-unknown-linux-${LIBC}
exit ;;
ppc64le:Linux:*:*)
echo powerpc64le-unknown-linux-${LIBC}
exit ;;
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -1235,19 +1256,31 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
i386)
eval $set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
UNAME_PROCESSOR="x86_64"
fi
fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
# that puts up a graphical alert prompting to install
# developer tools. Any system running Mac OS X 10.7 or
# later (Darwin 11 and later) is required to have a 64-bit
# processor. This is not true of the ARM version of Darwin
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@ -1338,154 +1371,6 @@ EOF
exit ;;
esac
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
printf ("ns32k-encore-mach\n"); exit (0);
#else
printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif
#if defined (__386BSD__)
printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
#if defined (i386)
printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif
#if defined (_SEQUENT_)
struct utsname un;
uname(&un);
if (strncmp(un.version, "V2", 2) == 0) {
printf ("i386-sequent-ptx2\n"); exit (0);
}
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
printf ("i386-sequent-ptx1\n"); exit (0);
}
printf ("i386-sequent-ptx\n"); exit (0);
#endif
#if defined (vax)
# if !defined (ultrix)
# include <sys/param.h>
# if defined (BSD)
# if BSD == 43
printf ("vax-dec-bsd4.3\n"); exit (0);
# else
# if BSD == 199006
printf ("vax-dec-bsd4.3reno\n"); exit (0);
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# endif
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# else
printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif
#if defined (alliant) && defined (i860)
printf ("i860-alliant-bsd\n"); exit (0);
#endif
exit (1);
}
EOF
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
if [ -x /usr/convex/getsysinfo ]
then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
exit ;;
c34*)
echo c34-convex-bsd
exit ;;
c38*)
echo c38-convex-bsd
exit ;;
c4*)
echo c4-convex-bsd
exit ;;
esac
fi
cat >&2 <<EOF
$0: unable to guess system type

View File

@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2010 Free Software Foundation, Inc.
# Copyright 1996-2007 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
@ -47,7 +47,7 @@ for cc_temp in $CC""; do
done
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
# Code taken from libtool.m4's _LT_COMPILER_PIC.
# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
wl=
if test "$GCC" = yes; then
@ -64,7 +64,7 @@ else
;;
esac
;;
mingw* | cygwin* | pw32* | os2* | cegcc*)
mingw* | cygwin* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@ -76,13 +76,7 @@ else
;;
linux* | k*bsd*-gnu)
case $cc_basename in
ecc*)
wl='-Wl,'
;;
icc* | ifort*)
wl='-Wl,'
;;
lf95*)
icc* | ecc*)
wl='-Wl,'
;;
pgcc | pgf77 | pgf90)
@ -130,7 +124,7 @@ else
esac
fi
# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
hardcode_libdir_flag_spec=
hardcode_libdir_separator=
@ -138,7 +132,7 @@ hardcode_direct=no
hardcode_minus_L=no
case "$host_os" in
cygwin* | mingw* | pw32* | cegcc*)
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@ -164,7 +158,7 @@ if test "$with_gnu_ld" = yes; then
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
case "$host_os" in
aix[3-9]*)
aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@ -188,7 +182,7 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs=no
fi
;;
cygwin* | mingw* | pw32* | cegcc*)
cygwin* | mingw* | pw32*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@ -260,7 +254,7 @@ else
hardcode_direct=unsupported
fi
;;
aix[4-9]*)
aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@ -270,7 +264,7 @@ else
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@ -332,7 +326,7 @@ else
;;
bsdi[45]*)
;;
cygwin* | mingw* | pw32* | cegcc*)
cygwin* | mingw* | pw32*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@ -500,7 +494,7 @@ else
fi
# Check dynamic linker characteristics
# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
@ -511,7 +505,7 @@ case "$host_os" in
aix3*)
library_names_spec='$libname.a'
;;
aix[4-9]*)
aix4* | aix5*)
library_names_spec='$libname$shrext'
;;
amigaos*)
@ -523,7 +517,7 @@ case "$host_os" in
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
cygwin* | mingw* | pw32* | cegcc*)
cygwin* | mingw* | pw32*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;

View File

@ -1,10 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2012-12-29'
timestamp='2014-07-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -70,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -256,12 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc \
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
| c4x | clipper \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
@ -269,6 +265,7 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
@ -286,20 +283,22 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
| nios | nios2 \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
| or32 \
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@ -327,7 +326,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@ -369,13 +368,13 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@ -384,6 +383,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
@ -403,18 +403,22 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@ -796,7 +800,7 @@ case $basic_machine in
os=-mingw64
;;
mingw32)
basic_machine=i386-pc
basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@ -824,6 +828,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
moxiebox)
basic_machine=moxie-unknown
os=-moxiebox
;;
msdos)
basic_machine=i386-pc
os=-msdos
@ -832,7 +840,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i386-pc
basic_machine=i686-pc
os=-msys
;;
mvs)
@ -1354,7 +1362,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@ -1369,14 +1377,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@ -1500,9 +1508,6 @@ case $os in
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
@ -1551,6 +1556,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
c8051-*)
os=-elf
;;
hexagon-*)
os=-elf
;;

View File

@ -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.12.
# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.13.
#
#
# 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.12'
PACKAGE_STRING='xkeyboard-config 2.12'
PACKAGE_VERSION='2.13'
PACKAGE_STRING='xkeyboard-config 2.13'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@ -1334,7 +1334,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.12 to adapt to many kinds of systems.
\`configure' configures xkeyboard-config 2.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xkeyboard-config 2.12:";;
short | recursive ) echo "Configuration of xkeyboard-config 2.13:";;
esac
cat <<\_ACEOF
@ -1524,7 +1524,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xkeyboard-config configure 2.12
xkeyboard-config configure 2.13
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1771,7 +1771,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.12, which was
It was created by xkeyboard-config $as_me 2.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2636,7 +2636,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
VERSION='2.12'
VERSION='2.13'
cat >>confdefs.h <<_ACEOF
@ -6538,25 +6538,6 @@ int main ()
return 1;
}
}
/* Test against Solaris 10 bug: Failures are not distinguishable from
successful returns. */
{
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
if (cd_ascii_to_88591 != (iconv_t)(-1))
{
static const char input[] = "\263";
char buf[10];
const char *inptr = input;
size_t inbytesleft = strlen (input);
char *outptr = buf;
size_t outbytesleft = sizeof (buf);
size_t res = iconv (cd_ascii_to_88591,
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
return 1;
}
}
#if 0 /* This bug could be worked around by the caller. */
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
{
@ -7871,7 +7852,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.12, which was
This file was extended by xkeyboard-config $as_me 2.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -7928,7 +7909,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.12
xkeyboard-config config.status 2.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -1,4 +1,4 @@
AC_INIT(xkeyboard-config, 2.12)
AC_INIT(xkeyboard-config, 2.13)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@ -65,7 +65,7 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes")
# ****
AC_PROG_INTLTOOL(0.30)
AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=xkeyboard-config

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: xkeyboard-config 2.11.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
"POT-Creation-Date: 2014-05-18 00:11+0100\n"
"PO-Revision-Date: 2014-05-21 21:42+0100\n"
"PO-Revision-Date: 2014-05-29 21:42+0100\n"
"Last-Translator: Marcos Lans <marcoslansgarza@gmail.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
"Language: gl\n"
@ -19,6 +19,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Launchpad-Export-Date: 2014-04-23 20:24+0000\n"
"X-Generator: Virtaal 0.7.0\n"
"X-Poedit-Language: Galician\n"
@ -1211,15 +1212,15 @@ msgstr "ur"
#: ../rules/base.xml.in.h:315
msgid "Urdu (phonetic)"
msgstr "Urdu (fonético)"
msgstr "Urdú (fonético)"
#: ../rules/base.xml.in.h:316
msgid "Urdu (alternative phonetic)"
msgstr "Urdu (fonético alternativo)"
msgstr "Urdú (fonético alternativo)"
#: ../rules/base.xml.in.h:317
msgid "Urdu (WinKeys)"
msgstr "Urdu (teclas Windows)"
msgstr "Urdú (teclas Windows)"
#. Keyboard indicator for Hindi layouts
#: ../rules/base.xml.in.h:319
@ -1363,7 +1364,7 @@ msgstr "Bereber (Marrocos, alternativa fonética tifinagh)"
#: ../rules/base.xml.in.h:359
msgid "Berber (Morocco, Tifinagh extended)"
msgstr "Bereber (Marrocos, tifinagh extendido)"
msgstr "Bereber (Marrocos, tifinagh estendido)"
#: ../rules/base.xml.in.h:360
msgid "Berber (Morocco, Tifinagh phonetic)"
@ -1371,7 +1372,7 @@ msgstr "Bereber (Marrocos, tifinagh fonético)"
#: ../rules/base.xml.in.h:361
msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Bereber (Marrocos, tifinagh fonético extendido)"
msgstr "Bereber (Marrocos, tifinagh fonético estendido)"
#. Keyboard indicator for Cameroon layouts
#: ../rules/base.xml.in.h:363
@ -1593,19 +1594,19 @@ msgstr "et"
#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
msgid "Estonian"
msgstr "Estonio"
msgstr "Estoniano"
#: ../rules/base.xml.in.h:425
msgid "Estonian (eliminate dead keys)"
msgstr "Estonio (eliminar teclas mortas)"
msgstr "Estoniano (eliminar teclas mortas)"
#: ../rules/base.xml.in.h:426
msgid "Estonian (Dvorak)"
msgstr "Estonio (Dvorak)"
msgstr "Estoniano (Dvorak)"
#: ../rules/base.xml.in.h:427
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estonio (teclado EE. UU. con letras estonias)"
msgstr "Estonio (teclado EE. UU. con letras estonianas)"
#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
msgid "Persian"
@ -2218,7 +2219,7 @@ msgstr "Español (latinoamericano, eliminar teclas mortas)"
#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Español (latinoamericano, incluir tilde morta)"
msgstr "Español (latinoamericano, incluír til morta)"
#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, Sun dead keys)"
@ -2666,7 +2667,7 @@ msgstr "Eslovaco (qwerty)"
#: ../rules/base.xml.in.h:717
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Eslovaco (qwerty, contrabarra extendida)"
msgstr "Eslovaco (qwerty, contrabarra estendida)"
#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:126
msgid "Spanish"
@ -2682,7 +2683,7 @@ msgstr "Español (tecla Windows)"
#: ../rules/base.xml.in.h:721
msgid "Spanish (include dead tilde)"
msgstr "Español (incluir tilde morta)"
msgstr "Español (incluír til morta)"
#: ../rules/base.xml.in.h:722
msgid "Spanish (Sun dead keys)"
@ -2747,39 +2748,39 @@ msgstr "Lingua de signos sueco"
#: ../rules/base.xml.in.h:738 ../rules/base.extras.xml.in.h:132
msgid "German (Switzerland)"
msgstr "Alemán (Suiza)"
msgstr "Alemán (Suíza)"
#: ../rules/base.xml.in.h:739
msgid "German (Switzerland, legacy)"
msgstr "Alemán (Suiza, herdado)"
msgstr "Alemán (Suíza, herdado)"
#: ../rules/base.xml.in.h:740
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Alemán (Suiza, eliminar teclas mortas)"
msgstr "Alemán (Suíza, eliminar teclas mortas)"
#: ../rules/base.xml.in.h:741
msgid "German (Switzerland, Sun dead keys)"
msgstr "Alemán (Suiza, teclas mortas de Sun)"
msgstr "Alemán (Suíza, teclas mortas de Sun)"
#: ../rules/base.xml.in.h:742
msgid "French (Switzerland)"
msgstr "Francés (Suiza)"
msgstr "Francés (Suíza)"
#: ../rules/base.xml.in.h:743
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francés (Suiza, eliminar teclas mortas)"
msgstr "Francés (Suíza, eliminar teclas mortas)"
#: ../rules/base.xml.in.h:744
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francés (Suiza, teclas mortas de Sun)"
msgstr "Francés (Suíza, teclas mortas de Sun)"
#: ../rules/base.xml.in.h:745
msgid "French (Switzerland, Macintosh)"
msgstr "Francés (Suiza, Macintosh)"
msgstr "Francés (Suíza, Macintosh)"
#: ../rules/base.xml.in.h:746
msgid "German (Switzerland, Macintosh)"
msgstr "Alemán (Suiza, Macintosh)"
msgstr "Alemán (Suíza, Macintosh)"
#: ../rules/base.xml.in.h:747
msgid "Arabic (Syria)"
@ -2935,35 +2936,35 @@ msgstr "uk"
#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:139
msgid "Ukrainian"
msgstr "Ucraniano"
msgstr "Ucraíno"
#: ../rules/base.xml.in.h:792
msgid "Ukrainian (phonetic)"
msgstr "Ucraniano (fonético)"
msgstr "Ucraíno (fonético)"
#: ../rules/base.xml.in.h:793
msgid "Ukrainian (typewriter)"
msgstr "Ucraniano (máquina de escribir)"
msgstr "Ucraíno (máquina de escribir)"
#: ../rules/base.xml.in.h:794
msgid "Ukrainian (WinKeys)"
msgstr "Ucraniano (teclas Windows)"
msgstr "Ucraíno (teclas Windows)"
#: ../rules/base.xml.in.h:795
msgid "Ukrainian (legacy)"
msgstr "Ucraniano (heredado)"
msgstr "Ucraíno (herdado)"
#: ../rules/base.xml.in.h:796
msgid "Ukrainian (standard RSTU)"
msgstr "Ucraniano (estándar RSTU)"
msgstr "Ucraíno (estándar RSTU)"
#: ../rules/base.xml.in.h:797
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Ruso (ucraniano estándar RSTU)"
msgstr "Ruso (Ucraíno estándar RSTU)"
#: ../rules/base.xml.in.h:798
msgid "Ukrainian (homophonic)"
msgstr "Ucraniano (homofónico)"
msgstr "Ucraíno (homofónico)"
#: ../rules/base.xml.in.h:799 ../rules/base.extras.xml.in.h:141
msgid "English (UK)"
@ -2971,7 +2972,7 @@ msgstr "Inglés (RU)"
#: ../rules/base.xml.in.h:800
msgid "English (UK, extended WinKeys)"
msgstr "Inglés (RU, estendido con teclas Windows)"
msgstr "Inglés (UK, estendido con teclas Windows)"
#: ../rules/base.xml.in.h:801
msgid "English (UK, international with dead keys)"
@ -3058,19 +3059,19 @@ msgstr "Ogam (IS434)"
#: ../rules/base.xml.in.h:824
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistán)"
msgstr "Urdú (Paquistán)"
#: ../rules/base.xml.in.h:825
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistán, CRULP)"
msgstr "Urdú (Paquistán, CRULP)"
#: ../rules/base.xml.in.h:826
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistán, NLA)"
msgstr "Urdú (Paquistán, NLA)"
#: ../rules/base.xml.in.h:827
msgid "Arabic (Pakistan)"
msgstr "Árabe (Pakistán)"
msgstr "Árabe (Paquistán)"
#. Keyboard indicator for Sindhi layouts
#: ../rules/base.xml.in.h:829
@ -3105,7 +3106,7 @@ msgstr "Esperanto"
#: ../rules/base.xml.in.h:838
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Estonio (punto e coma e comiña desplazadas, obsoleto)"
msgstr "Estoniano (punto e coma e comiña desprazadas, obsoleto)"
#. Keyboard indicator for Nepali layouts
#: ../rules/base.xml.in.h:840
@ -3392,11 +3393,11 @@ msgstr "Alt+Maiús"
#: ../rules/base.xml.in.h:918
msgid "Left Alt+Left Shift"
msgstr "Alt izquierdo + Mayús esquerdo"
msgstr "Alt esquerda + Maiús. esquerda"
#: ../rules/base.xml.in.h:919
msgid "Alt+Space"
msgstr "Alt+Espacio"
msgstr "Alt+Espazo"
#: ../rules/base.xml.in.h:920
msgid "Menu"
@ -3703,7 +3704,7 @@ msgstr "Meta está asignada ás teclas Windows"
#: ../rules/base.xml.in.h:998
msgid "Meta is mapped to Left Win"
msgstr "Meta está asignada á tecla Windows izquierda"
msgstr "Meta está asignada á tecla Windows esquerda"
#: ../rules/base.xml.in.h:999
msgid "Hyper is mapped to Win keys"
@ -4055,7 +4056,7 @@ msgstr "Multilingüe (Canadá, Sun Type 6/7)"
#: ../rules/base.extras.xml.in.h:24
msgid "German (US keyboard with German letters)"
msgstr "Alemán (teclado estadounidense con letras alemanas)"
msgstr "Alemán (teclado estadounidense con letras alemás)"
#: ../rules/base.extras.xml.in.h:25
msgid "German (with Hungarian letters and no dead keys)"
@ -4179,7 +4180,7 @@ msgstr "Idioma da Igrexa eslavona"
#: ../rules/base.extras.xml.in.h:72
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Ruso (con distribución ucraniana e bielorrusa)"
msgstr "Ruso (con distribución ucraína e bielorrusa)"
#: ../rules/base.extras.xml.in.h:73
msgid "Russian (Sun Type 6/7)"
@ -4484,7 +4485,7 @@ msgstr "EurKEY (disposición tipo US con letras europeas)"
#~ msgstr "Etiopía"
#~ msgid "Extended"
#~ msgstr "Extendido"
#~ msgstr "estendido"
#~ msgid "Finland"
#~ msgstr "Finlandia"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,9 @@
<name>apl</name>
<_shortDescription>apl</_shortDescription>
<_description>APL keyboard symbols</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -60,7 +62,9 @@
<name>ca</name>
<_shortDescription>fr</_shortDescription>
<_description>French (Canada)</_description>
<languageList><iso639Id>fra</iso639Id></languageList>
<languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -133,14 +137,18 @@
<name>ir</name>
<_shortDescription>fa</_shortDescription>
<_description>Persian</_description>
<languageList><iso639Id>per</iso639Id></languageList>
<languageList>
<iso639Id>per</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>ave</name>
<_description>Avestan</_description>
<languageList><iso639Id>ave</iso639Id></languageList>
<languageList>
<iso639Id>ave</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -150,7 +158,9 @@
<name>lt</name>
<_shortDescription>lt</_shortDescription>
<_description>Lithuanian</_description>
<languageList><iso639Id>lit</iso639Id></languageList>
<languageList>
<iso639Id>lit</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -238,7 +248,9 @@
<name>us</name>
<_shortDescription>en</_shortDescription>
<_description>English (US)</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -264,17 +276,21 @@
<configItem>
<name>crd</name>
<_description>Coeur d'Alene Salish</_description>
<languageList><iso639Id>crd</iso639Id></languageList>
<languageList>
<iso639Id>crd</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>cz_sk_de</name>
<_description>Czech Slovak and German (US)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>cze</iso639Id>
<iso639Id>slo</iso639Id>
<iso639Id>ger</iso639Id> </languageList>
<iso639Id>ger</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -296,7 +312,9 @@
<name>pl</name>
<_shortDescription>pl</_shortDescription>
<_description>Polish</_description>
<languageList><iso639Id>pol</iso639Id></languageList>
<languageList>
<iso639Id>pol</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -324,7 +342,9 @@
<name>ro</name>
<_shortDescription>ro</_shortDescription>
<_description>Romanian</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -356,7 +376,9 @@
<name>rs</name>
<_shortDescription>sr</_shortDescription>
<_description>Serbian</_description>
<languageList><iso639Id>srp</iso639Id></languageList>
<languageList>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -378,7 +400,9 @@
<configItem>
<name>chu</name>
<_description>Church Slavonic</_description>
<languageList><iso639Id>chu</iso639Id></languageList>
<languageList>
<iso639Id>chu</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -386,9 +410,11 @@
<name>ruu</name>
<_shortDescription>ru</_shortDescription>
<_description>Russian (with Ukrainian-Belorussian layout)</_description>
<languageList><iso639Id>rus</iso639Id>
<languageList>
<iso639Id>rus</iso639Id>
<iso639Id>ukr</iso639Id>
<iso639Id>bel</iso639Id></languageList>
<iso639Id>bel</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -422,14 +448,18 @@
<name>il</name>
<_shortDescription>he</_shortDescription>
<_description>Hebrew</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
<languageList>
<iso639Id>heb</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>biblicalSIL</name>
<_description>Hebrew (Biblical, SIL phonetic)</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
<languageList>
<iso639Id>heb</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -815,6 +845,21 @@
</languageList>
</configItem>
</layout>
<layout>
<configItem>
<name>cm</name>
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
</configItem>
<variantList>
<variant>
<configItem>
<name>mmuock</name>
<_description>Mmuock</_description>
</configItem>
</variant>
</variantList>
</layout>
</layoutList>
<optionList/>
</xkbConfigRegistry>

View File

@ -79,6 +79,10 @@
ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
ctrl:menu_rctrl = +ctrl(menu_rctrl)
ctrl:ralt_rctrl = +ctrl(ralt_rctrl)
ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl)
ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl)
ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl)
ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin)
compose:ralt = +compose(ralt)
compose:lwin = +compose(lwin)
compose:lwin-altgr = +compose(lwin-altgr)

View File

@ -794,7 +794,7 @@
<model>
<configItem>
<name>microsoft4000</name>
<_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description>
<_description>Microsoft Natural Ergonomic Keyboard 4000</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
@ -1406,9 +1406,11 @@
<configItem>
<name>altgr-intl</name>
<_description>English (international AltGr dead keys)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>fra</iso639Id>
<iso639Id>ger</iso639Id></languageList>
<iso639Id>ger</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1421,11 +1423,13 @@
<configItem>
<name>hbs</name>
<_description>Serbo-Croatian (US)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>bos</iso639Id>
<iso639Id>hbs</iso639Id>
<iso639Id>hrv</iso639Id>
<iso639Id>srp</iso639Id> </languageList>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1717,9 +1721,11 @@
<!-- Keyboard indicator for Belgian layouts -->
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
<languageList><iso639Id>ger</iso639Id>
<languageList>
<iso639Id>ger</iso639Id>
<iso639Id>nld</iso639Id>
<iso639Id>fra</iso639Id></languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -1819,35 +1825,45 @@
<configItem>
<name>ben_baishakhi</name>
<_description>Bangla (India, Baishakhi)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bangla (India, Bornona)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bangla (India, Uni Gitanjali)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bangla (India, Baishakhi Inscript)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<_description>Manipuri (Eeyek)</_description>
<languageList><iso639Id>mni</iso639Id></languageList>
<languageList>
<iso639Id>mni</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1933,7 +1949,9 @@
<!-- Keyboard indicator for Malayalam layouts -->
<_shortDescription>ml</_shortDescription>
<_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
<languageList><iso639Id>mal</iso639Id></languageList>
<languageList>
<iso639Id>mal</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -2326,14 +2344,18 @@
<!-- Keyboard indicator for Cameroon layouts -->
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>french</name>
<_description>French (Cameroon)</_description>
<languageList><iso639Id>fra</iso639Id></languageList>
<languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -2817,8 +2839,10 @@
<!-- Keyboard indicator for Iraqi layouts -->
<_shortDescription>ar</_shortDescription>
<_description>Iraqi</_description>
<languageList><iso639Id>ara</iso639Id>
<iso639Id>kur</iso639Id></languageList>
<languageList>
<iso639Id>ara</iso639Id>
<iso639Id>kur</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -2919,7 +2943,9 @@
<configItem>
<name>smi</name>
<_description>Northern Saami (Finland)</_description>
<languageList><iso639Id>sme</iso639Id></languageList>
<languageList>
<iso639Id>sme</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -3232,14 +3258,18 @@
<configItem>
<name>ro</name>
<_description>Romanian (Germany)</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ro_nodeadkeys</name>
<_description>Romanian (Germany, eliminate dead keys)</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -3511,6 +3541,12 @@
<_description>Icelandic (eliminate dead keys)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>mac_legacy</name>
<_description>Icelandic (Macintosh, legacy)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>mac</name>
@ -3699,16 +3735,20 @@
<!-- Keyboard indicator for Russian layouts -->
<_shortDescription>ru</_shortDescription>
<_description>Russian (Kazakhstan, with Kazakh)</_description>
<languageList><iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id></languageList>
<languageList>
<iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>kazrus</name>
<_description>Kazakh (with Russian)</_description>
<languageList><iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id></languageList>
<languageList>
<iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -3728,7 +3768,8 @@
<configItem>
<name>stea</name>
<_description>Lao (STEA proposed standard layout)</_description>
<languageList><iso639Id>lao</iso639Id>
<languageList>
<iso639Id>lao</iso639Id>
</languageList>
</configItem>
</variant>
@ -4120,7 +4161,9 @@
<configItem>
<name>szl</name>
<_description>Silesian</_description>
<languageList><iso639Id>szl</iso639Id></languageList>
<languageList>
<iso639Id>szl</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -4381,8 +4424,10 @@
<configItem>
<name>srp</name>
<_description>Serbian (Russia)</_description>
<languageList><iso639Id>rus</iso639Id>
<iso639Id>srp</iso639Id></languageList>
<languageList>
<iso639Id>rus</iso639Id>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -4662,7 +4707,9 @@
<configItem>
<name>swl</name>
<_description>Swedish Sign Language</_description>
<languageList><iso639Id>swl</iso639Id></languageList>
<languageList>
<iso639Id>swl</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -4673,8 +4720,10 @@
<!-- Keyboard indicator for German layouts -->
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
<languageList><iso639Id>ger</iso639Id>
<iso639Id>gsw</iso639Id></languageList>
<languageList>
<iso639Id>ger</iso639Id>
<iso639Id>gsw</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -5572,7 +5621,8 @@
<!-- Keyboard indicator for Filipino layouts -->
<_shortDescription>ph</_shortDescription>
<_description>Filipino</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
@ -5582,14 +5632,16 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>qwerty-bay</name>
<_description>Filipino (QWERTY Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5598,7 +5650,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5611,7 +5664,8 @@
<configItem>
<name>capewell-dvorak-bay</name>
<_description>Filipino (Capewell-Dvorak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5620,7 +5674,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5633,7 +5688,8 @@
<configItem>
<name>capewell-qwerf2k6-bay</name>
<_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5642,7 +5698,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5655,7 +5712,8 @@
<configItem>
<name>colemak-bay</name>
<_description>Filipino (Colemak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5664,7 +5722,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5677,7 +5736,8 @@
<configItem>
<name>dvorak-bay</name>
<_description>Filipino (Dvorak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5686,7 +5746,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -5696,7 +5757,9 @@
<name>md</name>
<_shortDescription>md</_shortDescription>
<_description>Moldavian</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -5704,7 +5767,9 @@
<name>gag</name>
<_shortDescription>gag</_shortDescription>
<_description>Moldavian (Gagauz)</_description>
<languageList><iso639Id>gag</iso639Id></languageList>
<languageList>
<iso639Id>gag</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -6103,6 +6168,11 @@
<name>ctrl:swap_lwin_lctl</name>
<_description>Swap Left Win key with Left Ctrl key</_description>
</configItem>
</option><option>
<configItem>
<name>ctrl:swap_rwin_rctl</name>
<_description>Swap Right Win key with Right Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>

View File

@ -8,7 +8,9 @@
<name>apl</name>
<_shortDescription>apl</_shortDescription>
<_description>APL keyboard symbols</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -60,7 +62,9 @@
<name>ca</name>
<_shortDescription>fr</_shortDescription>
<_description>French (Canada)</_description>
<languageList><iso639Id>fra</iso639Id></languageList>
<languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -133,14 +137,18 @@
<name>ir</name>
<_shortDescription>fa</_shortDescription>
<_description>Persian</_description>
<languageList><iso639Id>per</iso639Id></languageList>
<languageList>
<iso639Id>per</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>ave</name>
<_description>Avestan</_description>
<languageList><iso639Id>ave</iso639Id></languageList>
<languageList>
<iso639Id>ave</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -150,7 +158,9 @@
<name>lt</name>
<_shortDescription>lt</_shortDescription>
<_description>Lithuanian</_description>
<languageList><iso639Id>lit</iso639Id></languageList>
<languageList>
<iso639Id>lit</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -238,7 +248,9 @@
<name>us</name>
<_shortDescription>en</_shortDescription>
<_description>English (US)</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -264,17 +276,21 @@
<configItem>
<name>crd</name>
<_description>Coeur d'Alene Salish</_description>
<languageList><iso639Id>crd</iso639Id></languageList>
<languageList>
<iso639Id>crd</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>cz_sk_de</name>
<_description>Czech Slovak and German (US)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>cze</iso639Id>
<iso639Id>slo</iso639Id>
<iso639Id>ger</iso639Id> </languageList>
<iso639Id>ger</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -296,7 +312,9 @@
<name>pl</name>
<_shortDescription>pl</_shortDescription>
<_description>Polish</_description>
<languageList><iso639Id>pol</iso639Id></languageList>
<languageList>
<iso639Id>pol</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -324,7 +342,9 @@
<name>ro</name>
<_shortDescription>ro</_shortDescription>
<_description>Romanian</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -356,7 +376,9 @@
<name>rs</name>
<_shortDescription>sr</_shortDescription>
<_description>Serbian</_description>
<languageList><iso639Id>srp</iso639Id></languageList>
<languageList>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -378,7 +400,9 @@
<configItem>
<name>chu</name>
<_description>Church Slavonic</_description>
<languageList><iso639Id>chu</iso639Id></languageList>
<languageList>
<iso639Id>chu</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -386,9 +410,11 @@
<name>ruu</name>
<_shortDescription>ru</_shortDescription>
<_description>Russian (with Ukrainian-Belorussian layout)</_description>
<languageList><iso639Id>rus</iso639Id>
<languageList>
<iso639Id>rus</iso639Id>
<iso639Id>ukr</iso639Id>
<iso639Id>bel</iso639Id></languageList>
<iso639Id>bel</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -422,14 +448,18 @@
<name>il</name>
<_shortDescription>he</_shortDescription>
<_description>Hebrew</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
<languageList>
<iso639Id>heb</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>biblicalSIL</name>
<_description>Hebrew (Biblical, SIL phonetic)</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
<languageList>
<iso639Id>heb</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -815,6 +845,21 @@
</languageList>
</configItem>
</layout>
<layout>
<configItem>
<name>cm</name>
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
</configItem>
<variantList>
<variant>
<configItem>
<name>mmuock</name>
<_description>Mmuock</_description>
</configItem>
</variant>
</variantList>
</layout>
</layoutList>
<optionList/>
</xkbConfigRegistry>

View File

@ -794,7 +794,7 @@
<model>
<configItem>
<name>microsoft4000</name>
<_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description>
<_description>Microsoft Natural Ergonomic Keyboard 4000</_description>
<vendor>Microsoft Inc.</vendor>
</configItem>
</model>
@ -1406,9 +1406,11 @@
<configItem>
<name>altgr-intl</name>
<_description>English (international AltGr dead keys)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>fra</iso639Id>
<iso639Id>ger</iso639Id></languageList>
<iso639Id>ger</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1421,11 +1423,13 @@
<configItem>
<name>hbs</name>
<_description>Serbo-Croatian (US)</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>bos</iso639Id>
<iso639Id>hbs</iso639Id>
<iso639Id>hrv</iso639Id>
<iso639Id>srp</iso639Id> </languageList>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1717,9 +1721,11 @@
<!-- Keyboard indicator for Belgian layouts -->
<_shortDescription>be</_shortDescription>
<_description>Belgian</_description>
<languageList><iso639Id>ger</iso639Id>
<languageList>
<iso639Id>ger</iso639Id>
<iso639Id>nld</iso639Id>
<iso639Id>fra</iso639Id></languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -1819,35 +1825,45 @@
<configItem>
<name>ben_baishakhi</name>
<_description>Bangla (India, Baishakhi)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bangla (India, Bornona)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bangla (India, Uni Gitanjali)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bangla (India, Baishakhi Inscript)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<_description>Manipuri (Eeyek)</_description>
<languageList><iso639Id>mni</iso639Id></languageList>
<languageList>
<iso639Id>mni</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -1933,7 +1949,9 @@
<!-- Keyboard indicator for Malayalam layouts -->
<_shortDescription>ml</_shortDescription>
<_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
<languageList><iso639Id>mal</iso639Id></languageList>
<languageList>
<iso639Id>mal</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -2326,14 +2344,18 @@
<!-- Keyboard indicator for Cameroon layouts -->
<_shortDescription>cm</_shortDescription>
<_description>English (Cameroon)</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
<languageList>
<iso639Id>eng</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>french</name>
<_description>French (Cameroon)</_description>
<languageList><iso639Id>fra</iso639Id></languageList>
<languageList>
<iso639Id>fra</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -2817,8 +2839,10 @@
<!-- Keyboard indicator for Iraqi layouts -->
<_shortDescription>ar</_shortDescription>
<_description>Iraqi</_description>
<languageList><iso639Id>ara</iso639Id>
<iso639Id>kur</iso639Id></languageList>
<languageList>
<iso639Id>ara</iso639Id>
<iso639Id>kur</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -2919,7 +2943,9 @@
<configItem>
<name>smi</name>
<_description>Northern Saami (Finland)</_description>
<languageList><iso639Id>sme</iso639Id></languageList>
<languageList>
<iso639Id>sme</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -3232,14 +3258,18 @@
<configItem>
<name>ro</name>
<_description>Romanian (Germany)</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ro_nodeadkeys</name>
<_description>Romanian (Germany, eliminate dead keys)</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -3511,6 +3541,12 @@
<_description>Icelandic (eliminate dead keys)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>mac_legacy</name>
<_description>Icelandic (Macintosh, legacy)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>mac</name>
@ -3699,16 +3735,20 @@
<!-- Keyboard indicator for Russian layouts -->
<_shortDescription>ru</_shortDescription>
<_description>Russian (Kazakhstan, with Kazakh)</_description>
<languageList><iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id></languageList>
<languageList>
<iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>kazrus</name>
<_description>Kazakh (with Russian)</_description>
<languageList><iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id></languageList>
<languageList>
<iso639Id>kaz</iso639Id>
<iso639Id>rus</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -3728,7 +3768,8 @@
<configItem>
<name>stea</name>
<_description>Lao (STEA proposed standard layout)</_description>
<languageList><iso639Id>lao</iso639Id>
<languageList>
<iso639Id>lao</iso639Id>
</languageList>
</configItem>
</variant>
@ -4120,7 +4161,9 @@
<configItem>
<name>szl</name>
<_description>Silesian</_description>
<languageList><iso639Id>szl</iso639Id></languageList>
<languageList>
<iso639Id>szl</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -4381,8 +4424,10 @@
<configItem>
<name>srp</name>
<_description>Serbian (Russia)</_description>
<languageList><iso639Id>rus</iso639Id>
<iso639Id>srp</iso639Id></languageList>
<languageList>
<iso639Id>rus</iso639Id>
<iso639Id>srp</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -4662,7 +4707,9 @@
<configItem>
<name>swl</name>
<_description>Swedish Sign Language</_description>
<languageList><iso639Id>swl</iso639Id></languageList>
<languageList>
<iso639Id>swl</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -4673,8 +4720,10 @@
<!-- Keyboard indicator for German layouts -->
<_shortDescription>de</_shortDescription>
<_description>German (Switzerland)</_description>
<languageList><iso639Id>ger</iso639Id>
<iso639Id>gsw</iso639Id></languageList>
<languageList>
<iso639Id>ger</iso639Id>
<iso639Id>gsw</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -5572,7 +5621,8 @@
<!-- Keyboard indicator for Filipino layouts -->
<_shortDescription>ph</_shortDescription>
<_description>Filipino</_description>
<languageList><iso639Id>eng</iso639Id>
<languageList>
<iso639Id>eng</iso639Id>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
@ -5582,14 +5632,16 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>qwerty-bay</name>
<_description>Filipino (QWERTY Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5598,7 +5650,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5611,7 +5664,8 @@
<configItem>
<name>capewell-dvorak-bay</name>
<_description>Filipino (Capewell-Dvorak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5620,7 +5674,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5633,7 +5688,8 @@
<configItem>
<name>capewell-qwerf2k6-bay</name>
<_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5642,7 +5698,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5655,7 +5712,8 @@
<configItem>
<name>colemak-bay</name>
<_description>Filipino (Colemak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5664,7 +5722,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
<variant>
@ -5677,7 +5736,8 @@
<configItem>
<name>dvorak-bay</name>
<_description>Filipino (Dvorak Baybayin)</_description>
<languageList><iso639Id>bik</iso639Id>
<languageList>
<iso639Id>bik</iso639Id>
<iso639Id>ceb</iso639Id>
<iso639Id>fil</iso639Id>
<iso639Id>hil</iso639Id>
@ -5686,7 +5746,8 @@
<iso639Id>pag</iso639Id>
<iso639Id>phi</iso639Id>
<iso639Id>tgl</iso639Id>
<iso639Id>war</iso639Id></languageList>
<iso639Id>war</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -5696,7 +5757,9 @@
<name>md</name>
<_shortDescription>md</_shortDescription>
<_description>Moldavian</_description>
<languageList><iso639Id>rum</iso639Id></languageList>
<languageList>
<iso639Id>rum</iso639Id>
</languageList>
</configItem>
<variantList>
<variant>
@ -5704,7 +5767,9 @@
<name>gag</name>
<_shortDescription>gag</_shortDescription>
<_description>Moldavian (Gagauz)</_description>
<languageList><iso639Id>gag</iso639Id></languageList>
<languageList>
<iso639Id>gag</iso639Id>
</languageList>
</configItem>
</variant>
</variantList>
@ -6103,6 +6168,11 @@
<name>ctrl:swap_lwin_lctl</name>
<_description>Swap Left Win key with Left Ctrl key</_description>
</configItem>
</option><option>
<configItem>
<name>ctrl:swap_rwin_rctl</name>
<_description>Swap Right Win key with Right Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>

View File

@ -93,7 +93,7 @@ xkb_symbols "swap_alt_win" {
};
// Swap the left Alt and Win keys.
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "swap_lalt_lwin" {
key <LALT> { type[Group1] = "ONE_LEVEL",
symbols[Group1] = [ Super_L ] };
@ -101,7 +101,7 @@ xkb_symbols "swap_lalt_lwin" {
};
// Swap the right Alt and Win keys.
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "swap_ralt_rwin" {
key <RALT> { type[Group1] = "ONE_LEVEL",
symbols[Group1] = [ Super_R ] };

View File

@ -63,8 +63,6 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "olpc" {
include "am(basic)"
name[Group1]= "Armenian";
include "group(olpc)"
};

View File

@ -5,7 +5,7 @@
// This file supports:
// - The Sharp APL for Unix (SAX) layout
// - The IBM APL2 layout
// - The Manugistics APL*PLUS II layout (version 5.1, 1993)
// - The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout
// - The Dyalog APL layout - with additions for box drawing and commands
// Unicode APL table: http://aplwiki.com/UnicodeAplTable
@ -23,26 +23,26 @@
// shift keys. I have striven, however, to ensure that the use of shift keys
// in these maps is at least self-consistent.
// I'm assuming that this will be used with another keyboard layout (i.e. for
// I'm assuming that this will be used with another keyboard layout (ie. for
// your language), with a special shift key to use these maps.
// 2011-12-22 Geoff Streeter <geoff@dyalog.com>,
// added the Dyalog support;
// corrected (what he thinks) are some errors:
// resolving the confusion between APL's and Unicode's concept of Left and Right tacks;
// unsure about some of the inheritance from APL2 into APLPLUS -- patches welcome;
// complied with freedesktop.org requirement that the keycodes be in sorted order,
// which leads to the bottom to top (roughly) definitions.
// 2012-09-26 changed "overbar" to macron which fixed some strangeness in xterm
// The default layout still has to be the first one. Choosing the basic Dyalog layout is
// definitely better than using the "common" one. Choosing the complete Dyalog layout is
// not useful to non-Dyalog users.
// 2011-12-22 Geoff Streeter: geoff@dyalog.com
// Added the Dyalog support.
// Corrected (what he thinks) are some errors.
// Resolving the confusion between APL's and Unicode's concept of Left and Right tacks.
// Unsure about some of the inheritance from APL2 into APLPLUS. Patches welcome.
// Complied with freedesktop.org requirement that the keycodes be in sorted order. Which
// leads to the bottom to top (roughly) definitions.
// default layout seems to have to be the first one. Choosing the basic Dyalog layout is definitely
// better than using the "common" one. Choosing the complete Dyalog layout is not useful to non-Dyalog
// users.
default partial alphanumeric_keys
xkb_symbols "basic" {
include "apl(dyalog_base)" // forward reference good APL keyboard without Dyalogs extras
name[Group1]= "APL keyboard symbols";
};
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@ -62,8 +62,9 @@ xkb_symbols "basic" {
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "common" {
name[Group1]= "APL keyboard symbols";
key <AB01> { [ U2282 ] }; // Z: ⊂ -- Subset Of
key <AB02> { [ U2283 ] }; // X: ⊃ -- Superset Of
@ -96,7 +97,7 @@ xkb_symbols "common" {
key <AD11> { [ U2190 ] }; // [: ← -- Leftwards Arrow
key <AE01> { [ diaeresis ] };
key <AE02> { [ U00AF ] }; // ¯ -- Macron
key <AE02> { [ macron ] }; // ¯ -- Macron
key <AE03> { [ less ] };
key <AE04> { [ U2264 ] }; // ≤ -- Less-than Or Equal To
key <AE05> { [ equal ] };
@ -283,10 +284,10 @@ xkb_symbols "apl2" {
partial alphanumeric_keys
xkb_symbols "aplplusII" {
name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
// AFS - short for APL Functional Symbol
include "apl(apl2)"
name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
key <AC10> { [ bracketleft, parenleft, U234E ] }; // ;: ⍎ -- [See B key in SAX layout]
key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout]
@ -320,10 +321,10 @@ xkb_symbols "aplplusII" {
partial alphanumeric_keys
xkb_symbols "aplx" {
include "apl(unified)"
name[Group1]= "APL keyboard symbols (APLX unified)";
include "apl(unified)"
key <AB08> { [ U235D, U236A ] }; // ,: ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar
key <AB09> { [ U2340, U2364 ] }; // .: ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis
key <AB10> { [ U233F ] }; // /: ⌿ -- APL Functional Symbol Slash Bar
@ -350,44 +351,56 @@ xkb_symbols "aplx" {
};
// APL language support for the Dyalog keyboard.
// Dyalog Ltd sells this keyboard with APL engravings. The current model is
// engraved on a Cherry G80. Base languages for US, UK and DK are available.
// Dyalog Ltd sell this keyboard with APL engravings. The current model is
// engraved on a Cherry G80. Base languages for US, UK and DK are availible.
// Geoff Streeter, Dyalog Ltd. 2007-09-03 <geoff@dyalog.com>
// Geoff Streeter, Dyalog Ltd. 2007-09-03
// geoff@dyalog.com
// extended for APL special actions 2008-09-09
// added a variant 2010-11-26
// add variant 2010-11-26
// made BKSL and LTGT keys the same to remove a compatibility issue with the UK physical keyboard
// add key (quad equals) 2013-03-12
// add currency 2014-05-23
// add parallel 2014-05-23
// add circle jot 2014-05-23
// add t diaeresis 2014-05-23
// add del diaerisis 2014-05-23
// add quad query 2014-05-23
// add dagger 2014-05-23
// The intention is that this keyboard layout overlays a base keyboard that provides
// the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
// be reached with a latching shift to increase group by one.
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "dyalog_base" {
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
// │ │ ⌶ │ ⍫ │ ⍒ │ ⍋ │ ⌽ │ ⍉ │ ⊖ │ ⍟ │ ⍱ │ ⍲ │ ! │ ⌹ ┃ ┃
// │ ¤ │ ⌶ │ ⍫ │ ⍒ │ ⍋ │ ⌽ │ ⍉ │ ⊖ │ ⍟ │ ⍱ │ ⍲ │ ! │ ⌹ ┃ ┃
// │ ⋄ │ ¨ │ ¯ │ < │ ≤ │ = │ ≥ │ > │ ≠ │ │ ∧ │ × │ ÷ ┃ ┃
// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
// ┃ ┃ │ │ ⍷ │ │ ⍨ │ │ │ ⍸ │ ⍥ │ ⍣ │ ⍞ │ ⍬ ┃ ┃
// ┃ ┃ ⍰ │ │ ⍷ │ ⌾ │ ⍨ │ │ │ ⍸ │ ⍥ │ ⍣ │ ⍞ │ ⍬ ┃ ┃
// ┃ ┃ ? │ ⍵ │ ∊ │ │ ~ │ ↑ │ ↓ │ │ ○ │ * │ ← │ → ┃ ┃
// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
// ┃ ┃ │ │ │ │ │ │ ⍤ │ │ ⌷ │ ≡ │ ≢ │ ⊣ ┃ ┃
// ┃ ┃ │ │ │ │ ⍢ │ │ ⍤ │ ⌸ │ ⌷ │ ≡ │ ≢ │ ⊣ ┃ ┃
// ┃ ┃ │ ⌈ │ ⌊ │ _ │ ∇ │ ∆ │ ∘ │ ' │ ⎕ │ ⍎ │ ⍕ │ ⊢ ┃ ┃
// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
// ┃ ┃ │ │ │ │ │ │ │ │ ⍪ │ ⍙ │ ⍠ ┃ ┃
// ┃ ┃ │ │ │ │ │ ⍭ │ ⍡ │ ∥ │ ⍪ │ ⍙ │ ⍠ ┃ ┃
// ┃ ┃ │ ⊂ │ ⊃ │ ∩ │ │ ⊥ │ │ | │ ⍝ │ ⍀ │ ⌿ ┃ ┃
// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
key <AB01> { [ U2282 ] }; // subset of
key <AB02> { [ U2283 ] }; // superset of
key <AB03> { [ U2229 ] }; // intersection
key <AB04> { [ U222A ] }; // union
key <AB05> { [ U22a5 ] }; // up tack
key <AB06> { [ U22a4 ] }; // down tack
key <AB07> { [ U007c ] }; // vertical line
key <AB05> { [ U22a5, U236d ] }; // up tack, stile tide
key <AB06> { [ U22a4, U2361 ] }; // down tack, down tack diaeresis
key <AB07> { [ bar, U2225 ] }; // vertical line, parallel to
key <AB08> { [ U235d, U236a ] }; // up shoe jot, comma bar
key <AB09> { [ U2340, U2359 ] }; // backslash bar, delta underbar
key <AB10> { [ U233f, U2360 ] }; // slash bar, quad colon
@ -395,17 +408,17 @@ xkb_symbols "dyalog_base" {
key <AC02> { [ U2308 ] }; // left ceiling
key <AC03> { [ U230a ] }; // left floor
key <AC04> { [ underscore ] }; // low line
key <AC05> { [ U2207 ] }; // nabla
key <AC05> { [ U2207, U2362 ] }; // nabla, del diaerisis
key <AC06> { [ U2206 ] }; // increment
key <AC07> { [ U2218, U2364 ] }; // ring operator, jot diaeresis
key <AC08> { [ apostrophe ] };
key <AC08> { [ apostrophe, U2338 ] }; // quote, key
key <AC09> { [ U2395, U2337 ] }; // quad, squish quad
key <AC10> { [ U234e, U2261 ] }; // up tack jot, identical to
key <AC11> { [ U2355, U2262 ] }; // down tack jot, not identical to
key <AD01> { [ question ] };
key <AD01> { [ question, U2370 ] }; // ?, quad question
key <AD02> { [ U2375 ] }; // omega
key <AD03> { [ U220a, U2377 ] }; // small element of, epsilon underbar
key <AD04> { [ U2374 ] }; // rho
key <AD04> { [ U2374, U233E ] }; // rho, circle jot
key <AD05> { [ asciitilde, U2368 ] }; // tilde, tilde diaeresis
key <AD06> { [ U2191 ] }; // upwards arrow
key <AD07> { [ U2193 ] }; // downwards arrow
@ -415,7 +428,7 @@ xkb_symbols "dyalog_base" {
key <AD11> { [ U2190, U235e ] }; // left arrow, quote quad
key <AD12> { [ U2192, U236c ] }; // right arrow, zilde
key <AE01> { [ diaeresis, U2336 ] }; // i-beam
key <AE02> { [ overbar, U236B ] }; // deltilde
key <AE02> { [ macron, U236B ] }; // deltilde
key <AE03> { [ less, U2352 ] }; // downgrade
key <AE04> { [ U2264, U234b ] }; // lesseq upgrade
key <AE05> { [ equal, U233d ] }; // circlestile
@ -427,10 +440,11 @@ xkb_symbols "dyalog_base" {
key <AE11> { [ multiply, exclam ] };
key <AE12> { [ division, U2339 ] }; // quad divide
key <BKSL> { [ U22a2, U22a3 ] }; // right tack, left tack
key <TLDE> { [ U22c4 ] }; // diamond
key <LTGT> { [ U22a2, U22a3 ] }; // right tack, left tack
key <TLDE> { [ U22c4, currency] }; // diamond
};
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "dyalog_box" {
// ┌───┬───┬───┬───┐
@ -449,9 +463,9 @@ xkb_symbols "dyalog_box" {
key <KP1> { [ U2514 ] }; // box drawing light up and right
key <KP2> { [ U2534 ] }; // box drawing light up and horizontal
key <KP3> { [ U2518 ] }; // box drawing light up and left
key <KP4> { [ U251c ] }; // box drawing light veritcal and right
key <KP5> { [ U253c ] }; // box drawing light veritcal and horizontal
key <KP6> { [ U2524 ] }; // box drawing light veritcal and left
key <KP4> { [ U251c ] }; // box drawing light vertical and right
key <KP5> { [ U253c ] }; // box drawing light vertical and horizontal
key <KP6> { [ U2524 ] }; // box drawing light vertical and left
key <KP7> { [ U250c ] }; // box drawing light down and right
key <KP8> { [ U252c ] }; // box drawing light down and horizontal
key <KP9> { [ U2510 ] }; // box drawing light down and left
@ -459,8 +473,7 @@ xkb_symbols "dyalog_box" {
};
partial hidden
xkb_symbols "dyalog_codes" {
hidden xkb_symbols "dyalog_codes" {
// Layout of private use area for this. In the style of the Unicode book
//
@ -513,7 +526,7 @@ xkb_symbols "dyalog_codes" {
// └────┴────┴────┴────┴....┴────┴────┴────┴────┘
//
// whilst these locations are defined. Dyalog's "aplkeys/xterm" file copes with
// normal function keys from the base keyboard rather than this overlay.
// normal function keys from the base keyboard rather than this overlay
// ┌─────┐ ┌───┐
// │ │ │ZM │
@ -537,6 +550,7 @@ xkb_symbols "dyalog_codes" {
// ┃ ┃ ┃ ┃ TO ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
key <BKSP> { [ Uf850, Uf855 ] }; // BP CB
key <ESC> { [ Uf800 ] }; // QT
key <FK11> { [ Uf821, Uf821 ] }; // ZM, ZM put this on both, the unshifted one sometimes gets lost
@ -557,6 +571,7 @@ xkb_symbols "dyalog_codes" {
key <RGHT> { [ Uf824, Uf854 ] }; // NX, RM
key <UP> { [ Uf820 ] }; // BK
// ┌───┬───┬───┐
// │PT │LL │UL │
// │CP │LS │US │
@ -584,6 +599,7 @@ xkb_symbols "dyalog_codes" {
// │ │ │ │
// └───────┴───┴───┘
key <KPAD> { [ Uf859 ] }; // TL
key <KPDV> { [ Uf819 ] }; // RD
key <KPMU> { [ Uf81a ] }; // TG
@ -596,3 +612,4 @@ xkb_symbols "dyalog" {
include "apl(dyalog_codes)"
name[Group1] = "APL keyboard symbols (Dyalog)";
};

View File

@ -96,7 +96,6 @@ xkb_symbols "azerty" {
partial hidden alphanumeric_keys
xkb_symbols "digits_KP" {
name[Group1]= "Arabic (digits_KP)";
// Use Arabic-script digits on the keypad.
@ -120,7 +119,7 @@ xkb_symbols "digits" {
include "ara(basic)"
name[Group1]= "Arabic (digits)";
// Use Arabic-script digits on the numberic row.
// Use Arabic-script digits on the numeric row.
key <AE01> { [ 0x1000661, exclam ] };
key <AE02> { [ 0x1000662, at ] };

View File

@ -190,7 +190,7 @@ xkb_symbols "bas_phonetic" {
// This is an extended variant of the standard Latin QWERTY layout with
// additional symbols in levels 3 and 4.
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "latin" {
key <TLDE> {[ grave, asciitilde, U2248, U2245 ]};

View File

@ -64,7 +64,6 @@ partial alphanumeric_keys
xkb_symbols "thinkpad" {
include "br(abnt2)"
name[Group1]="Portuguese (Brazil)";
key <RCTL> { [ slash, question, degree, questiondown ] };
};

View File

@ -48,7 +48,7 @@ xkb_symbols "right_hand" {
};
// 6-dot patterns on the keypad
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "keypad" {
key <KP4> { [ braille_dot_1 ] };
key <KP1> { [ braille_dot_2 ] };

View File

@ -1,27 +1,27 @@
default partial hidden modifier_keys
default hidden partial modifier_keys
xkb_symbols "capslock" {
replace key <CAPS> { [ Caps_Lock ] };
modifier_map Lock { Caps_Lock };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "shiftlock" {
replace key <CAPS> { [ Shift_Lock ] };
modifier_map Shift { Shift_Lock };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "grouplock" {
replace key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "swapescape" {
key <CAPS> { [ Escape ] };
key <ESC> { [ Caps_Lock ] };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "groupshift" {
key <CAPS> {
type[Group1] = "PC_ALT_LEVEL2",
@ -29,41 +29,41 @@ xkb_symbols "groupshift" {
};
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "escape" {
key <CAPS> { [ Escape ] };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "backspace" {
key <CAPS> { [ BackSpace ] };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "super" {
key <CAPS> { [ Super_L ] };
modifier_map Mod4 { <CAPS> };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "hyper" {
key <CAPS> { [ Hyper_L ] };
modifier_map Mod4 { <CAPS> };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "none" {
key <CAPS> { [ VoidSymbol ] };
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "numlock" {
key <CAPS> { [ Num_Lock ] };
};
// This changes the <CAPS> key to become a Control modifier,
// but it will still produce the Caps_Lock keysym.
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "ctrl_modifier" {
replace key <CAPS> {
type[Group1] = "ONE_LEVEL",

View File

@ -324,3 +324,128 @@ xkb_symbols "semicolon_switch_dvorak" {
modifier_map Mod5 { ISO_Level3_Latch };
};
// EXTRAS:
// ------- begin Mmuock keyboard map ------------------------------------------
// This layout is used for the Mmuock alphabet as described in the book
// _The Sound of Mmuock: Orthography_ [isbn: 978-9956-645-17-6]. Mmuock
// is the language of the Mmuock (local: Muòk) people of Western Cameroon.
//
// Author: Tano Fotang <fotang at mmuock dot org>
// Created: 2014-06-24
// Version: 1.0
//
// CHANGES:
// 2014-07-06 corrected shifted level3 of <AC11> to quotedbl
//
// NOTES:
// 0. This map is based on the Latin layout for the US keyboard.
//
// 1. We use combining diacritical marks to create tone markings. There are 13
// tones that need to be indicated.
//
// 2. When composing Mmuock text, about every fourth symbol is for tone. To
// facilitate easy and fast input, the combining diacritics are placed on
// the home row (AC). To reduce the number of key strokes required, the
// unshifted third level is used. Only 5 of the combining diacritics are not
// on the AC row; they are in the top number row, AE.
//
// 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 `ŋ'.)
//
// 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
// fit our needs because: (a) it is based on a different alphabet, (b) the
// vast majority of its symbols are not used in Mmuock, and (b) for the few
// symbols that are shared, the placing of the symbols is not egonomic for
// typing Mmuock as the _PRIMARY_ language. The aim of this keyboard, is 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:
// Family Accuracy
// DejaVu (except Sans Mono) 9/10
// Linux Libertine 8/10
// 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:
// Ubuntu Mono 9/10
// Unifont (Medium) 9/10
// DejaVu Sans Mono 7.5/10
// Droid Sans Mono 6.5/10
// These fonts are all freely available.
//
// ------the layout-----------
//
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
// │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & | * │ ( │ ) │ _ │ + ┃ ⌫ Back- ┃
// 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  ̄│ Œ ; │ ' │ æ \ ┃ ┃
// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
// ┃ │ Z │ X │ C │ V │ B │ N ŋ │ M │ < « │ > » │ ? ┃ ┃
// AB┃Shift ⇧ │ z │ x │ c │ v │ b │ n Ŋ │ m │ , │ . │ / ┃Shift ⇧ ┃
// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// AA┃Ctrl ┃Meta ┃Alt ┃ Space ┃AltGr ⇮┃Menu ┃Ctrl ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
//
partial alphanumeric_keys
xkb_symbols "mmuock" {
include "latin"
include "level3(ralt_switch)"
name[Group1]= "Mmuock";
key <AE06> { [ 6, asciicircum, U0302, NoSymbol ] }; // tone 10
key <AE07> { [ 7, ampersand, U0311, NoSymbol ] }; // tone 12
key <AE08> { [ 8, asterisk, U030D, trademark ] }; // tone 13
key <AE09> { [ 9, parenleft, U0313, plusminus ] }; // tone 14
key <AE10> { [ 0, parenright, U030A, degree ] }; // tone 6
key <AD03> { [ e, E, U01DD, U018E ] }; // U01DD = reversed E
key <AD04> { [ scaron, Scaron, r, R ] };
key <AD07> { [ u, U, Greek_omega, Greek_OMEGA ] };
key <AD08> { [ i, I, U025B, U0190 ] }; // U025B = open E
key <AD09> { [ o, O, Greek_phi, Greek_PHI ] };
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, NoSymbol ] }; // tone 1
key <AC03> { [ d, D, U0300, NoSymbol ] }; // tone 4
key <AC04> { [ f, F, U030C, NoSymbol ] }; // tone 5
key <AC05> { [ g, G, U0308, NoSymbol ] }; // tone 7
key <AC06> { [ U0323, U0307, h, H ] }; // COMBINING DOT BELOW, ABOVE
key <AC07> { [ j, J, U0306, NoSymbol ] }; // tone 9
key <AC08> { [ k, K, U030F, NoSymbol ] }; // tone 11
key <AC09> { [ l, L, U0304, NoSymbol ] }; // tone 0
key <AC10> { [ oe, OE, semicolon, colon ] };
key <AC11> { [ U0301, U030B, apostrophe, quotedbl ] }; // tone 3, 8
key <AB06> { [ n, N, eng, ENG ] };
key <AB08> { [ comma, less, guillemotleft, U2039 ] };
key <AB09> { [ period, greater, guillemotright, U203A ] };
key <BKSL> { [ ae, AE, backslash, bar ] };
include "cm(solidus_switch)"
};
// use slash as special key for switching to level3
partial hidden modifier_keys
xkb_symbols "solidus_switch" {
key <AB10> {
symbols[Group1] = [ ISO_Level3_Latch, question, slash, NoSymbol ]
};
modifier_map Mod5 { ISO_Level3_Latch };
};
// ------- end Mmuock keyboard map --------------------------------------------

View File

@ -70,6 +70,13 @@ xkb_symbols "swap_lwin_lctl" {
replace key <LCTL> { [ Super_L ] };
};
// Swap the functions of the right Win key and the right Ctrl key.
partial modifier_keys
xkb_symbols "swap_rwin_rctl" {
replace key <RWIN> { [ Control_R ] };
replace key <RCTL> { [ Super_R ] };
};
// Map Ctrl to the left Alt key, Alt to the left Win key,
// and Super to the left Ctrl key.
partial modifier_keys

View File

@ -780,7 +780,7 @@ xkb_symbols "adnw_base" {
key <AC11> { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] };
key <AB01> { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] };
key <AB02> { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] };
key <AB03> { [ odiaeresis, odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] };
key <AB03> { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] };
key <AB05> { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] };
key <AB06> { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] };
key <AB07> { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] };

View File

@ -10,9 +10,8 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Esperanto";
include "us(basic)"
name[Group1]= "Esperanto";
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";

View File

@ -86,8 +86,8 @@ xkb_symbols "dvorak" {
key <AE11> {[ apostrophe, question, dead_macron, dead_ogonek ]};
key <AE12> {[ exclamdown, questiondown, dead_breve, dead_abovedot ]};
key <AD01> {[ period, colon, less ]};
key <AD02> {[ comma, semicolon, greater ]};
key <AD01> {[ period, colon, less, guillemotleft ]};
key <AD02> {[ comma, semicolon, greater, guillemotright ]};
key <AD03> {[ ntilde, Ntilde, lstroke, Lstroke ]};
key <AD04> {[ p, P, paragraph ]};
key <AD05> {[ y, Y, yen ]};

View File

@ -98,7 +98,7 @@ xkb_symbols "classic" {
name[Group1]="Finnish (classic)";
};
partial alphanumeric_keys hidden
hidden partial alphanumeric_keys
xkb_symbols "fi" {
// Classic Finnish keyboard layout with dead keys

View File

@ -410,7 +410,7 @@ xkb_symbols "alt_caps_toggle" {
};
};
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "olpc" {
key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
};

View File

@ -14,7 +14,7 @@
// setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
// Very common set of media keys.
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "media_common" {
key <I01> { [ XF86AudioMedia ] };
key <I10> { [ XF86AudioPrev ] };
@ -29,7 +29,7 @@ xkb_symbols "media_common" {
};
// Popular web navigation keys.
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "nav_common" {
key <I21> { [ XF86Calculator ] };
key <I32> { [ XF86WWW ] };
@ -45,7 +45,7 @@ xkb_symbols "nav_common" {
};
// ACPI Standard
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "acpi_common" {
key <I5E> { [ XF86PowerOff ] };
key <I5F> { [ XF86Standby ] };
@ -56,26 +56,26 @@ xkb_symbols "acpi_common" {
};
// Combined sections, for simplicity.
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "media_nav_common" {
include "inet(media_common)"
include "inet(nav_common)"
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "media_nav_acpi_common" {
include "inet(media_common)"
include "inet(nav_common)"
include "inet(acpi_common)"
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "nav_acpi_common" {
include "inet(nav_common)"
include "inet(acpi_common)"
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "media_acpi_common" {
include "inet(media_common)"
include "inet(acpi_common)"
@ -1001,7 +1001,7 @@ xkb_symbols "ibm_spacesaver" {
// Logitech
// Logitech common definitions
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "logitech_base" {
include "inet(media_nav_acpi_common)"
key <I02> { [ XF86HomePage ] };
@ -1017,7 +1017,7 @@ xkb_symbols "logitech_base" {
};
// Logitech second set of common keys
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "logitech_set3" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
@ -1271,7 +1271,7 @@ xkb_symbols "mx2750" {
// Microsoft
// Microsoft Natural Wireless Ergonomic Keyboard 4000
// Microsoft Natural Ergonomic Keyboard 4000
partial alphanumeric_keys
xkb_symbols "microsoft4000" {
include "inet(media_nav_common)"

View File

@ -29,13 +29,14 @@ xkb_symbols "pes_keypad" {
name[Group1]= "Persian (with Persian keypad)";
include "ir(pes_part_basic)"
include "ir(pes_part_ext)"
include "ir(pes_part_keypad)"
include "nbsp(zwnj2nb3nnb4)"
include "level3(ralt_switch)"
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "pes_part_basic" {
// Persian digits
@ -93,23 +94,23 @@ xkb_symbols "pes_part_basic" {
key <BKSL> { [ backslash, bar, 0x1002010 ] };
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "pes_part_ext" {
// Persian and ASCII digits
key <AE01> { [ 0x10006f1, exclam, grave, 1 ] };
key <AE02> { [ 0x10006f2, 0x100066c, at, 2 ] };
key <AE03> { [ 0x10006f3, 0x100066b, numbersign, 3 ] };
key <AE04> { [ 0x10006f4, 0x100fdfc, dollar, 4 ] };
key <AE05> { [ 0x10006f5, 0x100066a, percent, 5 ] };
key <AE06> { [ 0x10006f6, multiply, asciicircum, 6 ] };
key <AE07> { [ 0x10006f7, Arabic_comma, ampersand, 7 ] };
key <AE08> { [ 0x10006f8, asterisk, enfilledcircbullet, 8 ] };
key <AE09> { [ 0x10006f9, parenright, 0x100200e, 9 ] };
key <AE10> { [ 0x10006f0, parenleft, 0x100200f, 0 ] };
key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "pes_part_keypad" {
// Persian digits and Mathematical operators
@ -121,19 +122,19 @@ xkb_symbols "pes_part_keypad" {
key <KPEN> { [ KP_Enter ] };
key <KPEQ> { [ equal ] };
key <KP7> { [ KP_Home, 0x10006f7 ] };
key <KP8> { [ KP_Up, 0x10006f8 ] };
key <KP9> { [ KP_Prior, 0x10006f9 ] };
key <KP7> { [ KP_Home, Farsi_7 ] };
key <KP8> { [ KP_Up, Farsi_8 ] };
key <KP9> { [ KP_Prior, Farsi_9 ] };
key <KP4> { [ KP_Left, 0x10006f4 ] };
key <KP5> { [ KP_Begin, 0x10006f5 ] };
key <KP6> { [ KP_Right, 0x10006f6 ] };
key <KP4> { [ KP_Left, Farsi_4 ] };
key <KP5> { [ KP_Begin, Farsi_5 ] };
key <KP6> { [ KP_Right, Farsi_6 ] };
key <KP1> { [ KP_End, 0x10006f1 ] };
key <KP2> { [ KP_Down, 0x10006f2 ] };
key <KP3> { [ KP_Next, 0x10006f3 ] };
key <KP1> { [ KP_End, Farsi_1 ] };
key <KP2> { [ KP_Down, Farsi_2 ] };
key <KP3> { [ KP_Next, Farsi_3 ] };
key <KP0> { [ KP_Insert, 0x10006f0 ] };
key <KP0> { [ KP_Insert, Farsi_0 ] };
key <KPDL> { [ KP_Delete, 0x100066b ] };
};
@ -184,16 +185,16 @@ xkb_symbols "ku_ara" {
key <BKSL> { [ backslash, bar, ccedilla, Ccedilla ] };
// Digits
key <AE01> { [ 1, exclam, 0x10006f1, grave ] };
key <AE02> { [ 2, at, 0x10006f2, at ] };
key <AE03> { [ 3, numbersign, 0x10006f3, 0x100066b ] };
key <AE04> { [ 4, dollar, 0x10006f4, 0x100fdfc ] };
key <AE05> { [ 5, percent, 0x10006f5, 0x100066a ] };
key <AE06> { [ 6, asciicircum, 0x10006f6, multiply ] };
key <AE07> { [ 7, ampersand, 0x10006f7, Arabic_comma ] };
key <AE08> { [ 8, asterisk, 0x10006f8, enfilledcircbullet ] };
key <AE09> { [ 9, parenright, 0x10006f9, 0x100200e ] };
key <AE10> { [ 0, parenleft, 0x10006f0, 0x100200f ] };
key <AE01> { [ 1, exclam, Farsi_1, grave ] };
key <AE02> { [ 2, at, Farsi_2, at ] };
key <AE03> { [ 3, numbersign, Farsi_3, 0x100066b ] };
key <AE04> { [ 4, dollar, Farsi_4, 0x100fdfc ] };
key <AE05> { [ 5, percent, Farsi_5, 0x100066a ] };
key <AE06> { [ 6, asciicircum, Farsi_6, multiply ] };
key <AE07> { [ 7, ampersand, Farsi_7, Arabic_comma ] };
key <AE08> { [ 8, asterisk, Farsi_8, enfilledcircbullet ] };
key <AE09> { [ 9, parenright, Farsi_9, 0x100200e ] };
key <AE10> { [ 0, parenleft, Farsi_0, 0x100200f ] };
key <AE11> { [ minus, Arabic_tatweel, underscore ] };
key <AE12> { [ equal, plus, 0x1002212 ] };

View File

@ -87,6 +87,12 @@ xkb_symbols "nodeadkeys" {
// * 2006-01-14:
// Revised the comments in the file
//
// * 2013-05-30:
// Renamed the old keyboard layout and created a new one that conforms with the later
// model Apple Laptop and Aluminium USB/Bluetooth keyboards (A1243/A1255 and later)
// that are used with the more recent versions of OS X. Also replaced some Unicode
// codes with proper symbol names.
//
// = NOTES
// * 20 characters in this keymap have no named character defined in
// include/keysymdef.h and as a result their Unicode code points in
@ -106,9 +112,9 @@ xkb_symbols "nodeadkeys" {
// you're able to get it running with such a keyboard
// Copied from macintosh_vndr/is
partial alphanumeric_keys
xkb_symbols "mac" {
name[Group1]= "Icelandic (Macintosh)";
xkb_symbols "mac_legacy" {
name[Group1]= "Icelandic (Macintosh, legacy)";
//-- Row 5 (E) --//
key <TLDE> { [ sterling, section, UF8FF, apostrophe ] };
@ -135,7 +141,7 @@ xkb_symbols "mac" {
key <AD06> { [ y, Y, yen, VoidSymbol ] };
key <AD07> { [ u, U, dead_diaeresis, VoidSymbol ] };
key <AD08> { [ i, I, U0131, U00AA ] };
key <AD09> { [ o, O, dead_circumflex,U00BA ] };
key <AD09> { [ o, O, dead_circumflex, U00BA ] };
key <AD10> { [ p, P, Greek_pi, Greek_PI ] };
key <AD11> { [ eth, Eth, U201e, U201c ] };
key <AD12> { [ apostrophe, question, questiondown, U00B7 ] };
@ -166,12 +172,78 @@ xkb_symbols "mac" {
key <AB06> { [ n, N, dead_tilde, VoidSymbol ] };
key <AB07> { [ m, M, U00B5, VoidSymbol ] };
key <AB08> { [ comma, semicolon, lessthanequal, guillemotleft ] };
key <AB09> { [ period, colon, greaterthanequal,guillemotright ] };
key <AB09> { [ period, colon, greaterthanequal, guillemotright ] };
key <AB10> { [ thorn, Thorn, U2019, U201d ] };
include "level3(ralt_switch)"
};
partial alphanumeric_keys
xkb_symbols "mac" {
name[Group1]= "Icelandic (Macintosh)";
//-- Row 5 (E) --//
key <TLDE> { [ less, greater, bar, UF8FF ] };
key <AE01> { [ 1, exclam, exclamdown, VoidSymbol ] };
key <AE02> { [ 2, quotedbl, at, VoidSymbol ] };
key <AE03> { [ 3, numbersign, trademark, sterling ] };
key <AE04> { [ 4, dollar, cent, EuroSign ] };
key <AE05> { [ 5, percent, U2030, infinity ] };
key <AE06> { [ 6, ampersand, asciicircum, U2044 ] };
key <AE07> { [ 7, slash, braceleft, division ] };
key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
key <AE09> { [ 9, parenright, bracketright, braceright ] };
key <AE10> { [ 0, equal, braceright, approxeq ] };
key <AE11> { [ odiaeresis, Odiaeresis, backslash, U2260 ] };
key <AE12> { [ minus, underscore, endash, emdash ] };
//-- Row 4 (D) --//
key <AD01> { [ q, Q, U0040, paragraph ] };
key <AD02> { [ w, W, U2211, U00A7 ] };
key <AD03> { [ e, E, U20AC, U00BF ] };
key <AD04> { [ r, R, registered, VoidSymbol ] };
key <AD05> { [ t, T, degree, U2022 ] };
key <AD06> { [ y, Y, yen, VoidSymbol ] };
key <AD07> { [ u, U, dead_diaeresis, VoidSymbol ] };
key <AD08> { [ i, I, idotless, ordfeminine ] };
key <AD09> { [ o, O, dead_circumflex, U00BA ] };
key <AD10> { [ p, P, Greek_pi, Greek_PI ] };
key <AD11> { [ eth, Eth, doublelowquotemark, leftdoublequotemark ] };
key <AD12> { [ apostrophe, question, asciitilde, periodcentered ] };
//-- Row 3 (C) --//
key <AC01> { [ a, A, aring, Aring ] };
key <AC02> { [ s, S, ssharp, abovedot ] };
key <AC03> { [ d, D, partialderivative, U02DA ] };
key <AC04> { [ f, F, function, macron ] };
key <AC05> { [ g, G, copyright, breve ] };
key <AC06> { [ h, H, bar, U00B8 ] };
key <AC07> { [ j, J, U2206, doubleacute ] };
key <AC08> { [ k, K, notsign, U2DB ] };
key <AC09> { [ l, L, ellipsis, caron ] };
key <AC10> { [ ae, AE, oe, OE ] };
key <AC11> { [ dead_acute, dead_acute, asciicircum, leftsinglequotemark ] };
key <BKSL> { [ plus, asterisk, grave, plusminus ] };
//-- Row 2 (B) --//
key <LSGT> { [ degree, dead_diaeresis, oslash, Ooblique ] };
key <AB01> { [ z, Z, Greek_OMEGA, VoidSymbol ] };
key <AB02> { [ x, X, asciitilde, VoidSymbol ] };
key <AB03> { [ c, C, ccedilla, Ccedilla ] };
key <AB04> { [ v, V, radical, U25CA ] };
key <AB05> { [ b, B, integral, VoidSymbol ] };
key <AB06> { [ n, N, dead_tilde, VoidSymbol ] };
key <AB07> { [ m, M, mu, VoidSymbol ] };
key <AB08> { [ comma, semicolon, lessthanequal, guillemotleft ] };
key <AB09> { [ period, colon, greaterthanequal, guillemotright ] };
key <AB10> { [ thorn, Thorn, rightsinglequotemark, rightdoublequotemark ] };
include "level3(ralt_switch)"
};
// This is a modified version of the English Dvorak layout that allows
// you to type all Icelandic letters under X. It's not a full attempt at
// nationalizing the layout as e.g. the Norwegian, Swedish and French

View File

@ -10,7 +10,7 @@ xkb_symbols "106" {
key <AE13> { [ backslash, bar ] };
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "common" {
// "Common" keys for jp 106/109A layouts.

View File

@ -1,9 +1,9 @@
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "overlay" {
include "keypad(overlay1)"
};
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "overlay1" {
key <KP7> { [ KP_Home ], overlay1=<KO7> };
@ -37,7 +37,7 @@ xkb_symbols "overlay1" {
key <KODL> { [ KP_Decimal ] };
};
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "overlay2" {
key <KP7> { [ KP_Home ], overlay2=<KO7> };
@ -71,7 +71,7 @@ xkb_symbols "overlay2" {
key <KODL> { [ KP_Decimal ] };
};
partial hidden keypad_keys
hidden partial keypad_keys
xkb_symbols "operators" {
// Puts some commands to control the X server on
// the fifth level of the keypad's operator keys.
@ -93,7 +93,7 @@ xkb_symbols "operators" {
};
};
default partial hidden keypad_keys
default hidden partial keypad_keys
xkb_symbols "x11" {
include "keypad(operators)"

View File

@ -13,13 +13,13 @@ xkb_symbols "kr104" {
include "kr(koreankeys_raltctl)"
};
partial hidden function_keys
hidden partial function_keys
xkb_symbols "koreankeys" {
key <K71> { [ Hangul ] };
key <K72> { [ Hangul_Hanja ] };
};
partial hidden function_keys
hidden partial function_keys
xkb_symbols "koreankeys_raltctl" {
key <RALT> { [ Hangul ] };
key <RCTL> { [ Hangul_Hanja ] };

View File

@ -204,8 +204,6 @@ xkb_symbols "olpc" {
include "kz(basic)"
name[Group1] = "Kazakh";
key <TLDE> { [ parenleft, parenright ] };
key <BKSL> { [ Cyrillic_io, Cyrillic_IO ] };

View File

@ -53,7 +53,7 @@ xkb_symbols "ralt_switch_multikey" {
};
// A special case of the right-Alt switch -- for use with grp:alts_toggle.
partial hidden modifier_keys
hidden partial modifier_keys
xkb_symbols "ralt_switch_for_alts_toggle" {
virtual_modifiers LAlt, AltGr;
key <LALT> {

View File

@ -11,11 +11,11 @@ xkb_symbols "basic" {
// │ ~ │ ! │ " │ # │ ; │ % │ : │ ? │ * │ ( ̣ │ ) │ -- │ + ┃ ⌫ Back ┃
// │ ` │ 1 │ 2 @ │ 3 │ 4 $ │ 5 € │ 6 ^ │ 7 & │ 8 │ 9 │ 0 │ - │ = ┃ space ┃
// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
// ┃ ┃ Ţ Q │ Ê W │ E │ R │ T │ Y │ U │ I │ O │ P │ Ö { │ Ü } ┃ Enter ┃
// ┃ ┃ Ţ Q │ Ê W │ E │ R │ T │ Y │ U │ İ │ O │ P │ Ö { │ Ü } ┃ Enter ┃
// ┃Tab ↹ ┃ ţ q │ ê w │ e │ r │ t │ y │ u │ i │ o │ p │ ö [ │ ü ] ┃ ⏎ ┃
// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
// ┃ ┃ A │ S │ D │ F │ G │ H │ J │ K │ L │Ş │I │ / ┃ ┃
// ┃Caps ⇬ ┃ a │ s │ d │ f │ g │ h │ j │ k │ l │ş │ı │ \ ┃ ┃
// ┃Caps ⇬ ┃ a │ s │ d │ f │ g │ h │ j │ k │ l │ş │ı' │ \ ┃ ┃
// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
// ┃ │ Z │ Ç X │ C │ V │ B │ N │ M │Ä │< │> ┃ ┃
// ┃Shift ⇧ │ z │ ç x │ c │ v │ b │ n │ m │ä │, │. ┃Shift ⇧ ┃
@ -75,7 +75,7 @@ xkb_symbols "gag" {
key <AB01> { [ z, Z ] };
key <AB02> { [ ccedilla, Ccedilla, x, X ] };
key <AB03> { [ c, Ccedilla ] };
key <AB03> { [ c, C ] };
key <AB04> { [ v, V ] };
key <AB05> { [ b, B ] };
key <AB06> { [ n, N ] };

View File

@ -74,7 +74,7 @@ xkb_symbols "pc105" {
key <KIUP> { [ XF86KbdBrightnessUp ] };
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "editing" {
key <PRSC> {
type= "PC_ALT_LEVEL2",

View File

@ -45,7 +45,7 @@ xkb_symbols "yz" {
key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "common" {
// "Common" keys: keys that are the same
// for both latin and cyrillic keyboards.
@ -73,7 +73,7 @@ xkb_symbols "common" {
include "kpdl(comma)"
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "cyralpha" {
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@ -114,7 +114,7 @@ xkb_symbols "cyralpha" {
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "latalpha" {
key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@ -127,7 +127,7 @@ xkb_symbols "latalpha" {
key <BKSL> { [ zcaron, Zcaron, any, any ] }; // \ |
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "twoletter" {
// Letters which are written in latin transcription with two characters.
@ -142,7 +142,7 @@ xkb_symbols "twoletter" {
key <AB01> { [ zcaron, Zcaron, any, any ] }; // z
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "latlevel3" {
key <TLDE> { [ any, any, notsign, notsign ] }; // ` ~
key <AE01> { [ any, any, dead_tilde, asciitilde ] }; // 1 !
@ -196,7 +196,7 @@ xkb_symbols "latlevel3" {
key <AB10> { [ any, any, emdash, endash ] }; // / ?
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "cyrlevel3" {
key <TLDE> { [ any, any, degree, notsign ] }; // ` ~
key <AE03> { [ any, any, dead_circumflex, NoSymbol ] }; // 3 #

View File

@ -21,7 +21,7 @@ xkb_symbols "winkeys" {
key <BKSL> { [ backslash, slash ] };
};
partial hidden alphanumeric_keys
hidden partial alphanumeric_keys
xkb_symbols "common" {
key <AE01> { [ 1, exclam ] };

View File

@ -1,5 +1,5 @@
// $NetBSD: sl-c3x00,v 1.1 2009/12/13 04:54:51 nonaka Exp $
// $OpenBSD: sl-c3x00,v 1.4 2014/09/17 16:11:51 shadchin Exp $
// $OpenBSD: sl-c3x00,v 1.5 2014/12/28 16:41:05 shadchin Exp $
partial default alphanumeric_keys
xkb_symbols "basic" {

View File

@ -48,7 +48,7 @@ xkb_symbols "base" {
// 4th keyboard row
key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
key <AB04> { [NoSymbol, NoSymbol, downarrow] }; // "v"
key <AB04> { [NoSymbol, NoSymbol, downarrow, U25CA] }; // "v"
key <AB07> { [NoSymbol, NoSymbol, U2212, enfilledcircbullet] }; // "m"
key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."

View File

@ -1,7 +1,8 @@
default xkb_types "basic" {
// Fairly standard definitions for
// the three required key types.
// three of the four required key types.
// The fourth type "KEYPAD" is defined in the "numpad" file.
virtual_modifiers NumLock;