Module Name: xsrc
Committed By: mrg
Date: Fri Jul 11 19:11:00 UTC 2014
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in in ir
Log Message:
merge xkeyboard-config 2.12.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
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.9 xsrc/external/mit/xkeyboard-config/dist/configure:1.10
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.9 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/configure Fri Jul 11 19:11:00 2014
@@ -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.11.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.12.
#
#
# 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.11'
-PACKAGE_STRING='xkeyboard-config 2.11'
+PACKAGE_VERSION='2.12'
+PACKAGE_STRING='xkeyboard-config 2.12'
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.11 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.12 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.11:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.12:";;
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.11
+xkeyboard-config configure 2.12
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.11, which was
+It was created by xkeyboard-config $as_me 2.12, 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.11'
+ VERSION='2.12'
cat >>confdefs.h <<_ACEOF
@@ -7871,7 +7871,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.11, which was
+This file was extended by xkeyboard-config $as_me 2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7928,7 +7928,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.11
+xkeyboard-config config.status 2.12
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.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.9 Fri May 31 23:23:11 2013
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Fri Jul 11 19:11:00 2014
@@ -11,7 +11,7 @@ bt bw by \
ca cd ch \
cm cn cz \
de dk \
-ee es et epo \
+ee es et epo eu \
fi fo fr \
gb ge gh gn \
gr hr hu \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Fri Jul 11 19:11:00 2014
@@ -363,7 +363,7 @@ bt bw by \
ca cd ch \
cm cn cz \
de dk \
-ee es et epo \
+ee es et epo eu \
fi fo fr \
gb ge gh gn \
gr hr hu \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.9
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.8 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in Fri Jul 11 19:11:00 2014
@@ -107,7 +107,7 @@ partial alphanumeric_keys
xkb_symbols "bolnagri" {
name[Group1] = "Hindi (Bolnagri)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
+
// Roman digits
key <TLDE> { [ U0902, U0901, apostrophe, asciitilde ] }; // apostrophe: anusvara, candrabindu
key <AE01> { [ 1, exclam, U0967, exclam ] };
@@ -393,8 +393,6 @@ xkb_symbols "ben_baishakhi" {
// modifier_map Shift { Shift_L };
// modifier_map Lock { Caps_Lock };
// modifier_map Control{ Control_L };
-
-
};
xkb_symbols "ben_inscript" {
@@ -536,8 +534,6 @@ xkb_symbols "ben_gitanjali" {
// modifier_map Shift { Shift_L };
// modifier_map Lock { Caps_Lock };
// modifier_map Control{ Control_L };
-
-
};
@@ -613,7 +609,6 @@ xkb_symbols "ben_bornona" {
// modifier_map Control{ Control_L };
// third level with right-alt
include "level3(ralt_switch)"
-
};
partial alphanumeric_keys
@@ -842,7 +837,6 @@ xkb_symbols "mal" {
include "rupeesign(4)"
include "level3(ralt_switch)"
-
};
//Name : Lalitha
@@ -854,7 +848,7 @@ partial alphanumeric_keys
xkb_symbols "mal_lalitha" {
name[Group1] = "Malayalam (Lalitha)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
+
// Roman digits
key <TLDE> { [ U0D4D, U0D02, apostrophe, asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
key <AE01> { [ 1, exclam, U0D67, exclam ] };
@@ -1236,7 +1230,6 @@ xkb_symbols "tam_TSCII" {
key <AB06> { [ 0x10000b6, 0x10000aa ] }; // au
key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A
key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I
-
};
partial alphanumeric_keys
@@ -1399,7 +1392,7 @@ xkb_symbols "guru" {
key <AE08> { [ U0A6e ] };
key <AE09> { [ U0A6F, parenleft ] };
key <AE10> { [ U0A66, parenright ] };
- key <AE11> { [ gur_visarga ] };
+ key <AE11> { [ U0A03 ] };
key <AE12> { [ equal, plus ] };
// Mainly long vowels
@@ -1462,7 +1455,7 @@ partial alphanumeric_keys
xkb_symbols "jhelum" {
name[Group1] = "Punjabi (Gurmukhi Jhelum)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
+
// Roman digits
key <TLDE> { [ apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu
key <AE01> { [ 1,exclam, U0A67, exclam ] };
@@ -1645,7 +1638,7 @@ xkb_symbols "hin-wx" {
key <AB01> { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] };
key <AB02> { [ 0x1000926, 0x1000927 ] };
key <AB03> { [ 0x100091A, 0x100091B ] };
- key <AB04> { [ 0x1000935, dead_V ] };
+ key <AB04> { [ 0x1000935 ] };
key <AB05> { [ 0x100092C, 0x100092D ] };
key <AB06> { [ 0x1000928, 0x1000923 ] };
key <AB07> { [ 0x100092E, 0x1000902 ] };
@@ -1660,12 +1653,10 @@ xkb_symbols "hin-wx" {
partial alphanumeric_keys
xkb_symbols "eng" {
- name[Group1]= "English (India, with RupeeSign)";
-
include "us(basic)"
+ name[Group1]= "English (India, with rupee sign)";
include "rupeesign(4)"
-
include "level3(ralt_switch)"
};
@@ -1681,7 +1672,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 sign)";
//From grave to backslash (\)
@@ -1744,11 +1735,8 @@ xkb_symbols "mal_enhanced" {
key <AB09> { [ period , U0d7d ] }; //chillu l
key <AB10> { [ U0d2f , question ] };
- // hope this includes the rupee sign at alt + 4
-
include "rupeesign(4)"
include "level3(ralt_switch)"
-
};
@@ -1780,13 +1768,12 @@ xkb_symbols "hin-kagapa" {
name[Group1] = "Hindi (KaGaPa phonetic)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
// Roman digits
key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark
key <AE01> { [ 1, exclam, U0967 ] };
key <AE02> { [ 2, at, U0968, U20A8 ] }; // U20A8: generic rupee sign (Rs)
key <AE03> { [ 3, numbersign, U0969 ] };
- key <AE04> { [ 4, dollar, U096A, U20B9 ] }; // U20B9: new Indian Rupee sign
+ key <AE04> { [ 4, dollar, U096A, U20B9 ] }; // U20B9: new Indian rupee sign
key <AE05> { [ 5, percent, U096B ] };
key <AE06> { [ 6, asciicircum, U096C, U200C ] }; // ZWNJ
key <AE07> { [ 7, ampersand, U096D, U200D ] }; // ZWJ
@@ -1824,7 +1811,6 @@ xkb_symbols "hin-kagapa" {
key <AC10> { [ semicolon, colon, U1CF2, U1CF3 ] }; // U1CF2/3: ardhavisarga/rotated ardhavisarga
key <AC11> { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta
// U201D: Right double quotation mark
-
//Z Row
key <AB01> { [ U091E, U0919 ] }; // Z: nya, nga
key <AB02> { [ U0937, U093C, U0934 ] }; // X: ssa, nukta below, lla-nukta
@@ -1844,17 +1830,15 @@ xkb_symbols "hin-kagapa" {
// Sanskrit uses Devanagari layout of Hindi
partial alphanumeric_keys
xkb_symbols "san-kagapa" {
- name[Group1] = "Sanskrit (KaGaPa phonetic)";
include "in(hin-kagapa)"
-
+ name[Group1] = "Sanskrit (KaGaPa phonetic)";
};
// Marathi uses Devanagari layout of Hindi
partial alphanumeric_keys
xkb_symbols "mar-kagapa" {
- name[Group1] = "Marathi (KaGaPa phonetic)";
include "in(hin-kagapa)"
-
+ name[Group1] = "Marathi (KaGaPa phonetic)";
};
@@ -1875,13 +1859,12 @@ xkb_symbols "kan-kagapa" {
name[Group1] = "Kannada (KaGaPa phonetic)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
// Roman digits
key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark
key <AE01> { [ 1, exclam, U0CE7 ] };
key <AE02> { [ 2, at, U0CE8, U20A8 ] }; // U20A8: generic rupee sign (Rs)
key <AE03> { [ 3, numbersign, U0CE9 ] };
- key <AE04> { [ 4, dollar, U0CEA, U20B9 ] }; // U20B9: new Indian Rupee sign
+ key <AE04> { [ 4, dollar, U0CEA, U20B9 ] }; // U20B9: new Indian rupee sign
key <AE05> { [ 5, percent, U0CEB ] };
key <AE06> { [ 6, asciicircum, U0CEC, U200C ] }; // ZWNJ
key <AE07> { [ 7, ampersand, U0CED, U200D ] }; // ZWJ
@@ -1919,7 +1902,6 @@ xkb_symbols "kan-kagapa" {
key <AC10> { [ semicolon, colon ] };
key <AC11> { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta
// U201D: Right double quotation mark
-
//Z Row
key <AB01> { [ U0C9E, U0C99 ] }; // Z: nya, nga
key <AB02> { [ U0CB7, U0CBC, U0CDE ] }; // X: ssa, nukta below, LLLA
@@ -1954,13 +1936,12 @@ xkb_symbols "tel-kagapa" {
name[Group1] = "Telugu (KaGaPa phonetic)";
key.type="FOUR_LEVEL";
- //Top Alphanumeric row
// Roman digits
key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark
key <AE01> { [ 1, exclam, U0C67 ] };
key <AE02> { [ 2, at, U0C68, U20A8 ] }; // U20A8: generic rupee sign (Rs)
key <AE03> { [ 3, numbersign, U0C69 ] };
- key <AE04> { [ 4, dollar, U0C6A, U20B9 ] }; // U20B9: new Indian Rupee sign
+ key <AE04> { [ 4, dollar, U0C6A, U20B9 ] }; // U20B9: new Indian rupee sign
key <AE05> { [ 5, percent, U0C6B ] };
key <AE06> { [ 6, asciicircum, U0C6C, U200C ] }; // ZWNJ
key <AE07> { [ 7, ampersand, U0C6D, U200D ] }; // ZWJ
@@ -1998,7 +1979,6 @@ xkb_symbols "tel-kagapa" {
key <AC10> { [ semicolon, colon ] };
key <AC11> { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta
// U201D: Right double quotation mark
-
//Z Row
key <AB01> { [ U0C1E, U0C19 ] }; // Z: nya, nga
key <AB02> { [ U0C37 ] }; // X: ssa
@@ -2026,7 +2006,6 @@ xkb_symbols "eeyek" {
name[Group1]= "Manipuri (Eeyek)";
- // Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ Uabf1, exclam ] };
key <AE02> { [ Uabf2, at ] };
@@ -2078,7 +2057,6 @@ xkb_symbols "eeyek" {
key <AB10> { [ slash, question ] };
key <BKSL> { [ backslash, bar ] };
- // End alphanumeric section
include "level3(ralt_switch)"
};
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/ir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.8
--- xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.7 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/ir Fri Jul 11 19:11:00 2014
@@ -26,7 +26,7 @@ xkb_symbols "pes" {
partial alphanumeric_keys
xkb_symbols "pes_keypad" {
- name[Group1]= "Persian (with Persian Keypad)";
+ name[Group1]= "Persian (with Persian keypad)";
include "ir(pes_part_basic)"
include "ir(pes_part_keypad)"
