Module Name: xsrc Committed By: mrg Date: Tue Apr 27 03:38:48 UTC 2021
Modified Files: xsrc/external/mit/xkeyboard-config/dist: configure xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in at in ir lk pl sy xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: sl-c3x00 ws003sh ws007sh ws011sh ws020sh Log Message: merge xkeyboard-config 2.32, reduce local diffs To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.19 -r1.20 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/at cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xkeyboard-config/dist/symbols/in cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/ir cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/lk cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/pl cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/sy cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh 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.19 xsrc/external/mit/xkeyboard-config/dist/configure:1.20 --- xsrc/external/mit/xkeyboard-config/dist/configure:1.19 Sun Feb 23 11:14:17 2020 +++ xsrc/external/mit/xkeyboard-config/dist/configure Tue Apr 27 03:38:48 2021 @@ -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.29. +# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32. # # # 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.29' -PACKAGE_STRING='xkeyboard-config 2.29' +PACKAGE_VERSION='2.32' +PACKAGE_STRING='xkeyboard-config 2.32' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1309,7 +1309,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.29 to adapt to many kinds of systems. +\`configure' configures xkeyboard-config 2.32 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1380,7 +1380,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkeyboard-config 2.29:";; + short | recursive ) echo "Configuration of xkeyboard-config 2.32:";; esac cat <<\_ACEOF @@ -1497,7 +1497,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkeyboard-config configure 2.29 +xkeyboard-config configure 2.32 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1677,7 +1677,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.29, which was +It was created by xkeyboard-config $as_me 2.32, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2025,7 +2025,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - + # change version in meson.build as well am__api_version='1.16' @@ -2542,7 +2542,7 @@ fi # Define the identity of the package. PACKAGE='xkeyboard-config' - VERSION='2.29' + VERSION='2.32' cat >>confdefs.h <<_ACEOF @@ -7051,7 +7051,10 @@ _ACEOF -ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile" +# needed for out-of-tree builds +ac_config_commands="$ac_config_commands mkdir" + +ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile keycodes/Makefile rules/Makefile symbols/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7631,7 +7634,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.29, which was +This file was extended by xkeyboard-config $as_me 2.32, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7688,7 +7691,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.29 +xkeyboard-config config.status 2.32 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7815,30 +7818,14 @@ do case $ac_config_target in "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "mkdir") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdir" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "compat/Makefile") CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;; "geometry/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/Makefile" ;; - "geometry/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/digital_vndr/Makefile" ;; - "geometry/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/sgi_vndr/Makefile" ;; "keycodes/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/Makefile" ;; - "keycodes/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/digital_vndr/Makefile" ;; - "keycodes/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/sgi_vndr/Makefile" ;; "rules/Makefile") CONFIG_FILES="$CONFIG_FILES rules/Makefile" ;; - "rules/compat/Makefile") CONFIG_FILES="$CONFIG_FILES rules/compat/Makefile" ;; "symbols/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/Makefile" ;; - "symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;; - "symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;; - "symbols/hp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/hp_vndr/Makefile" ;; - "symbols/jolla_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/jolla_vndr/Makefile" ;; - "symbols/macintosh_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/macintosh_vndr/Makefile" ;; - "symbols/nec_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nec_vndr/Makefile" ;; - "symbols/nokia_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nokia_vndr/Makefile" ;; - "symbols/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sgi_vndr/Makefile" ;; - "symbols/sharp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sharp_vndr/Makefile" ;; - "symbols/sony_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sony_vndr/Makefile" ;; - "symbols/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sun_vndr/Makefile" ;; - "symbols/xfree68_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/xfree68_vndr/Makefile" ;; "types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;; "xkeyboard-config.pc") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.pc" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; @@ -8468,7 +8455,9 @@ $as_echo X/"$am_mf" | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } @@ -8480,6 +8469,7 @@ See \`config.log' for more details" "$LI rm -f conftest-deps.mk } ;; + "mkdir":C) $MKDIR_P rules/compat/ ;; esac done # for ac_tag Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.19 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.20 --- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.19 Sun Feb 23 11:14:17 2020 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Tue Apr 27 03:38:48 2021 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: xsrc/external/mit/xkeyboard-config/dist/symbols/at diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.7 --- xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.6 Tue Aug 29 07:46:43 2017 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/at Tue Apr 27 03:38:48 2021 @@ -1,5 +1,3 @@ -// based on a keyboard map from an 'xkb/symbols/de' file - default xkb_symbols "basic" { @@ -23,12 +21,3 @@ xkb_symbols "mac" { name[Group1]= "German (Austria, Macintosh)"; }; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - - include "de(Sundeadkeys)" - - 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.14 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.15 --- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.14 Sat Jun 1 07:11:54 2019 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/in Tue Apr 27 03:38:48 2021 @@ -1,5 +1,7 @@ // This layout includes all Indian layouts, including: -// - Devanagari (Hindi, Marathi, Sanskrit) +// - Hindi +// - Marathi +// - Sanskrit // - Bangla // - Gujarati // - Kannada @@ -25,10 +27,8 @@ // - Ol Chiki: // http://www.unicode.org/L2/L2005/05243r-n2984-ol-chiki.pdf (fig. 9) -// based on a keyboard map from an 'xkb/symbols/dev' file - // Devangari is the default. Kill me if I am wrong:) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "deva" { // March 2004 -- David Holl <smyrph+dev_...@ece.wpi.edu> name[Group1]="Indian"; @@ -42,7 +42,7 @@ xkb_symbols "deva" { // INSCRIPT in place of the symbols that are here for now. But this // requires XKB to map 1 key into two to three other key presses. key <AE03> { [ U0969, numbersign, 3, numbersign ] }; - key <AE04> { [ U096a, dollar, 4 ] }; + key <AE04> { [ U096a, dollar, 4, U20b9 ] }; // Rupee key <AE05> { [ U096b, percent, 5, percent ] }; key <AE06> { [ U096c, asciicircum, 6, asciicircum ] }; key <AE07> { [ U096d, ampersand, 7, ampersand ] }; @@ -93,7 +93,6 @@ xkb_symbols "deva" { // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ): include "nbsp(zwnj3zwj4)" - include "rupeesign(4)" include "level3(ralt_switch)" }; @@ -112,11 +111,11 @@ xkb_symbols "bolnagri" { key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ U0902, U0901, apostrophe, asciitilde ] }; // apostrophe: anusvara, candrabindu + key <TLDE> { [ U0902, U0901, grave, asciitilde ] }; // grave: anusvara, candrabindu key <AE01> { [ 1, exclam, U0967, exclam ] }; key <AE02> { [ 2, at, U0968, at ] }; key <AE03> { [ 3, numbersign, U0969, numbersign ] }; - key <AE04> { [ 4, dollar, U096A ] }; // Rupee symbol on AltGr+4 + key <AE04> { [ 4, dollar, U096A, U20B9 ] }; // Rupee key <AE05> { [ 5, percent, U096B, percent ] }; key <AE06> { [ 6, asciicircum, U096C, asciicircum ] }; key <AE07> { [ 7, ampersand, U096D, ampersand ] }; @@ -172,11 +171,8 @@ xkb_symbols "bolnagri" { // modifier_map Mod3 { Mode_switch }; include "level3(ralt_switch)" - include "rupeesign(4)" }; -// based on a keyboard map from an 'xkb/symbols/ben' file - partial alphanumeric_keys xkb_symbols "ben" { name[Group1]= "Bangla (India)"; @@ -467,7 +463,7 @@ xkb_symbols "ben_inscript" { }; xkb_symbols "ben_gitanjali" { - name[Group1]= "Bangla (India, Uni Gitanjali)"; + name[Group1]= "Bangla (India, Gitanjali)"; key <ESC> { [ Escape ] }; // numbers @@ -855,11 +851,11 @@ xkb_symbols "mal_lalitha" { key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ U0D4D, U0D02, apostrophe, asciitilde ] }; // apostrophe: virama(chandrakala),anusvara + key <TLDE> { [ U0D4D, U0D02, grave, asciitilde ] }; // grave: virama(chandrakala),anusvara key <AE01> { [ 1, exclam, U0D67, exclam ] }; key <AE02> { [ 2, at, U0D68, at ] }; key <AE03> { [ 3, numbersign, U0D69, numbersign ] }; - key <AE04> { [ 4, dollar, U0D6A ] }; + key <AE04> { [ 4, dollar, U0D6A, U20B9 ] }; // Rupee key <AE05> { [ 5, percent, U0D6B, percent ] }; key <AE06> { [ 6, asciicircum, U0D6C, asciicircum ] }; key <AE07> { [ 7, ampersand, U0D6D, ampersand ] }; @@ -914,7 +910,6 @@ xkb_symbols "mal_lalitha" { // modifier_map Control{ Control_L }; // modifier_map Mod3 { Mode_switch }; include "level3(ralt_switch)" - include "rupeesign(4)" }; @@ -1051,8 +1046,7 @@ xkb_symbols "ori" { include "level3(ralt_switch)" }; -// based on a keyboard map from an 'xkb/symbols/tml' file -// INSCRIPT + partial alphanumeric_keys xkb_symbols "tam" { name[Group1]= "Tamil (Inscript)"; @@ -1519,11 +1513,9 @@ xkb_symbols "urd-phonetic3" { partial alphanumeric_keys xkb_symbols "urd-winkeys" { include "pk(urd-nla)" - name[Group1]= "Urdu (Win keys)"; + name[Group1]= "Urdu (Windows)"; }; -// based on a keyboard map from an 'xkb/symbols/gur' file - partial alphanumeric_keys xkb_symbols "guru" { name[Group1]= "Punjabi (Gurmukhi)"; @@ -1604,7 +1596,7 @@ xkb_symbols "jhelum" { key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu + key <TLDE> { [ grave, asciitilde, U0A02,U0A01 ] }; // grave: anusvara, candrabindu key <AE01> { [ 1,exclam, U0A67, exclam ] }; key <AE02> { [ 2,at, U0A68, at ] }; key <AE03> { [ 3,numbersign, U0A69, numbersign ] }; @@ -1671,6 +1663,7 @@ xkb_symbols "olpc" { // Contact: Walter Bender <wal...@laptop.org> include "in(deva)" + key <TLDE> { [ U094A, U0912 ] }; // DEVANAGARI VOWEL SIGN SHORT O; DEVANAGARI LETTER SHORT O key <AE01> { [ U0967, U090D ] }; // DEVANAGARI DIGIT ONE; DEVANAGARI LETTER CANDRA E key <AE02> { [ U0968, U0945 ] }; // DEVANAGARI DIGIT TWO; DEVANAGARI VOWEL SIGN CANDRA E @@ -1727,8 +1720,6 @@ xkb_symbols "olpc" { include "nbsp(zwnj3zwj4)" include "group(olpc)" - include "rupeesign(4)" - include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -1912,11 +1903,11 @@ xkb_symbols "mal_enhanced" { // partial alphanumeric_keys xkb_symbols "hin-kagapa" { - name[Group1] = "Hindi (KaGaPa phonetic)"; + name[Group1] = "Hindi (KaGaPa, phonetic)"; key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark + key <TLDE> { [ grave, 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 ] }; @@ -1978,14 +1969,14 @@ xkb_symbols "hin-kagapa" { partial alphanumeric_keys xkb_symbols "san-kagapa" { include "in(hin-kagapa)" - name[Group1] = "Sanskrit (KaGaPa phonetic)"; + name[Group1] = "Sanskrit (KaGaPa, phonetic)"; }; // Marathi uses Devanagari layout of Hindi partial alphanumeric_keys xkb_symbols "mar-kagapa" { include "in(hin-kagapa)" - name[Group1] = "Marathi (KaGaPa phonetic)"; + name[Group1] = "Marathi (KaGaPa, phonetic)"; }; @@ -2003,11 +1994,11 @@ xkb_symbols "mar-kagapa" { // partial alphanumeric_keys xkb_symbols "kan-kagapa" { - name[Group1] = "Kannada (KaGaPa phonetic)"; + name[Group1] = "Kannada (KaGaPa, phonetic)"; key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark + key <TLDE> { [ grave, 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 ] }; @@ -2080,11 +2071,11 @@ xkb_symbols "kan-kagapa" { // partial alphanumeric_keys xkb_symbols "tel-kagapa" { - name[Group1] = "Telugu (KaGaPa phonetic)"; + name[Group1] = "Telugu (KaGaPa, phonetic)"; key.type="FOUR_LEVEL"; // Roman digits - key <TLDE> { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark + key <TLDE> { [ grave, 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 ] }; @@ -2207,3 +2198,259 @@ xkb_symbols "eeyek" { include "level3(ralt_switch)" }; + +// This layout is developed by Niranjan Tambe in July 2019 +// for typing Indic languages in International Phonetic Alphabet (IPA). +// Contact - niranjanvikasta...@gmail.com + +partial alphanumeric_keys modifier_keys +xkb_symbols "iipa" { + + name[Group1]= "Indic IPA"; + key <AE01> { [ 1, exclam] }; + key <AE02> { [ 2, at] }; + key <AE03> { [ 3, numbersign] }; + key <AE04> { [ 4, U20B9] }; + key <AE05> { [ 5, percent] }; + key <AE06> { [ 6, asciicircum] }; + key <AE07> { [ 7, ampersand] }; + key <AE08> { [ 8, asterisk] }; + key <AE09> { [ 9, parenleft] }; + key <AE10> { [ 0, parenright] }; + key <AE11> { [ minus, underscore] }; + key <AE12> { [ equal, plus] }; + + key <AD01> { [ U02B0, U02B1] }; // [ʰ], [ʱ] + key <AD02> { [ U00E6, q] }; // [æ], [q] found in Urdu + key <AD03> { [ a, U028B] }; // [a], [ʋ] + key <AD04> { [ i, U026A] }; // [i] [ɪ] + key <AD05> { [ u, U026F] }; // [u] [ɯ] found in Tamil + key <AD06> { [ b, Y] }; // [b] + key <AD07> { [ h, U014B] }; // [h], [ŋ] + key <AD08> { [ g, U0263] }; // [g], [ɣ] found in Urdu + key <AD09> { [ d, U00F0] }; // [d], [ð] found in Malayalam + key <AD10> { [ U02A4, U02A3] }; // [ʤ], [ʣ] found in Marathi + key <AD11> { [ U0256, U027D] }; // [ɖ], [ɽ] + key <AD12> { [ bracketleft, bracketright] }; // "[", "]" needed for denoting phonetic symbols + + key <AC01> { [ o, U0254] }; // [o], [ɔ] found in Bangla + key <AC02> { [ e, U025B] }; // [e], [ɛ] + key <AC03> { [ U0259, U0361] }; // [ə], [ ͡ ] + key <AC04> { [ i, U026A] }; // [i], [ɪ] + key <AC05> { [ u, U026F] }; // [u], [ɯ] + key <AC06> { [ p, f] }; // [p], [f] + key <AC07> { [ U027E, r] }; // [ɾ], [r] + key <AC08> { [ k, x] }; // [k], [x] found in Urdu + key <AC09> { [ t, U03B8] }; // [t], [θ] + key <AC10> { [ U02A7, U02A6] }; // [ʧ], [ʦ] found in Marathi + key <AC11> { [ U0288, quotedbl] }; // [ʈ] + key <TLDE> { [ grave, asciitilde] }; + + key <BKSL> { [ backslash, bar] }; + key <AB01> { [ U032A, U0303] }; // [ ̪], [ ̃] Dental mark, nasalisation mark + key <AB02> { [ U0306, X] }; // [ ̆] Short sound + key <AB03> { [ m, U0273] }; // [m], [ɳ] + key <AB04> { [ n, v] }; // [n], [v] + key <AB05> { [ w, z] }; // [w], [z] + key <AB06> { [ l, U026D] }; // [l], [ɭ] + key <AB07> { [ s, U0283] }; // [s], [ʃ] + key <AB08> { [ comma, U0282] }; // [ʂ] + key <AB09> { [ period, U02D0] }; // [ː] Long sound + key <AB10> { [ j, slash] }; // [j] +}; + +// This layout is developed by Niranjan Tambe in July 2019 +// for typing Marathi language with some necessary symbols. +// Contact - niranjanvikasta...@gmail.com + +xkb_symbols "marathi" { + name[Group1]="Marathi (enhanced Inscript)"; + key <TLDE> { [ U0962, U090C, grave, asciitilde ] }; // Added ॢ & ऌ + key <AE01> { [ U0967, exclam, 1, exclam ] }; // Added exclamation mark + key <AE02> { [ U0968, U0945, 2, at ] }; // Added ॅ + key <AE03> { [ U0969, U093D, 3, numbersign ] }; // Added ऽ + key <AE04> { [ U096a, U20B9, 4 ] }; // Added ₹ + key <AE05> { [ U096b, percent, 5, percent ] }; + key <AE06> { [ U096c, asciicircum, 6, asciicircum ] }; + key <AE07> { [ U096d, U0970, 7, ampersand ] }; // Added ॰ + key <AE08> { [ U096e, U0950, 8, asterisk ] }; + key <AE09> { [ U096f, parenleft, 9, parenleft ] }; + key <AE10> { [ U0966, parenright, 0, parenright ] }; + key <AE11> { [ minus, U0903, minus, underscore ] }; + key <AE12> { [ U0943, U090b, U0944, U0960 ] }; + + key <AD01> { [ U094c, U0914 ] }; + key <AD02> { [ U0948, U0910 ] }; + key <AD03> { [ U093e, U0906 ] }; + key <AD04> { [ U0940, U0908, U0963, U0961 ] }; + key <AD05> { [ U0942, U090a ] }; + key <AD06> { [ U092c, U092d ] }; + key <AD07> { [ U0939, U0919 ] }; + key <AD08> { [ U0917, U0918, U095a ] }; + key <AD09> { [ U0926, U0927 ] }; + key <AD10> { [ U091c, U091d, U095b ] }; + key <AD11> { [ U0921, U0922, U095c, U095d ] }; + key <AD12> { [ U093c, U091e ] }; + key <BKSL> { [ U0949, U0911, U005C, U007C ] }; + + key <AC01> { [ U094b, U0913 ] }; + key <AC02> { [ U0947, U090f ] }; + key <AC03> { [ U094d, U0905 ] }; + key <AC04> { [ U093f, U0907, U0962, U090c ] }; + key <AC05> { [ U0941, U0909 ] }; + key <AC06> { [ U092a, U092b, NoSymbol, U095e ] }; + key <AC07> { [ U0930, U0931 ] }; + key <AC08> { [ U0915, U0916, U0958, U0959 ] }; + key <AC09> { [ U0924, U0925 ] }; + key <AC10> { [ U091a, U091b, U0952 ] }; + key <AC11> { [ U091f, U0920, NoSymbol, U0951 ] }; + + key <AB01> { [ apostrophe, U0972, U0953 ] }; // Added apostrophe & ॲ + key <AB02> { [ U0902, U0901, NoSymbol, U0950 ] }; + key <AB03> { [ U092e, U0923, U0954 ] }; + key <AB04> { [ U0928, quotedbl ] }; // Added " + key <AB05> { [ U0935, UA8FB ] }; // Added headstroke + key <AB06> { [ U0932, U0933 ] }; + key <AB07> { [ U0938, U0936 ] }; + key <AB08> { [ comma, U0937, U0970 ] }; + key <AB09> { [ period, U0964, U0965, U093d ] }; + key <AB10> { [ U092f, question, slash, question ] }; +}; +// EXTRAS: +// Vedic and Miscellaneous symbols +// This layout covers 'Extended Devanagari' and 'Vedic Extensions' Unicode blocks. +// This is helpful for including all the required symbols when typing complex texts such as those from Samaveda and Yajurveda. +// This layout only includes signs and symbols. Text needs to be typed seperately. +// Created by : Abhishek Deshpande <abhishekdeshpande...@gmail.com> +// Date : 27th October, 2020 +partial alphanumeric_keys +xkb_symbols "san-misc" { + name[Group1] = "Sanskrit symbols"; + key.type="FOUR_LEVEL"; + + // Roman digits + key <TLDE> { [ U1CD0, UA8FA ] }; + key <AE01> { [ UA8E1, U1CD1 ] }; + key <AE02> { [ UA8E2, UA8F2 ] }; + key <AE03> { [ UA8E3, UA8F3 ] }; + key <AE04> { [ UA8E4, UA8F4 ] }; + key <AE05> { [ UA8E5, UA8F5 ] }; + key <AE06> { [ UA8E6, UA8F6 ] }; + key <AE07> { [ UA8E7, UA8F7 ] }; + key <AE08> { [ UA8E8, UA8F8 ] }; + key <AE09> { [ UA8E9, UA8F9 ] }; + key <AE10> { [ UA8E0, UA8FC ] }; + key <AE11> { [ UA8FB, U1CD2 ] }; + key <AE12> { [ U1CF2, U1CF3 ] }; + key <BKSL> { [ U1CF8, U1CF9 ] }; + + //Q Row + key <AD01> { [ U1CD4, U1CD5 ] }; + key <AD02> { [ U1CD6, U1CD7 ] }; + key <AD03> { [ U1CD8, U1CD9 ] }; + key <AD04> { [ UA8EF ] }; + key <AD05> { [ U1CDA, U1CDB ] }; + key <AD06> { [ UA8FE, UA8FF ] }; + key <AD07> { [ UA8EB ] }; + key <AD08> { [ U1CDC, U1CDD ] }; + key <AD09> { [ U1CDE, U1CDF ] }; + key <AD10> { [ UA8EE ] }; + key <AD11> { [ U1CE0 ] }; + key <AD12> { [ U1CE1 ] }; + + //A Row + key <AC01> { [ UA8EA ] }; + key <AC02> { [ UA8F1 ] }; + key <AC03> { [ U1CE2 ] }; + key <AC04> { [ U1CE3, U1CE4 ] }; + key <AC05> { [ U1CE5, U1CE6 ] }; + key <AC06> { [ U1CE7, U1CE8 ] }; + key <AC07> { [ U1CE9, U1CEA ] }; + key <AC08> { [ UA8EC ] }; + key <AC09> { [ U1CEB, U1CEC ] }; + key <AC10> { [ U1CEE, U1CEF ] }; + key <AC11> { [ U1CF0, U1CF1 ] }; + + //Z Row + key <AB01> { [ U1CED ] }; + key <AB02> { [ U1CF4 ] }; + key <AB03> { [ U1CF5 ] }; + key <AB04> { [ UA8F0 ] }; + key <AB05> { [ U1CF6 ] }; + key <AB06> { [ UA8ED ] }; + key <AB07> { [ U0950, UA8FD ] }; + key <AB08> { [ U1CF7, U093D ] }; + key <AB09> { [ U1CFA, U2638 ] }; + key <AB10> { [ U0FD5, U2740 ] }; + + include "rupeesign(4)" + include "level3(ralt_switch)" +}; +// Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit. It is most commonly used to write Marathi language in Maharashtra. +// This keyboard layout is Based on Marathi KaGaPa phonetic layout. Just the characters which are not applicable in Modi, are ommited. +// +// Created by : Abhishek Deshpande <abhishekdeshpande...@gmail.com> +// Date : 9th February, 2020 +// +partial alphanumeric_keys +xkb_symbols "modi-kagapa" { + name[Group1] = "Modi (KaGaPa phonetic)"; + key.type="FOUR_LEVEL"; + + // Roman digits + key <TLDE> { [ grave, asciitilde, U201C ] }; // U201C: left double quotation mark + key <AE01> { [ 1, exclam, U11651 ] }; + key <AE02> { [ 2, at, U11652, U20A8 ] }; // U20A8: generic rupee sign (Rs) + key <AE03> { [ 3, numbersign, U11653 ] }; + key <AE04> { [ 4, dollar, U11654, U20B9 ] }; // U20B9: new Indian rupee sign + key <AE05> { [ 5, percent, U11655 ] }; + key <AE06> { [ 6, asciicircum, U11656, U200C ] }; // ZWNJ + key <AE07> { [ 7, ampersand, U11657, U200D ] }; // ZWJ + key <AE08> { [ 8, asterisk, U11658 ] }; + key <AE09> { [ 9, parenleft, U11659 ] }; + key <AE10> { [ 0, parenright, U11650, U11643 ] }; // U11643: Modi abbreviation sign + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + key <BKSL> { [ U005C, U007C, U11641, U11642 ] }; // backslash, pipe, Modi danda, Modi double danda + + //Q Row + key <AD01> { [ U11618, U11619 ] }; // Q: retroflex Modi letter Ta, Tha + key <AD02> { [ U1161A, U1161B ] }; // W: retroflex Modi letter Da, Dha + key <AD03> { [ U11639, U1160A, U1160B ] }; // E: Modi vovel sign E, Modi letter E, letter ai + key <AD04> { [ U11628, U11635, U11606 ] }; // R: Modi ra, Modi vowel sign vocalic R, vocalic letter R + key <AD05> { [ U1161D, U1161E ] }; // T: dental Modi letter ta, tha + key <AD06> { [ U11627, U1163A ] }; // Y: Modi letter ya, Modi vowel sign ai + key <AD07> { [ U11633, U11634, U11604, U11605 ] }; // U: Modi vowel sign u, uu, Modi letter u, uu + key <AD08> { [ U11631, U11632, U11602, U11603 ] }; // I: Modi vowel sign i, ii, Modi letter i, ii + key <AD09> { [ U1163B, U1160C ] }; // O: Modi vowel sign o, Modi letter o + key <AD10> { [ U11622, U11623 ] }; // P: Modi letter pa, pha + key <AD11> { [ bracketleft, braceleft ] }; + key <AD12> { [ bracketright, braceright ] }; + + //A Row + key <AC01> { [ U11630, U11601, U11600 ] }; // A: Modi vowel sign aa, Modi letter aa, Modi letter a + key <AC02> { [ U1162D, U1162B ] }; // S: Modi letter sa, sha + key <AC03> { [ U1161F, U11620 ] }; // D: dental Modi letter da, dha + key <AC04> { [ U1163F, U11636, U11607 ] }; // F: Modi sign virama, Modi vowel sign vocalic RR, letter vocalic RR + key <AC05> { [ U11610, U11611 ] }; // G: Modi letter ga, gha + key <AC06> { [ U1162E, U1163E ] }; // H: Modi letter ha, Modi visarga + key <AC07> { [ U11615, U11616 ] }; // J: Modi letter ja, jha + key <AC08> { [ U1160E, U1160F ] }; // K: Modi letter ka, kha + key <AC09> { [ U11629, U1162F, U11637, U11608 ] }; // L: Modi letter la, lla, Modi vowel sign vocalic L, letter vocalic L + key <AC10> { [ semicolon, colon ] }; + key <AC11> { [ apostrophe, quotedbl ] }; + + //Z Row + key <AB01> { [ U11617, U11612 ] }; // Z: Modi letter nya, nga + key <AB02> { [ U1162C, U11609, U11638 ] }; // X: Modi letter ssa, Modi letter vocalic ll, Modi vowel sign vocalic ll + key <AB03> { [ U11613, U11614 ] }; // C: Modi letter ca, cha + key <AB04> { [ U1162A, U1163C, U1160D ] }; // V: Modi letter va, Modi vowel sign au, Modi letter au + key <AB05> { [ U11624, U11625 ] }; // B: Modi letter ba, bha + key <AB06> { [ U11621, U1161C ] }; // N: Modi letter na, nna + key <AB07> { [ U11626, U1163D, U093D, U0950 ] }; // M: Modi ma, Modi anusvara, avagraha, Devanagari OM (Avagraha & OM commonly occur in Marathi texts, so they are mapped here for convenience.) + key <AB08> { [ comma, U003C, U11640, U11644 ] }; // comma: comma, less than, Modi chandrabindu, Modi sign huva + key <AB09> { [ period, U003E ] }; // period: period, greater than + key <AB10> { [ slash, question ] }; + + include "level3(ralt_switch)" +}; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/ir diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.11 --- xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.10 Sun Dec 30 09:17:53 2018 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/ir Tue Apr 27 03:38:48 2021 @@ -12,7 +12,7 @@ // Author: Behnam Esfahbod <beh...@esfahbod.info> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "pes" { name[Group1]= "Persian"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/lk diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.12 --- xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.11 Sun Dec 30 09:17:53 2018 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/lk Tue Apr 27 03:38:48 2021 @@ -28,7 +28,7 @@ // rayanna = r // yayanna = y -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "sin_phonetic" { include "us" Index: xsrc/external/mit/xkeyboard-config/dist/symbols/pl diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.2 Wed Apr 25 18:55:18 2018 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/pl Tue Apr 27 03:38:48 2021 @@ -1,6 +1,4 @@ -// based on a keyboard map from an 'xkb/symbols/pl' file - -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Visualisation and description: http://podziemie.net/xkb/pl @@ -487,6 +485,33 @@ xkb_symbols "colemak" { key <AC07> { [ n, N, nacute, Nacute ] }; key <AC08> { [ e, E, eogonek, Eogonek ] }; key <AC10> { [ o, O, oacute, Oacute ] }; + key <AD01> { [ q, Q, ae, AE ] }; + key <AD02> { [ w, W, dead_circumflex, asciitilde ] }; + key <AD03> { [ f, F, ssharp, 0x1001e9e ] }; + key <AD07> { [ l, L, lstroke, Lstroke ] }; + + include "level3(ralt_switch)" +}; + +// Colemak-DH (ISO), Polish variant, https://colemakmods.github.io/mod-dh/ +// +partial alphanumeric_keys +xkb_symbols "colemak_dh" { + include "us(colemak_dh)" + name[Group1]= "Polish (Colemak-DH)"; + + key <LSGT> { [ z, Z, zabovedot, Zabovedot ] }; + key <AB01> { [ x, X, zacute, Zacute ] }; + key <AB02> { [ c, C, cacute, Cacute ] }; + key <AB05> { [ backslash, bar, bar, brokenbar ] }; + key <AC01> { [ a, A, aogonek, Aogonek ] }; + key <AC03> { [ s, S, sacute, Sacute ] }; + key <AC07> { [ n, N, nacute, Nacute ] }; + key <AC08> { [ e, E, eogonek, Eogonek ] }; + key <AC10> { [ o, O, oacute, Oacute ] }; + key <AD01> { [ q, Q, ae, AE ] }; + key <AD02> { [ w, W, dead_circumflex, asciitilde ] }; + key <AD03> { [ f, F, ssharp, 0x1001e9e ] }; key <AD07> { [ l, L, lstroke, Lstroke ] }; include "level3(ralt_switch)" @@ -538,5 +563,4 @@ xkb_symbols "glagolica" include "kpdl(comma)" include "level3(ralt_switch)" - }; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sy diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.8 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.7 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sy Tue Apr 27 03:38:48 2021 @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "ara(basic)" name[Group1]= "Arabic (Syria)"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00:1.2 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 Tue Apr 27 03:38:48 2021 @@ -1,7 +1,7 @@ -// $NetBSD: sl-c3x00,v 1.2 2014/03/17 08:35:48 mrg Exp $ +// $NetBSD: sl-c3x00,v 1.3 2021/04/27 03:38:48 mrg Exp $ // $OpenBSD: zaurus,v 1.2 2008/03/05 17:24:55 matthieu Exp $ -partial default alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp SL-C3x00"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh:1.2 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh Tue Apr 27 03:38:48 2021 @@ -1,6 +1,6 @@ -// $NetBSD: ws003sh,v 1.2 2014/03/17 08:35:48 mrg Exp $ +// $NetBSD: ws003sh,v 1.3 2021/04/27 03:38:48 mrg Exp $ -partial default alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS003SH"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh:1.2 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh Tue Apr 27 03:38:48 2021 @@ -1,6 +1,6 @@ -// $NetBSD: ws007sh,v 1.2 2014/03/17 08:35:48 mrg Exp $ +// $NetBSD: ws007sh,v 1.3 2021/04/27 03:38:48 mrg Exp $ -partial default alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS007SH"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh:1.2 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh Tue Apr 27 03:38:48 2021 @@ -1,6 +1,6 @@ -// $NetBSD: ws020sh,v 1.2 2014/03/17 08:35:48 mrg Exp $ +// $NetBSD: ws020sh,v 1.3 2021/04/27 03:38:48 mrg Exp $ -partial default alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS020SH"; Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.4 --- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.3 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh Tue Apr 27 03:38:48 2021 @@ -1,6 +1,6 @@ -// $NetBSD: ws011sh,v 1.3 2014/03/17 08:35:48 mrg Exp $ +// $NetBSD: ws011sh,v 1.4 2021/04/27 03:38:48 mrg Exp $ -partial default alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS011SH";