Module Name: xsrc
Committed By: mrg
Date: Tue Aug 29 07:46:43 UTC 2017
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in at in lk
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: bn
Log Message:
merge xkeyboard-config 2.21.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkeyboard-config/dist/symbols/bn
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/lk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.13 xsrc/external/mit/xkeyboard-config/dist/configure:1.14
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.13 Mon Feb 13 02:33:21 2017
+++ xsrc/external/mit/xkeyboard-config/dist/configure Tue Aug 29 07:46:43 2017
@@ -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.20.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.21.
#
#
# 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.20'
-PACKAGE_STRING='xkeyboard-config 2.20'
+PACKAGE_VERSION='2.21'
+PACKAGE_STRING='xkeyboard-config 2.21'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1325,7 +1325,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.20 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.21 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,7 +1396,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.20:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.21:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.20
+xkeyboard-config configure 2.21
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1654,7 +1654,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.20, which was
+It was created by xkeyboard-config $as_me 2.21, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2519,7 +2519,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.20'
+ VERSION='2.21'
cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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.20, which was
+This file was extended by xkeyboard-config $as_me 2.21, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7463,7 +7463,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.20
+xkeyboard-config config.status 2.21
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.12
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11 Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Tue Aug 29 07:46:43 2017
@@ -5,7 +5,7 @@ symbols_DATA = \
af al am apl \
ara at au az \
ba bd be \
-bg bn br brai \
+bg br brai \
bt bw by \
ca cd ch \
cm cn cz \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.13 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.14
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.13 Mon Feb 13 02:33:22 2017
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Tue Aug 29 07:46:43 2017
@@ -363,7 +363,7 @@ symbols_DATA = \
af al am apl \
ara at au az \
ba bd be \
-bg bn br brai \
+bg br brai \
bt bw by \
ca cd ch \
cm cn cz \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/at
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.6
--- xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.5 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/at Tue Aug 29 07:46:43 2017
@@ -13,7 +13,7 @@ xkb_symbols "nodeadkeys" {
include "de(nodeadkeys)"
- name[Group1]="German (Austria, eliminate dead keys)";
+ name[Group1]="German (Austria, no dead keys)";
};
partial alphanumeric_keys
@@ -29,6 +29,6 @@ xkb_symbols "sundeadkeys" {
include "de(Sundeadkeys)"
- name[Group1]="German (Austria, Sun dead keys)";
+ name[Group1]="German (Austria, with Sun dead keys)";
};
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.11
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.10 Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in Tue Aug 29 07:46:43 2017
@@ -1429,7 +1429,80 @@ xkb_symbols "tel" {
include "level3(ralt_switch)"
};
-partial alphanumeric_keys
+//Name : Sarala
+//Description : This is an adaptation of the Sarala keyboard (http://www.medhajananam.org/sarala/) developed
+// by Krishna Dhullipalla. Because of the way keyboard shortcuts are laid out in KDE, the keyboard
+// modifiers had to be changed. The layout does not take any part of the original Sarala keyboard
+// code however. It has been developed from scratch, so the experience may differ.
+//
+// There is a ibus-m17n version of Sarala layout developed by Satya Pothamsetti <[email protected]> on
+// http://www.medhajananam.org/.
+//Standard : Supports Unicode 9.0.
+//Help : This layout differs slightly from the layout on Medhajenanam. The layout has been depicted in the
+// pdf file attached to this post on Sarala google group.
+// (https://groups.google.com/forum/#!topic/sarala-keyboard/-gsa90dUFcs).
+//
+//Layout Developed by : Krishna Dhullipalla <[email protected]> (http://www.medhajananam.org/)
+//Author : Venkat R Akkineni <[email protected]>
+//Date : Apr 28 2017
+partial alphanumeric_keys
+xkb_symbols "tel-sarala"
+{
+ name[Group1] = "Telugu (Sarala)";
+ key.type="FOUR_LEVEL";
+ // sequence base, shift, alt, alt + shift
+ key <AB01> { [ U0C4A, U0C12 ] }; // ొ ఒ
+ key <AB02> { [ U0C42, U0C0A ] }; // ూ ఊ
+ key <AB03> { [ U0C21, U0C22 ] }; // డ ఢ
+ key <AB04> { [ U0C35, U0C39 ] }; // వ హ
+ key <AB05> { [ U0C2C, U0C2D ] }; // బ భ
+ key <AB06> { [ U0C28, U0C23 ] }; // న ణ
+ key <AB07> { [ U0C2E, U0C01 ] }; // మ ఁ
+ key <AB08> { [ U002C, U0C1E, leftcaret ] }; // , ఞ <
+ key <AB09> { [ U002E, U0C19, rightcaret ] }; // . ఙ >
+ key <AB10> { [ U0C36, question, KP_Divide ] }; // శ ? /
+ key <AC01> { [ U0C2F, U0C3D ] }; // య ఽ
+ key <AC02> { [ U0C02, U0C03 ] }; // ం ః
+ key <AC03> { [ U0C26, U0C27 ] }; // ద ధ
+ key <AC04> { [ U0C4D, U0C05 ] }; // ్ అ
+ key <AC05> { [ U0C17, U0C18 ] }; // గ ఘ
+ key <AC06> { [ U0C1A, U0C1B, U0C58, U0C59 ] }; // చ ఛ ౘ ౙ
+ key <AC07> { [ U0C3E, U0C06 ] }; // ా ఆ
+ key <AC08> { [ U0C15, U0C16, U0C62, U0C63 ] }; // క ఖ ౢ ౣ
+ key <AC09> { [ U0C32, U0C33, U0C0C, U0C61 ] }; // ల ళ ఌ ౡ
+ key <AC10> { [ U0C1F, U0C20, semicolon, colon ] }; // ట ఠ ; :
+ key <AC11> { [ quoteright, quotedbl ] }; // ' "
+ key <AD01> { [ U0C46, U0C0E, U0C44 U0C34 ] }; // ె ఎ ౄ ఴ
+ key <AD02> { [ U0C38, U0C37, U0C44 ] }; // స ష ౄ
+ key <AD03> { [ U0C47, U0C0F, U0C44 ] }; // ే ఏ ౄ
+ key <AD04> { [ U0C30, U0C31, U0C44, U0C60 ] }; // ర ఱ ౄ ౠ
+ key <AD05> { [ U0C24, U0C25 ] }; // త థ
+ key <AD06> { [ U0C40, U0C08 ] }; // ీ ఈ
+ key <AD07> { [ U0C41, U0C09 ] }; // ు ఉ
+ key <AD08> { [ U0C3F, U0C07 ] }; // ి ఇ
+ key <AD09> { [ U0C4B, U0C13 ] }; // ో ఓ
+ key <AD10> { [ U0C2A, U0C2B ] }; // ప ఫ
+ key <AD11> { [ U0C1C, U0C1D, bracketleft, braceleft ] }; // జ ఝ [ {
+ key <AD12> { [ U0C48, U0C10, bracketright, braceright ] }; // ై ఐ ] }
+ key <AE01> { [ KP_1, exclam, U0C67, U0C78 ] }; // 1 ! ౦ ౸
+ key <AE02> { [ KP_2, at, U0C68, U0C79 ] }; // 2 @ ౨ ౹
+ key <AE03> { [ KP_3, numbersign, U0C69, U0C7A ] }; // 3 # ౩ ౺
+ key <AE04> { [ KP_4, dollar, U0C6A, U0C7B ] }; // 4 $ ౪ ౻
+ key <AE05> { [ KP_5, percent, U0C6B, U0C7C ] }; // 5 % ౫ ౼
+ key <AE06> { [ KP_6, asciicircum, U0C6C, U0C7D ] }; // 6 ^ ౬ ౽
+ key <AE07> { [ KP_7, ampersand, U0C6D, U0C7E ] }; // 7 & ౭ ౾
+ key <AE08> { [ KP_8, KP_Multiply, U0C6E, U0C7F ] }; // 8 * ౮ ౿
+ key <AE09> { [ KP_9, U0028, U0C6F, U20B9 ] }; // 9 ( ౯ ₹
+ key <AE10> { [ KP_0, U0029, U0C66, U0C55 ] }; // 0 ) ౦ ౕ
+ key <AE11> { [ KP_Subtract, underbar, NoSymbol, U0C56 ] }; // - _ ౖ
+ key <AE12> { [ KP_Equal, KP_Add ] }; // = +
+ key <BKSL> { [ U0C4C, U0C14, U0964, U0965 ] }; // ౌ ఔ । ॥
+ key <TLDE> { [ U0C43, U0C0B, quoteleft, asciitilde ] }; // ృ ఋ ` ~
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
xkb_symbols "urd-phonetic" {
include "pk(urd-phonetic)"
name[Group1]= "Urdu (phonetic)";
@@ -1438,13 +1511,13 @@ xkb_symbols "urd-phonetic" {
partial alphanumeric_keys
xkb_symbols "urd-phonetic3" {
include "pk(urd-crulp)"
- name[Group1]= "Urdu (alternative phonetic)";
+ name[Group1]= "Urdu (alt. phonetic)";
};
partial alphanumeric_keys
xkb_symbols "urd-winkeys" {
include "pk(urd-nla)"
- name[Group1]= "Urdu (WinKeys)";
+ name[Group1]= "Urdu (Win keys)";
};
// based on a keyboard map from an 'xkb/symbols/gur' file
@@ -1726,7 +1799,7 @@ partial alphanumeric_keys
xkb_symbols "eng" {
include "us(basic)"
- name[Group1]= "English (India, with rupee sign)";
+ name[Group1]= "English (India, with rupee)";
include "rupeesign(4)"
include "level3(ralt_switch)"
@@ -1744,7 +1817,7 @@ xkb_symbols "eng" {
partial alphanumeric_keys
xkb_symbols "mal_enhanced" {
- name[Group1] = "Malayalam (enhanced Inscript, with rupee sign)";
+ name[Group1] = "Malayalam (enhanced Inscript, with rupee)";
//From grave to backslash (\)
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/lk
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.9 Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/lk Tue Aug 29 07:46:43 2017
@@ -2,7 +2,7 @@
// Maintainer : Harshula Jayasuriya <[email protected]>
// Last Updated: 2011-05-25
// This is a phonetic static mapping for a standard US-English keyboard
-// (qwerty)
+// (QWERTY)
// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,
@@ -123,7 +123,7 @@ xkb_symbols "tam_TAB" {
partial alphanumeric_keys modifier_keys
xkb_symbols "us" {
include "us(basic)"
- name[Group1]= "Sinhala (US keyboard with Sinhala letters)";
+ name[Group1]= "Sinhala (US, with Sinhala letters)";
//
// UNSHIFTED, SHIFT, ALT
// --------------------------------------------
@@ -141,7 +141,7 @@ xkb_symbols "us" {
key <AC01> { [ a, aacute, adiaeresis ] };
key <AC02> { [ s, VoidSymbol, VoidSymbol ] };
- key <AC03> { [ d, D, VoidSymbol ] };
+ key <AC03> { [ eth, ETH, VoidSymbol ] };
key <AC04> { [ thorn, f, VoidSymbol ] };
key <AC05> { [ g, G, VoidSymbol ] };
key <AC06> { [ h, VoidSymbol, VoidSymbol ] };
@@ -151,7 +151,7 @@ xkb_symbols "us" {
key <AC10> { [ semicolon, colon, VoidSymbol ] };
key <AC11> { [ apostrophe, quotedbl, VoidSymbol ] };
- key <AD01> { [ eth, ETH, q ] };
+ key <AD01> { [ d, D, q ] };
key <AD02> { [ ae, acute, VoidSymbol ] };
key <AD03> { [ e, eacute, ediaeresis ] };
key <AD04> { [ r, ucircumflex, VoidSymbol ] };
