From 1ed07957f4a92d0fb91b358d071b920a952b56e2 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 May 2010 14:04:47 +0000 Subject: xkeyboard-config git update 7/5/2010 --- xorg-server/xkbdata.src/Makefile.am | 36 +++-- xorg-server/xkbdata.src/configure.in | 195 +++++++++++++------------ xorg-server/xkbdata.src/rules/base.xml.in | 17 +++ xorg-server/xkbdata.src/symbols/Makefile.am | 6 +- xorg-server/xkbdata.src/symbols/ara | 14 +- xorg-server/xkbdata.src/symbols/bw | 19 +++ xorg-server/xkbdata.src/symbols/ke | 37 ++++- xorg-server/xkbdata.src/xkeyboard-config.pc.in | 8 + 8 files changed, 207 insertions(+), 125 deletions(-) create mode 100644 xorg-server/xkbdata.src/symbols/bw create mode 100644 xorg-server/xkbdata.src/xkeyboard-config.pc.in (limited to 'xorg-server') diff --git a/xorg-server/xkbdata.src/Makefile.am b/xorg-server/xkbdata.src/Makefile.am index 48cdf4413..e98117e8e 100644 --- a/xorg-server/xkbdata.src/Makefile.am +++ b/xorg-server/xkbdata.src/Makefile.am @@ -1,16 +1,20 @@ -AUTOMAKE_OPTIONS = foreign - -SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs - -EXTRA_DIST=config.rpath COPYING CREDITS README \ - autogen.sh \ - xkeyboard-config.spec \ - xkeyboard-config.spec.in \ - intltool-extract.in intltool-merge.in intltool-update.in - -DISTCLEANFILES=intltool-extract intltool-merge intltool-update - -# ACLOCAL_AMFLAGS = -I m4 - -sync-po: - rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po +AUTOMAKE_OPTIONS = foreign + +SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs + +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = xkeyboard-config.pc + +EXTRA_DIST=config.rpath COPYING CREDITS README \ + autogen.sh \ + xkeyboard-config.pc.in \ + xkeyboard-config.spec \ + xkeyboard-config.spec.in \ + intltool-extract.in intltool-merge.in intltool-update.in + +DISTCLEANFILES=intltool-extract intltool-merge intltool-update + +# ACLOCAL_AMFLAGS = -I m4 + +sync-po: + rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkbdata.src/configure.in index ea1df8c4d..62a7fd00d 100644 --- a/xorg-server/xkbdata.src/configure.in +++ b/xorg-server/xkbdata.src/configure.in @@ -1,97 +1,98 @@ -AC_INIT(xkeyboard-config, 1.8) -AC_CONFIG_SRCDIR(rules/base.xml.in) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE - -AC_SUBST(VERSION) - -AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found]) -if test x$XKBCOMP = xnot_found ; then - AC_ERROR([xkbcomp is required to install the xkb data files]) -fi - -AC_ARG_WITH( xkb_base, - [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])], - xkb_base="$withval", - xkb_base="\$(datadir)/X11/xkb" ) - -AC_ARG_WITH( xkb_rules_symlink, - [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], - xkb_rules_symlink="$withval" ) - -AC_ARG_ENABLE( compat_rules, - [ --enable-compat-rules create compatibility rules], - enable_compat_rules="$enableval", - enable_compat_rules="yes" ) - -AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x") - -AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes") - -# **** -# i18n -# **** -AC_PROG_INTLTOOL(0.30) - -GETTEXT_PACKAGE=xkeyboard-config -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) - -AM_GLIB_GNU_GETTEXT - -ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt nb nl ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW" - -AC_SUBST(xkb_base) -AC_SUBST(xkb_rules_symlink) - -AC_OUTPUT([ 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 -keymap/Makefile -keymap/digital_vndr/Makefile -keymap/sgi_vndr/Makefile -keymap/sun_vndr/Makefile -semantics/Makefile -rules/Makefile -rules/bin/Makefile -rules/compat/Makefile -rules/extras/Makefile -symbols/Makefile -symbols/digital_vndr/Makefile -symbols/fujitsu_vndr/Makefile -symbols/hp_vndr/Makefile -symbols/macintosh_vndr/Makefile -symbols/nec_vndr/Makefile -symbols/nokia_vndr/Makefile -symbols/sgi_vndr/Makefile -symbols/sony_vndr/Makefile -symbols/sun_vndr/Makefile -symbols/xfree68_vndr/Makefile -symbols/extras/Makefile -types/Makefile -xkeyboard-config.spec -docs/Makefile -]) - -echo '***********************************************************' -echo " $PACKAGE_NAME is configured with the following parameters:" -echo " XKB base directory: $xkb_base" -if test -z "$xkb_rules_symlink" ; then - echo " Symbolic link(s) to legacy rules are not created" -else - echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" -fi - -if test "$enable_compat_rules" = "yes" ; then - echo " Compatibility rules are included" -else - echo " Compatibility rules are not included" -fi -echo '***********************************************************' - +AC_INIT(xkeyboard-config, 1.8) +AC_CONFIG_SRCDIR(rules/base.xml.in) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +AC_SUBST(VERSION) + +AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found]) +if test x$XKBCOMP = xnot_found ; then + AC_ERROR([xkbcomp is required to install the xkb data files]) +fi + +AC_ARG_WITH( xkb_base, + [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])], + xkb_base="$withval", + xkb_base="${datadir}/X11/xkb" ) + +AC_ARG_WITH( xkb_rules_symlink, + [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], + xkb_rules_symlink="$withval" ) + +AC_ARG_ENABLE( compat_rules, + [ --enable-compat-rules create compatibility rules], + enable_compat_rules="$enableval", + enable_compat_rules="yes" ) + +AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x") + +AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes") + +# **** +# i18n +# **** +AC_PROG_INTLTOOL(0.30) + +GETTEXT_PACKAGE=xkeyboard-config +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) + +AM_GLIB_GNU_GETTEXT + +ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt nb nl ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW" + +AC_SUBST(xkb_base) +AC_SUBST(xkb_rules_symlink) + +AC_OUTPUT([ 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 +keymap/Makefile +keymap/digital_vndr/Makefile +keymap/sgi_vndr/Makefile +keymap/sun_vndr/Makefile +semantics/Makefile +rules/Makefile +rules/bin/Makefile +rules/compat/Makefile +rules/extras/Makefile +symbols/Makefile +symbols/digital_vndr/Makefile +symbols/fujitsu_vndr/Makefile +symbols/hp_vndr/Makefile +symbols/macintosh_vndr/Makefile +symbols/nec_vndr/Makefile +symbols/nokia_vndr/Makefile +symbols/sgi_vndr/Makefile +symbols/sony_vndr/Makefile +symbols/sun_vndr/Makefile +symbols/xfree68_vndr/Makefile +symbols/extras/Makefile +types/Makefile +xkeyboard-config.pc +xkeyboard-config.spec +docs/Makefile +]) + +echo '***********************************************************' +echo " $PACKAGE_NAME is configured with the following parameters:" +echo " XKB base directory: $xkb_base" +if test -z "$xkb_rules_symlink" ; then + echo " Symbolic link(s) to legacy rules are not created" +else + echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" +fi + +if test "$enable_compat_rules" = "yes" ; then + echo " Compatibility rules are included" +else + echo " Compatibility rules are not included" +fi +echo '***********************************************************' + diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index 3a2cfe251..969906b81 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -4437,6 +4437,23 @@ <_description>Kenya swa + + + + kik + <_description>Kikuyu + kik + + + + + + + bw + <_shortDescription>Bwa + <_description>Botswana + tsn + diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am index c9fcd4bb5..fc618a4b9 100644 --- a/xorg-server/xkbdata.src/symbols/Makefile.am +++ b/xorg-server/xkbdata.src/symbols/Makefile.am @@ -4,9 +4,9 @@ symbolsdir = $(xkb_base)/symbols dist_symbols_DATA = \ ad af al \ am ara az \ -be bd \ -bg br ba \ -bt by brai \ +ba bd be \ +bg br brai \ +bt bw by \ ca cd \ ch cn cz \ de dk \ diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara index 9fa40e981..90a584475 100644 --- a/xorg-server/xkbdata.src/symbols/ara +++ b/xorg-server/xkbdata.src/symbols/ara @@ -31,30 +31,30 @@ xkb_symbols "basic" { key { [ Arabic_sad, Arabic_fathatan ] }; key { [ Arabic_theh, Arabic_damma ] }; key { [ Arabic_qaf, Arabic_dammatan ] }; - key { [ Arabic_feh, 0x100fef9 ] }; + key { [ Arabic_feh, 0x100fef9, 0x10006a4 ] }; key { [ Arabic_ghain, Arabic_hamzaunderalef ] }; key { [ Arabic_ain, grave ] }; key { [ Arabic_ha, division ] }; key { [ Arabic_khah, multiply ] }; key { [ Arabic_hah, Arabic_semicolon ] }; - key { [ Arabic_jeem, less ] }; + key { [ Arabic_jeem, less, 0x1000686 ] }; key { [ Arabic_dal, greater ] }; key { [ Arabic_sheen, Arabic_kasra ] }; key { [ Arabic_seen, Arabic_kasratan ] }; key { [ Arabic_yeh, bracketright ] }; - key { [ Arabic_beh, bracketleft ] }; + key { [ Arabic_beh, bracketleft, 0x100067e ] }; key { [ Arabic_lam, 0x100fef7 ] }; key { [ Arabic_alef, Arabic_hamzaonalef ] }; key { [ Arabic_teh, Arabic_tatweel ] }; key { [ Arabic_noon, Arabic_comma ] }; key { [ Arabic_meem, slash ] }; - key { [ Arabic_kaf, colon ] }; + key { [ Arabic_kaf, colon, 0x10006af ] }; key { [ Arabic_tah, quotedbl ] }; key { [ bar, brokenbar ] }; - key { [Arabic_hamzaonyeh, asciitilde ] }; - key { [ Arabic_hamza, Arabic_sukun ] }; + key { [Arabic_hamzaonyeh, asciitilde, guillemotright ] }; + key { [ Arabic_hamza, Arabic_sukun, guillemotleft ] }; key { [Arabic_hamzaonwaw, braceright ] }; key { [ Arabic_ra, braceleft ] }; key { [ 0x100fefb, 0x100fef5 ] }; @@ -64,6 +64,8 @@ xkb_symbols "basic" { key { [ Arabic_zain, period ] }; key { [ Arabic_zah, Arabic_question_mark ] }; + include "level3(ralt_switch)" + // End alphanumeric section }; diff --git a/xorg-server/xkbdata.src/symbols/bw b/xorg-server/xkbdata.src/symbols/bw new file mode 100644 index 000000000..ea5079e5d --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/bw @@ -0,0 +1,19 @@ +partial default alphanumeric_keys +xkb_symbols "tswana" { + + include "us" + + name[Group1]= "Botswana"; + + key { [ semicolon, colon, 0x01000324, 0x01000324 ] }; //COMBINING DIAERESIS BELOW + key { [apostrophe, quotedbl, 0x01000301, 0x01000308 ] }; //COMBINING ACUTE ACCENT, COMBINING DIAERESIS + key { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; //COMBINING GRAVE ACCENT, COMBINING TILDE + key { [ 6, asciicircum, 0x01000302 ] }; //COMBINING CIRCUMFLEX ACCENT + key { [ 8, asterisk, 0x01000307, 0x01000323 ] }; //COMBINING DOT ABOVE, COMBINING DOT BELOW + key { [ 9, parenleft, 0x01000306 ] }; //COMBINING BREVE + key { [ 0, parenright, 0x0100030c ] }; //COMBINING CARON + key { [ minus, underscore, 0x01000304, 0x01000331 ] }; //COMBINING MACRON,COMBINING MACRON BELOW + + include "level3(ralt_switch)" +}; + diff --git a/xorg-server/xkbdata.src/symbols/ke b/xorg-server/xkbdata.src/symbols/ke index 71629b0c4..5ec174b7e 100644 --- a/xorg-server/xkbdata.src/symbols/ke +++ b/xorg-server/xkbdata.src/symbols/ke @@ -5,9 +5,40 @@ // Please notify any corrections or omissions to // Kevin Donnelly (kevin@dotmon.com) -partial default alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "swa" { - include "tz(swa)" - name[Group1]= "Kenya"; + include "us" + + name[Group1]= "Kenya"; + + key { [ semicolon, colon, 0x01000324, 0x01000324 ] }; //COMBINING DIAERESIS BELOW + key { [apostrophe, quotedbl, 0x01000301, 0x01000308 ] }; //COMBINING ACUTE ACCENT, COMBINING DIAERESIS + key { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; //COMBINING GRAVE ACCENT, COMBINING TILDE + key { [ 6, asciicircum, 0x01000302 ] }; //COMBINING CIRCUMFLEX ACCENT + key { [ 8, asterisk, 0x01000307, 0x01000323 ] }; //COMBINING DOT ABOVE, COMBINING DOT BELOW + key { [ 9, parenleft, 0x01000306 ] }; //COMBINING BREVE + key { [ 0, parenright, 0x0100030c ] }; //COMBINING CARON + key { [ minus, underscore, 0x01000304, 0x01000331 ] }; //COMBINING MACRON,COMBINING MACRON BELOW + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "kik" { + + include "us" + + name[Group1]= "Kenya - Kikuyu"; + + key { [ semicolon, colon, 0x01000324, 0x01000324 ] }; //COMBINING DIAERESIS BELOW + key { [apostrophe, quotedbl, 0x01000301, 0x01000308 ] }; //COMBINING ACUTE ACCENT, COMBINING DIAERESIS + key { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; //COMBINING GRAVE ACCENT, COMBINING TILDE + key { [ 6, asciicircum, 0x01000302 ] }; //COMBINING CIRCUMFLEX ACCENT + key { [ 8, asterisk, 0x01000307, 0x01000323 ] }; //COMBINING DOT ABOVE, COMBINING DOT BELOW + key { [ 9, parenleft, 0x01000306 ] }; //COMBINING BREVE + key { [ 0, parenright, 0x0100030c ] }; //COMBINING CARON + key { [ minus, underscore, 0x01000304, 0x01000331 ] }; //COMBINING MACRON,COMBINING MACRON BELOW + + include "level3(ralt_switch)" }; diff --git a/xorg-server/xkbdata.src/xkeyboard-config.pc.in b/xorg-server/xkbdata.src/xkeyboard-config.pc.in new file mode 100644 index 000000000..d44ba1482 --- /dev/null +++ b/xorg-server/xkbdata.src/xkeyboard-config.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=@datadir@ +xkb_base=@xkb_base@ + +Name: XKeyboardConfig +Description: X Keyboard configuration data +Version: @VERSION@ -- cgit v1.2.3