AUTHORS | 5
ChangeLog | 471 +++++++++++++
configure.ac | 10
cpprules.in | 2
debian/changelog | 65 +
debian/control | 8
debian/libx11-6.symbols | 10
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 19
debian/patches/015_russian_locale_alias.diff | 8
debian/rules | 24
docbook.am | 2
man/IsCursorKey.man | 1
man/XChangeKeyboardControl.man | 4
man/XChangeKeyboardMapping.man | 1
man/XLookupKeysym.man | 2
man/XStringToKeysym.man | 1
modules/im/ximcp/imLcFlt.c | 52 +
nls/Makefile.am | 6
nls/en_US.UTF-8/Compose.pre | 620 +++++++++++++++++
nls/fi_FI.UTF-8/Compose.pre | 4
nls/pt_BR.UTF-8/Compose.pre | 8
specs/XIM/xim.xml | 420 ++++++------
specs/XKB/acknowledgement.xml | 14
specs/XKB/ch01.xml | 17
specs/XKB/ch02.xml | 104 +-
specs/XKB/ch04.xml | 110 +--
specs/XKB/ch05.xml | 150 ++--
specs/XKB/ch06.xml | 87 +-
specs/XKB/ch07.xml | 13
specs/XKB/ch08.xml | 255 +++----
specs/XKB/ch09.xml | 174 ++--
specs/XKB/ch10.xml | 727 ++++++++++----------
specs/XKB/ch11.xml | 58 -
specs/XKB/ch12.xml | 107 +--
specs/XKB/ch13.xml | 625 +++++++++--------
specs/XKB/ch14.xml | 207 +++--
specs/XKB/ch15.xml | 346 +++++----
specs/XKB/ch16.xml | 735 +++++++++++----------
specs/XKB/ch17.xml | 194 +++--
specs/XKB/ch18.xml | 175 ++---
specs/XKB/ch19.xml | 19
specs/XKB/ch20.xml | 184 ++---
specs/XKB/ch21.xml | 232 +++---
specs/XKB/ch22.xml | 38 -
specs/i18n/framework/framework.xml | 165 ++--
specs/i18n/localedb/localedb.xml | 159 ++--
specs/i18n/trans/trans.xml | 403 +++++------
specs/libX11/AppA.xml | 26
specs/libX11/AppC.xml | 97 +-
specs/libX11/AppD.xml | 4
specs/libX11/CH01.xml | 5
specs/libX11/CH03.xml | 42 -
specs/libX11/CH04.xml | 6
specs/libX11/CH06.xml | 24
specs/libX11/CH07.xml | 63 -
specs/libX11/CH08.xml | 4
specs/libX11/CH09.xml | 3
specs/libX11/CH10.xml | 89 +-
specs/libX11/CH11.xml | 15
specs/libX11/CH12.xml | 9
specs/libX11/CH13.xml | 234 +++---
specs/libX11/CH14.xml | 33
specs/libX11/credits.xml | 10
specs/libX11/glossary.xml | 4
src/FSWrap.c | 2
src/OpenDis.c | 19
src/QuColors.c | 32
src/UIThrStubs.c | 4
src/XlibInt.c | 2
src/Xrm.c | 2
src/Xxcbint.h | 3
src/locking.c | 2
src/util/makekeys.c | 2
src/xcb_io.c | 4
src/xlibi18n/imKStoUCS.c | 2
75 files changed, 4688 insertions(+), 3095 deletions(-)
New commits:
commit b6e23dafb254eacfefe0e20520c2498380489904
Author: Bryce Harrington <br...@canonical.com>
Date: Thu Feb 28 14:40:34 2013 -0800
Patch from Wookey to update symbols to build for arm64.
diff --git a/debian/changelog b/debian/changelog
index 3896bfc..fd24e47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libx11 (2:1.5.0-1ubuntu1) raring; urgency=low
+
+ * Update symbols file for arm64
+ (LP: #1129389)
+
+ -- Wookey <woo...@linaro.org> Mon, 18 Feb 2013 18:52:21 +0000
+
libx11 (2:1.5.0-1) unstable; urgency=low
* New upstream release. Visible changes:
@@ -32,6 +39,14 @@ libx11 (2:1.4.99.901-1) unstable; urgency=low
-- Julien Cristau <jcris...@debian.org> Thu, 19 Apr 2012 22:58:30 +0200
+libx11 (2:1.4.99.1-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ * Refreshed 006_tailor_pt_BR.UTF-8_Compose.diff
+ * Add _XGetRequest to symbols
+
+ -- Chase Douglas <chase.doug...@ubuntu.com> Wed, 21 Dec 2011 18:20:16 -0800
+
libx11 (2:1.4.99.1-1) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 3a7dd77..6878042 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: libx11
Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols
index c3e4186..f6365ad 100644
--- a/debian/libx11-6.symbols
+++ b/debian/libx11-6.symbols
@@ -791,7 +791,7 @@ libX11.so.6 libx11-6 #MINVER#
_XCopyEventCookie@Base 2:1.2.99.901
(optional)_XCopyToArg@Base 0 1
_XCreateMutex_fn@Base 0
- (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_XData32@Base 0
+ (arch=arm64 alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_XData32@Base 0
_XDefaultError@Base 0
_XDefaultIOError@Base 0
(optional)_XDefaultOpenIM@Base 0 1
@@ -853,7 +853,7 @@ libX11.so.6 libx11-6 #MINVER#
_XProcessInternalConnection@Base 0
_XProcessWindowAttributes@Base 0
_XPutBackEvent@Base 0
- (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_XRead32@Base 0
+ (arch=arm64 alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_XRead32@Base 0
_XRead@Base 0
_XReadEvents@Base 0
_XReadPad@Base 0
@@ -1101,9 +1101,9 @@ libX11.so.6 libx11-6 #MINVER#
(optional)_XkbInternAtomFunc@Base 0 1
(optional)_XkbNoteCoreMapChanges@Base 0 1
(optional)_XkbPeekAtReadBuffer@Base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbReadBufferCopy32@Base 0 1
+ (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbReadBufferCopy32@Base 0 1
(optional)_XkbReadBufferCopyKeySyms@Base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbReadCopyData32@Base 0 1
+ (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbReadCopyData32@Base 0 1
(optional)_XkbReadCopyKeySyms@Base 0 1
(optional)_XkbReadGetCompatMapReply@Base 0 1
(optional)_XkbReadGetGeometryReply@Base 0 1
@@ -1112,7 +1112,7 @@ libX11.so.6 libx11-6 #MINVER#
(optional)_XkbReadGetNamesReply@Base 0 1
(optional)_XkbReloadDpy@Base 0 1
(optional)_XkbSkipReadBufferData@Base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbWriteCopyData32@Base 0 1
+ (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 s390x
sparc64)_XkbWriteCopyData32@Base 0 1
(optional)_XkbWriteCopyKeySyms@Base 0 1
(optional)_XkeyTable@Base 0 1
(optional)_XlcAddCT@Base 0 1
commit 676eac155351755e9e05d766ed4bb523e5ca42a5
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Jun 16 20:32:54 2012 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 03bc159..3896bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.5.0-1) UNRELEASED; urgency=low
+libx11 (2:1.5.0-1) unstable; urgency=low
* New upstream release. Visible changes:
- Add APL support, yay!
@@ -7,7 +7,7 @@ libx11 (2:1.5.0-1) UNRELEASED; urgency=low
* Drop patch, fixed upstream:
- 001-configure-check-if-issetugid-is-declared.diff
- -- Cyril Brulebois <k...@debian.org> Sat, 16 Jun 2012 20:22:45 +0000
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Jun 2012 20:32:52 +0000
libx11 (2:1.4.99.901-2) unstable; urgency=low
commit e63aef2d25c9e5993873a1494c6edc391409f1bf
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Jun 16 20:32:43 2012 +0000
Document user-visible changes.
diff --git a/debian/changelog b/debian/changelog
index 3a8d391..03bc159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
libx11 (2:1.5.0-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release. Visible changes:
+ - Add APL support, yay!
+ - A few duplicated Compose sequences were tweaked or removed. Affected
+ characters are: Ã / µ / Ñ / ñ / ¹ / ² / ³ / Ó / ó / Ǻ / ǻ.
* Drop patch, fixed upstream:
- 001-configure-check-if-issetugid-is-declared.diff
commit 0f8d020f458861e6906d7de4c9d536de30f4394a
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Jun 16 20:25:16 2012 +0000
Drop patch, fixed upstream:
001-configure-check-if-issetugid-is-declared.diff
diff --git a/debian/changelog b/debian/changelog
index 669fbfd..3a8d391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libx11 (2:1.5.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop patch, fixed upstream:
+ - 001-configure-check-if-issetugid-is-declared.diff
-- Cyril Brulebois <k...@debian.org> Sat, 16 Jun 2012 20:22:45 +0000
diff --git a/debian/patches/001-configure-check-if-issetugid-is-declared.diff
b/debian/patches/001-configure-check-if-issetugid-is-declared.diff
deleted file mode 100644
index cc05bf4..0000000
--- a/debian/patches/001-configure-check-if-issetugid-is-declared.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From d595779341387bf7c867ac28811883a3b8fe6e88 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcris...@debian.org>
-Date: Sun, 29 Apr 2012 16:27:52 +0200
-Subject: [PATCH libX11] configure: check if issetugid is declared
-
-GNU/kFreeBSD has issetugid in libc (for legacy apps?), but doesn't
-declare it anywhere, causing gcc to error out with
--Werror=implicit-function-declaration. Use AC_CHECK_DECL in addition to
-AC_CHECK_FUNC so we disable this code instead of failing to build it.
-
-Debian bug#669670 <http://bugs.debian.org/669670>
-
-Signed-off-by: Julien Cristau <jcris...@debian.org>
----
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aaec968..c91234f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -223,8 +223,9 @@ AC_CHECK_HEADERS([sys/select.h])
- AC_CHECK_FUNCS([strtol seteuid])
- # Used in lcFile.c (see also --enable-xlocaledir settings below)
- XLOCALEDIR_IS_SAFE="no"
--AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
-- AC_DEFINE(HASSETUGID,1,[Has issetugid() function]))
-+AC_CHECK_DECL([issetugid],
-+ AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
-+ AC_DEFINE(HASSETUGID,1,[Has issetugid() function])))
- AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]
- AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))
- # Used in Font.c
---
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index cd291f9..f20e030 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-001-configure-check-if-issetugid-is-declared.diff
003_recognize_glibc_2.3.2_locale_names.diff
006_tailor_pt_BR.UTF-8_Compose.diff
007_iso8859-15_Compose_fix.diff
commit d57b350aacd182b0e7f8779a57c14ff88218462d
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Jun 16 20:23:06 2012 +0000
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 09a519a..4e2cda9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,178 @@
+commit 6c5cb2a90a6479f56855e5167039c37c234cdfe7
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Jun 1 23:37:09 2012 -0700
+
+ libX11 1.5.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 05c587ec3be880721131a17c1dd4366e458fdd8b
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat May 26 14:37:28 2012 -0700
+
+ libX11 1.4.99.902 (1.5 RC2)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit d817834d9772e3500d5102e2eae868b04a33c31f
+Author: Pander <pan...@users.sourceforge.net>
+Date: Sat May 5 19:02:10 2012 +0200
+
+ Compose: Reassigned squences with minus and a or o
+
+ Reassigned squences with minus and a or o (vice versa and lower and
+ upper case) to conform existing series and not resulting in tilde.
+ Also added noe missing underscore sequence.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 6bfd1dca6e7cb2046ee6bf9dbbddc0af5ef7cc00
+Author: Pander <pan...@users.sourceforge.net>
+Date: Sat May 5 16:56:05 2012 +0200
+
+ Compose: Removed <slash> <U> and vice versa
+
+ Combination with lower case u suffices
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3a8b1637132d1e36eb5e11f52dfb284081772d14
+Author: Pander <pan...@users.sourceforge.net>
+Date: Sat May 5 16:44:31 2012 +0200
+
+ Compose: Removed <n> <minus> for n with tilde, also vice versa & for upper
case
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit fd514d7a35119dd4413b51c84f2a536f2ca501a6
+Author: Pander <pan...@users.sourceforge.net>
+Date: Sat May 5 16:40:20 2012 +0200
+
+ Compose: Removed <S> in combination with a numeral for superscript
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 1b5cad3ca54410c4edbca79c23c463e9e088bc0d
+Author: Pander <pan...@users.sourceforge.net>
+Date: Sat May 5 16:28:01 2012 +0200
+
+ Compose: Reassigned <o> <apostrophe> to oacute, also for upper case.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0bbc0d5e605e2a4a3eb00a229b651d4546e8aef4
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu May 10 12:27:28 2012 -0400
+
+ Remove duplicate compose sequences from commit e51e37c118ae.
+
+ The compose-check script only handles compiled Compose files, not
+ the Compose.pre files. One must remember to use:
+
+ ./autogen.sh; make; make check
+
+ when reviewing patches to the Compose.pre files....
+
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
+
+commit e51e37c118ae6cb9ced8244ce1c410677e0279ce
+Author: Geoff Streeter <ge...@dyalog.com>
+Date: Thu Mar 22 15:02:00 2012 +0000
+
+ Add APL support to compose
+
+ Signed-off-by: Geoff Streeter <ge...@dyalog.com>
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
+
+commit dac90324cee224df977a428afe80d960dceca769
+Author: Julien Cristau <jcris...@debian.org>
+Date: Sat May 5 16:05:07 2012 +0200
+
+ configure: make previous change work with older autoconf
+
+ autoconf 2.63 doesn't seem to like the nested AC_CHECK_DECL/FUNC. So do
+ the tests separately.
+
+ Reported-by: Dave Airlie
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+
+commit f5b50af4324186962e258ffe9be78d5ee4681982
+Author: Julien Cristau <jcris...@debian.org>
+Date: Sun Apr 29 16:43:09 2012 +0200
+
+ configure: check if issetugid is declared
+
+ GNU/kFreeBSD has issetugid in libc (for legacy apps?), but doesn't
+ declare it anywhere, causing gcc to error out with
+ -Werror=implicit-function-declaration. Use AC_CHECK_DECL in addition to
+ AC_CHECK_FUNC so we disable this code instead of failing to build it.
+
+ Debian bug#669670 <http://bugs.debian.org/669670>
+
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 52e1b5cc3b6de76ccf4285b55652474a522ed9a8
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Apr 30 16:36:47 2012 +1000
+
+ Typo fix
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit b64969f0e510d5d3300cf968741a3726a6409577
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Apr 17 18:12:02 2012 -0700
+
+ Add X11R7 sections to the libX11 & XKBlib credits to cover Docbook
conversion
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 9ea611696f317ac3b3fb67893f1d6d87d49e3b5e
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Apr 17 18:01:36 2012 -0700
+
+ Add olinks from libX11 & localedb specs to ICCCM spec
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b3c1b8cdab7d14220426c9b997ac362dc16318fc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Apr 17 17:49:44 2012 -0700
+
+ Add olinks from libX11 spec to ICCCM spec
+
+ Also convert ICCCM title mentions from <emphasis> to <citetitle>
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit ebebb65e753007ad01966dccc90bd6ca9a826488
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Apr 14 23:40:01 2012 -0700
+
+ libX11 AppC: Fix section headers that didn't translate from nroff properly
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit d5ab4ae0e74ae1fb30fb72add0751effe2759bf2
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Apr 14 23:13:05 2012 -0700
+
+ Add olinks from libX11 spec to x11protocol spec
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 83878a0e34fffd255597300dd3e6cd43fcd645b0
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Apr 14 22:28:53 2012 -0700
+
+ libX11 spec: Remove .br nroff macro left behind in XGetWindowProperty
prototype
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit abc523fce31fcf2687229697a8eb656e343ecb0c
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Mar 15 22:14:45 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index 830c5b3..669fbfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libx11 (2:1.5.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 16 Jun 2012 20:22:45 +0000
+
libx11 (2:1.4.99.901-2) unstable; urgency=low
* Add AC_CHECK_DECL(issetugid) to fix FTBFS on kfreebsd (closes: #669670).
commit 6c5cb2a90a6479f56855e5167039c37c234cdfe7
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Jun 1 23:37:09 2012 -0700
libX11 1.5.0
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/AUTHORS b/AUTHORS
index 5b621ef..58a3acc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,11 @@ Marineau, Holger Veit, Bruno Haible, Keith Packard, Bob
Scheifler,
Takashi Fujiwara, Kazunori Nishihara, Hideki Hiura, Hiroyuki Miyamoto,
Katsuhisi Yano, Shigeru Yamada, Stephen Gildea, Li Yuhong, Seiji Kuwari.
+The specifications and documentation contain extensive credits.
+Conversion of those documents from troff to DocBook/XML was performed
+by Matt Dew, with assistance in editing & formatting tool setup from
+Gaetan Nadon and Alan Coopersmith.
+
This work was supported by many organizations (in no particular
order), including the X Consortium, Digital Equipment Corporation,
Tektronix, The Open Group, OMRON, Wyse Technology, Fujitsu Limited,
diff --git a/configure.ac b/configure.ac
index feb2e38..48a0c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.99.902],
+AC_INIT([libX11], [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit 05c587ec3be880721131a17c1dd4366e458fdd8b
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat May 26 14:37:28 2012 -0700
libX11 1.4.99.902 (1.5 RC2)
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index af0f34e..feb2e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.99.901],
+AC_INIT([libX11], [1.4.99.902],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit d817834d9772e3500d5102e2eae868b04a33c31f
Author: Pander <pan...@users.sourceforge.net>
Date: Sat May 5 19:02:10 2012 +0200
Compose: Reassigned squences with minus and a or o
Reassigned squences with minus and a or o (vice versa and lower and
upper case) to conform existing series and not resulting in tilde.
Also added noe missing underscore sequence.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 4b29659..bf6599a 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -567,8 +567,6 @@ XCOMM Part 3
<Multi_key> <A> <asciicircum> : "Â" Acircumflex # LATIN CAPITAL
LETTER A WITH CIRCUMFLEX
<dead_tilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A
WITH TILDE
<Multi_key> <asciitilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A
WITH TILDE
-<Multi_key> <minus> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A
WITH TILDE
-<Multi_key> <A> <minus> : "Ã" Atilde # LATIN CAPITAL LETTER A
WITH TILDE
<Multi_key> <A> <asciitilde> : "Ã" Atilde # LATIN CAPITAL LETTER A
WITH TILDE
<dead_diaeresis> <A> : "Ä" Adiaeresis # LATIN CAPITAL
LETTER A WITH DIAERESIS
<Multi_key> <quotedbl> <A> : "Ä" Adiaeresis # LATIN CAPITAL
LETTER A WITH DIAERESIS
@@ -640,8 +638,6 @@ XCOMM Part 3
<dead_tilde> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O
WITH TILDE
<Multi_key> <asciitilde> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O
WITH TILDE
<Multi_key> <O> <asciitilde> : "Õ" Otilde # LATIN CAPITAL LETTER O
WITH TILDE
-<Multi_key> <minus> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O
WITH TILDE
-<Multi_key> <O> <minus> : "Õ" Otilde # LATIN CAPITAL LETTER O
WITH TILDE
<dead_diaeresis> <O> : "Ö" Odiaeresis # LATIN CAPITAL
LETTER O WITH DIAERESIS
<Multi_key> <quotedbl> <O> : "Ö" Odiaeresis # LATIN CAPITAL
LETTER O WITH DIAERESIS
<Multi_key> <O> <quotedbl> : "Ö" Odiaeresis # LATIN CAPITAL
LETTER O WITH DIAERESIS
@@ -692,8 +688,6 @@ XCOMM Part 3
<dead_tilde> <a> : "ã" atilde # LATIN SMALL LETTER A
WITH TILDE
<Multi_key> <asciitilde> <a> : "ã" atilde # LATIN SMALL LETTER A
WITH TILDE
<Multi_key> <a> <asciitilde> : "ã" atilde # LATIN SMALL LETTER A
WITH TILDE
-<Multi_key> <minus> <a> : "ã" atilde # LATIN SMALL LETTER A
WITH TILDE
-<Multi_key> <a> <minus> : "ã" atilde # LATIN SMALL LETTER A
WITH TILDE
<dead_diaeresis> <a> : "ä" adiaeresis # LATIN SMALL LETTER
A WITH DIAERESIS
<Multi_key> <quotedbl> <a> : "ä" adiaeresis # LATIN SMALL LETTER
A WITH DIAERESIS
<Multi_key> <a> <quotedbl> : "ä" adiaeresis # LATIN SMALL LETTER
A WITH DIAERESIS
@@ -764,8 +758,6 @@ XCOMM Part 3
<dead_tilde> <o> : "õ" otilde # LATIN SMALL LETTER O
WITH TILDE
<Multi_key> <asciitilde> <o> : "õ" otilde # LATIN SMALL LETTER O
WITH TILDE
<Multi_key> <o> <asciitilde> : "õ" otilde # LATIN SMALL LETTER O
WITH TILDE
-<Multi_key> <minus> <o> : "õ" otilde # LATIN SMALL LETTER O
WITH TILDE
-<Multi_key> <o> <minus> : "õ" otilde # LATIN SMALL LETTER O
WITH TILDE
<dead_diaeresis> <o> : "ö" odiaeresis # LATIN SMALL LETTER
O WITH DIAERESIS
<Multi_key> <o> <diaeresis> : "ö" odiaeresis # LATIN SMALL LETTER
O WITH DIAERESIS
<Multi_key> <diaeresis> <o> : "ö" odiaeresis # LATIN SMALL LETTER
O WITH DIAERESIS
@@ -809,9 +801,15 @@ XCOMM Part 3
<dead_macron> <A> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
<Multi_key> <macron> <A> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
<Multi_key> <underscore> <A> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
+<Multi_key> <A> <underscore> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
+<Multi_key> <minus> <A> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
+<Multi_key> <A> <minus> : "Ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
<dead_macron> <a> : "ā" U0101 # LATIN SMALL LETTER A
WITH MACRON
<Multi_key> <macron> <a> : "ā" U0101 # LATIN SMALL LETTER A
WITH MACRON
<Multi_key> <underscore> <a> : "ā" U0101 # LATIN SMALL LETTER A
WITH MACRON
+<Multi_key> <a> <underscore> : "ā" U0101 # LATIN SMALL LETTER A
WITH MACRON
+<Multi_key> <minus> <a> : "ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
+<Multi_key> <a> <minus> : "ā" U0100 # LATIN CAPITAL LETTER A
WITH MACRON
<dead_breve> <A> : "Ă" U0102 # LATIN CAPITAL LETTER A
WITH BREVE
<Multi_key> <U> <A> : "Ă" U0102 # LATIN CAPITAL LETTER A
WITH BREVE
<Multi_key> <b> <A> : "Ă" U0102 # LATIN CAPITAL LETTER A
WITH BREVE
@@ -1066,10 +1064,14 @@ XCOMM Part 3
<Multi_key> <macron> <O> : "Ō" U014C # LATIN CAPITAL LETTER O
WITH MACRON
<Multi_key> <underscore> <O> : "Ō" U014C # LATIN CAPITAL LETTER O
WITH MACRON
<Multi_key> <O> <underscore> : "Ō" U014C # LATIN CAPITAL LETTER O
WITH MACRON
+<Multi_key> <minus> <O> : "Ō" U014C # LATIN CAPITAL LETTER O
WITH MACRON
+<Multi_key> <O> <minus> : "Ō" U014C # LATIN CAPITAL LETTER O
WITH MACRON
<dead_macron> <o> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
<Multi_key> <macron> <o> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
<Multi_key> <underscore> <o> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
<Multi_key> <o> <underscore> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
+<Multi_key> <minus> <o> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
+<Multi_key> <o> <minus> : "ō" U014D # LATIN SMALL LETTER O
WITH MACRON
<dead_breve> <O> : "Ŏ" U014E # LATIN CAPITAL LETTER O
WITH BREVE
<Multi_key> <U> <O> : "Ŏ" U014E # LATIN CAPITAL LETTER O
WITH BREVE
<Multi_key> <b> <O> : "Ŏ" U014E # LATIN CAPITAL LETTER O
WITH BREVE
commit 6bfd1dca6e7cb2046ee6bf9dbbddc0af5ef7cc00
Author: Pander <pan...@users.sourceforge.net>
Date: Sat May 5 16:56:05 2012 +0200
Compose: Removed <slash> <U> and vice versa
Combination with lower case u suffices
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 16ee516..4b29659 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -538,8 +538,6 @@ XCOMM Part 3
<Multi_key> <asciicircum> <KP_3> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <3> <asciicircum> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <m> <u> : "µ" mu # MICRO SIGN
-<Multi_key> <slash> <U> : "µ" mu # MICRO SIGN
-<Multi_key> <U> <slash> : "µ" mu # MICRO SIGN
<Multi_key> <slash> <u> : "µ" mu # MICRO SIGN
<Multi_key> <u> <slash> : "µ" mu # MICRO SIGN
<dead_circumflex> <1> : "¹" onesuperior # SUPERSCRIPT ONE
commit 3a8b1637132d1e36eb5e11f52dfb284081772d14
Author: Pander <pan...@users.sourceforge.net>
Date: Sat May 5 16:44:31 2012 +0200
Compose: Removed <n> <minus> for n with tilde, also vice versa & for upper
case
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 7c92985..16ee516 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -626,8 +626,6 @@ XCOMM Part 3
<dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N
WITH TILDE
<Multi_key> <asciitilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N
WITH TILDE
<Multi_key> <N> <asciitilde> : "Ñ" Ntilde # LATIN CAPITAL LETTER N
WITH TILDE
-<Multi_key> <minus> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N
WITH TILDE
-<Multi_key> <N> <minus> : "Ñ" Ntilde # LATIN CAPITAL LETTER N
WITH TILDE
<dead_grave> <O> : "Ò" Ograve # LATIN CAPITAL LETTER O
WITH GRAVE
<Multi_key> <grave> <O> : "Ò" Ograve # LATIN CAPITAL LETTER O
WITH GRAVE
<Multi_key> <O> <grave> : "Ò" Ograve # LATIN CAPITAL LETTER O
WITH GRAVE
@@ -752,8 +750,6 @@ XCOMM Part 3
<dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N
WITH TILDE
<Multi_key> <asciitilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N
WITH TILDE
<Multi_key> <n> <asciitilde> : "ñ" ntilde # LATIN SMALL LETTER N
WITH TILDE
-<Multi_key> <minus> <n> : "ñ" ntilde # LATIN SMALL LETTER N
WITH TILDE
-<Multi_key> <n> <minus> : "ñ" ntilde # LATIN SMALL LETTER N
WITH TILDE
<dead_grave> <o> : "ò" ograve # LATIN SMALL LETTER O
WITH GRAVE
<Multi_key> <grave> <o> : "ò" ograve # LATIN SMALL LETTER O
WITH GRAVE
<Multi_key> <o> <grave> : "ò" ograve # LATIN SMALL LETTER O
WITH GRAVE
commit fd514d7a35119dd4413b51c84f2a536f2ca501a6
Author: Pander <pan...@users.sourceforge.net>
Date: Sat May 5 16:40:20 2012 +0200
Compose: Removed <S> in combination with a numeral for superscript
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index e60df42..7c92985 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -532,19 +532,11 @@ XCOMM Part 3
<dead_circumflex> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO
<Multi_key> <asciicircum> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO
<Multi_key> <2> <asciicircum> : "²" twosuperior # SUPERSCRIPT TWO
-<Multi_key> <2> <S> : "²" twosuperior # SUPERSCRIPT TWO
-<Multi_key> <S> <2> : "²" twosuperior # SUPERSCRIPT TWO
-<Multi_key> <2> <s> : "²" twosuperior # SUPERSCRIPT TWO
-<Multi_key> <s> <2> : "²" twosuperior # SUPERSCRIPT TWO
<dead_circumflex> <3> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <asciicircum> <3> : "³" threesuperior # SUPERSCRIPT
THREE
<dead_circumflex> <KP_3> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <asciicircum> <KP_3> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <3> <asciicircum> : "³" threesuperior # SUPERSCRIPT
THREE
-<Multi_key> <3> <S> : "³" threesuperior # SUPERSCRIPT
THREE
-<Multi_key> <S> <3> : "³" threesuperior # SUPERSCRIPT
THREE
-<Multi_key> <3> <s> : "³" threesuperior # SUPERSCRIPT
THREE
-<Multi_key> <s> <3> : "³" threesuperior # SUPERSCRIPT
THREE
<Multi_key> <m> <u> : "µ" mu # MICRO SIGN
<Multi_key> <slash> <U> : "µ" mu # MICRO SIGN
<Multi_key> <U> <slash> : "µ" mu # MICRO SIGN
@@ -555,10 +547,6 @@ XCOMM Part 3
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <1> <asciicircum> : "¹" onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <S> : "¹" onesuperior # SUPERSCRIPT ONE
-<Multi_key> <S> <1> : "¹" onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <s> : "¹" onesuperior # SUPERSCRIPT ONE
-<Multi_key> <s> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine #
MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE
ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE
ORDINAL INDICATOR
commit 1b5cad3ca54410c4edbca79c23c463e9e088bc0d
Author: Pander <pan...@users.sourceforge.net>
Date: Sat May 5 16:28:01 2012 +0200
Compose: Reassigned <o> <apostrophe> to oacute, also for upper case.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 39154bd..e60df42 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -647,6 +647,7 @@ XCOMM Part 3
<Multi_key> <acute> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O
WITH ACUTE
<Multi_key> <O> <acute> : "Ó" Oacute # LATIN CAPITAL LETTER O
WITH ACUTE
<Multi_key> <apostrophe> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O
WITH ACUTE
+<Multi_key> <O> <apostrophe> : "Ó" Oacute # LATIN CAPITAL LETTER O
WITH ACUTE
<dead_circumflex> <O> : "Ô" Ocircumflex # LATIN CAPITAL
LETTER O WITH CIRCUMFLEX
<Multi_key> <asciicircum> <O> : "Ô" Ocircumflex # LATIN CAPITAL
LETTER O WITH CIRCUMFLEX
<Multi_key> <O> <asciicircum> : "Ô" Ocircumflex # LATIN CAPITAL
LETTER O WITH CIRCUMFLEX
@@ -772,6 +773,7 @@ XCOMM Part 3
<Multi_key> <acute> <o> : "ó" oacute # LATIN SMALL LETTER O
WITH ACUTE
<Multi_key> <o> <acute> : "ó" oacute # LATIN SMALL LETTER O
WITH ACUTE
<Multi_key> <apostrophe> <o> : "ó" oacute # LATIN SMALL LETTER O
WITH ACUTE
+<Multi_key> <o> <apostrophe> : "ó" oacute # LATIN SMALL LETTER O
WITH ACUTE
<dead_circumflex> <o> : "ô" ocircumflex # LATIN SMALL
LETTER O WITH CIRCUMFLEX
<Multi_key> <asciicircum> <o> : "ô" ocircumflex # LATIN SMALL
LETTER O WITH CIRCUMFLEX
<Multi_key> <o> <asciicircum> : "ô" ocircumflex # LATIN SMALL
LETTER O WITH CIRCUMFLEX
@@ -1458,7 +1460,6 @@ XCOMM Part 3
<dead_acute> <Multi_key> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A
WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL
LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <apostrophe> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL
LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <o> <apostrophe> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A
WITH RING ABOVE AND ACUTE
<Multi_key> <asterisk> <apostrophe> <A> : "Ǻ" U01FA # LATIN CAPITAL
LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A
WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A
WITH RING ABOVE AND ACUTE
@@ -1467,7 +1468,6 @@ XCOMM Part 3
<dead_acute> <Multi_key> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A
WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL
LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <apostrophe> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL
LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <o> <apostrophe> <a> : "ǻ" U01FB # LATIN SMALL LETTER A
WITH RING ABOVE AND ACUTE
<Multi_key> <asterisk> <apostrophe> <a> : "ǻ" U01FB # LATIN SMALL
LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE
WITH ACUTE
<Multi_key> <acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE
WITH ACUTE
commit 0bbc0d5e605e2a4a3eb00a229b651d4546e8aef4
Author: James Cloos <cl...@jhcloos.com>
Date: Thu May 10 12:27:28 2012 -0400
Remove duplicate compose sequences from commit e51e37c118ae.
The compose-check script only handles compiled Compose files, not
the Compose.pre files. One must remember to use:
./autogen.sh; make; make check
when reviewing patches to the Compose.pre files....
Signed-off-by: James Cloos <cl...@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index e17c3ec..39154bd 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5846,9 +5846,6 @@ XCOMM Characters from "Mathematical Operators"
<Multi_key> <v> <slash> : "√" U221a # v / SQUARE
ROOT
<Multi_key> <slash> <v> : "√" U221a # / v SQUARE
ROOT
<Multi_key> <8> <8> : "∞" U221e # 8 8 INFINITY
-<Multi_key> <equal> <slash> : "≠" U2260 # = / NOT
EQUAL TO
-<Multi_key> <slash> <equal> : "≠" U2260 # / = NOT
EQUAL TO
-<Multi_key> <underscore> <equal> : "≡" U2261 # _ =
IDENTICAL TO
<Multi_key> <equal> <underscore> : "≡" U2261 # = _
IDENTICAL TO
<Multi_key> <underscore> <U2260> : "≢" U2262 # _ ≠ NOT
IDENTICAL TO
<Multi_key> <U2260> <underscore> : "≢" U2262 # ≠ _ NOT
IDENTICAL TO
@@ -5864,10 +5861,6 @@ XCOMM Characters from "Mathematical Operators"
<Multi_key> <minus> <U25cb> : "⊖" U2296 # - ○ CIRCLED
MINUS
<Multi_key> <U25cb> <period> : "⊙" U2299 # ○ - CIRCLED
DOT
<Multi_key> <period> <U25cb> : "⊙" U2299 # - ○ CIRCLED
DOT
-<Multi_key> <parenleft> <minus> : "⊢" U22a2 # ( - RIGHT
TACK
-<Multi_key> <minus> <parenleft> : "⊢" U22a2 # - ( RIGHT
TACK
-<Multi_key> <parenright> <minus> : "⊣" U22a3 # ) - LEFT TACK
-<Multi_key> <minus> <parenright> : "⊣" U22a3 # - ) LEFT TACK
<Multi_key> <less> <greater> : "⋄" U22c4 # < > DIAMOND
OPERATOR
<Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND
OPERATOR
<Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND
OPERATOR
@@ -5949,7 +5942,6 @@ XCOMM This line clashes with the <apostrophe>
<underscore> <E> (and similar) tha
XCOMM a work around for the problems with <macron>. Or to cope with keyboards
that do not have <macron> (more likely).
XCOMM All APL keyboards have <macron>, it is used as the -ve sign for numbers.
XCOMM I do not know of an extant APL using ⍘
-<Multi_key> <apostrophe> <underscore> : "⍘" U2358 # ' _ APL
FUNCTIONAL SYMBOL QUOTE UNDERBAR
<Multi_key> <underscore> <apostrophe> : "⍘" U2358 # _ ' APL
FUNCTIONAL SYMBOL QUOTE UNDERBAR
<Multi_key> <U2206> <underscore> : "⍙" U2359 # ∆ _ APL
FUNCTIONAL SYMBOL DELTA UNDERBAR
<Multi_key> <underscore> <U2206> : "⍙" U2359 # _ ∆ APL
FUNCTIONAL SYMBOL DELTA UNDERBAR
@@ -5981,12 +5973,9 @@ XCOMM I do not know of an extant APL using ⍘
<Multi_key> <bar> <U222a> : "⍦" U2366 # | ∪ APL
FUNCTIONAL SYMBOL DOWN SHOE STILE
<Multi_key> <U2282> <bar> : "⍧" U2367 # ⊂ | APL
FUNCTIONAL SYMBOL LEFT SHOE STILE
<Multi_key> <bar> <U2282> : "⍧" U2367 # | ⊂ APL
FUNCTIONAL SYMBOL LEFT SHOE STILE
-<Multi_key> <diaeresis> <asciitilde> : "⍨" U2368 # ¨ ~ APL
FUNCTIONAL SYMBOL TILDE DIAERESIS
<Multi_key> <asciitilde> <diaeresis> : "⍨" U2368 # ~ ¨ APL
FUNCTIONAL SYMBOL TILDE DIAERESIS
<Multi_key> <diaeresis> <greater> : "⍩" U2369 # ¨ > APL
FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS
<Multi_key> <greater> <diaeresis> : "⍩" U2369 # > ¨ APL
FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS
-<Multi_key> <comma> <minus> : "⍪" U236a # , - APL
FUNCTIONAL SYMBOL COMMA BAR
-<Multi_key> <minus> <comma> : "⍪" U236a # - , APL
FUNCTIONAL SYMBOL COMMA BAR
<Multi_key> <U2207> <asciitilde> : "⍫" U236b # ∇ ~ APL
FUNCTIONAL SYMBOL DEL TILDE
<Multi_key> <asciitilde> <U2207> : "⍫" U236b # ~ ∇ APL
FUNCTIONAL SYMBOL DEL TILDE
<Multi_key> <0> <asciitilde> : "⍬" U236c # 0 ~ APL
FUNCTIONAL SYMBOL ZILDE
@@ -5997,7 +5986,6 @@ XCOMM This line does not work. It clashes with
XCOMM <underscore> <semicolon> <O> for Ǭ and
XCOMM <underscore> <semicolon> <o> for ǭ.
XCOMM Given that no extant APLs use ⍮ I will just leave the line in place.
-<Multi_key> <underscore> <semicolon> : "⍮" U236e # _ ; APL
FUNCTIONAL SYMBOL SEMICOLON UNDERBAR
<Multi_key> <semicolon> <underscore> : "⍮" U236e # ; _ APL
FUNCTIONAL SYMBOL SEMICOLON UNDERBAR
<Multi_key> <U2260> <U2395> : "⍯" U236f # ≠ ⎕ APL
FUNCTIONAL SYMBOL QUAD NOT EQUAL
<Multi_key> <U2395> <U2260> : "⍯" U236f # ⎕ ≠ APL
FUNCTIONAL SYMBOL QUAD NOT EQUAL
commit e51e37c118ae6cb9ced8244ce1c410677e0279ce
Author: Geoff Streeter <ge...@dyalog.com>
Date: Thu Mar 22 15:02:00 2012 +0000
Add APL support to compose
Signed-off-by: Geoff Streeter <ge...@dyalog.com>
Signed-off-by: James Cloos <cl...@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 2eae912..e17c3ec 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5830,3 +5830,188 @@ XCOMM
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" #
CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON
RAISING BOTH HANDS IN CELEBRATION
+
+XCOMM APL support Geoff Streeter 2012-01-04
+
+XCOMM APL was initially an overstruck language. The original APL terminal was
an IBM golfball
+XCOMM with a specially designed golfball. This meant that characters could be
overstruck to
+XCOMM produce other characters. This gave APL a richness of primitives which
is still powerful
+XCOMM today. Overstrikes were always independent of order.
+
+XCOMM APLs have extended this into a number of dialects. Let us try to support
lots of them.
+XCOMM Together with some that have not been used yet. Some traditional ones
are not included.
+
+XCOMM Characters from "Mathematical Operators"
+
+<Multi_key> <v> <slash> : "√" U221a # v / SQUARE
ROOT
+<Multi_key> <slash> <v> : "√" U221a # / v SQUARE
ROOT
+<Multi_key> <8> <8> : "∞" U221e # 8 8 INFINITY
+<Multi_key> <equal> <slash> : "≠" U2260 # = / NOT
EQUAL TO
+<Multi_key> <slash> <equal> : "≠" U2260 # / = NOT
EQUAL TO
+<Multi_key> <underscore> <equal> : "≡" U2261 # _ =
IDENTICAL TO
+<Multi_key> <equal> <underscore> : "≡" U2261 # = _
IDENTICAL TO
+<Multi_key> <underscore> <U2260> : "≢" U2262 # _ ≠ NOT
IDENTICAL TO
+<Multi_key> <U2260> <underscore> : "≢" U2262 # ≠ _ NOT
IDENTICAL TO
+<Multi_key> <less> <underscore> : "≤" U2264 # < _
LESS-THAN OR EQUAL TO
+<Multi_key> <underscore> <less> : "≤" U2264 # _ <
LESS-THAN OR EQUAL TO
+<Multi_key> <greater> <underscore> : "≥" U2265 # > _
GREATER-THAN OR EQUAL TO
+<Multi_key> <underscore> <greater> : "≥" U2265 # _ >
GREATER-THAN OR EQUAL TO
+<Multi_key> <underscore> <U2282> : "⊆" U2286 # _ ⊂ SUBSET
OF OR EQUAL TO
+<Multi_key> <U2282> <underscore> : "⊆" U2286 # ⊂ _ SUBSET
OF OR EQUAL TO
+<Multi_key> <underscore> <U2283> : "⊇" U2287 # _ ⊃ SUPERSET
OF OR EQUAL TO
+<Multi_key> <U2283> <underscore> : "⊇" U2287 # ⊃ _ SUPERSET
OF OR EQUAL TO
+<Multi_key> <U25cb> <minus> : "⊖" U2296 # ○ - CIRCLED
MINUS
+<Multi_key> <minus> <U25cb> : "⊖" U2296 # - ○ CIRCLED
MINUS
+<Multi_key> <U25cb> <period> : "⊙" U2299 # ○ - CIRCLED
DOT
+<Multi_key> <period> <U25cb> : "⊙" U2299 # - ○ CIRCLED
DOT
+<Multi_key> <parenleft> <minus> : "⊢" U22a2 # ( - RIGHT
TACK
+<Multi_key> <minus> <parenleft> : "⊢" U22a2 # - ( RIGHT
TACK
+<Multi_key> <parenright> <minus> : "⊣" U22a3 # ) - LEFT TACK
+<Multi_key> <minus> <parenright> : "⊣" U22a3 # - ) LEFT TACK
+<Multi_key> <less> <greater> : "⋄" U22c4 # < > DIAMOND
OPERATOR
+<Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND
OPERATOR
+<Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND
OPERATOR
+<Multi_key> <U2228> <U2227> : "⋄" U22c4 # ∨ ∧ DIAMOND
OPERATOR
+
+XCOMM Characters from "Miscellaneous Technical"
+
+<Multi_key> <U22a5> <U22a4> : "⌶" U2336 # ⊥ ⊤ APL
FUNCTIONAL SYMBOL I-BEAM
+<Multi_key> <U22a4> <U22a5> : "⌶" U2336 # ⊥ ⊤ APL
FUNCTIONAL SYMBOL I-BEAM
+<Multi_key> <bracketleft> <bracketright> : "⌷" U2337 # [ ] APL
FUNCTIONAL SYMBOL SQUISH QUAD
+<Multi_key> <bracketright> <bracketleft> : "⌷" U2337 # ] [ APL
FUNCTIONAL SYMBOL SQUISH QUAD
+<Multi_key> <U2395> <equal> : "⌸" U2338 # ⎕ = APL
FUNCTIONAL SYMBOL QUAD EQUAL
+<Multi_key> <equal> <U2395> : "⌸" U2338 # = ⎕ APL
FUNCTIONAL SYMBOL QUAD EQUAL
+<Multi_key> <U2395> <division> : "⌹" U2339 # ⎕ ÷ APL
FUNCTIONAL SYMBOL QUAD DIVIDE
+<Multi_key> <division> <U2395> : "⌹" U2339 # ÷ ⎕ APL
FUNCTIONAL SYMBOL QUAD DIVIDE
+<Multi_key> <U2395> <U22c4> : "⌺" U233a # ⎕ ⋄ APL
FUNCTIONAL SYMBOL QUAD DIAMOND
+<Multi_key> <U22c4> <U2395> : "⌺" U233a # ⋄ ⎕ APL
FUNCTIONAL SYMBOL QUAD DIAMOND
+<Multi_key> <U2395> <U2218> : "⌻" U233b # ⎕ ∘ APL
FUNCTIONAL SYMBOL QUAD JOT
+<Multi_key> <U2218> <U2395> : "⌻" U233b # ∘ ⎕ APL
FUNCTIONAL SYMBOL QUAD JOT
+<Multi_key> <U2395> <U25cb> : "⌼" U233c # ⎕ ○ APL
FUNCTIONAL SYMBOL QUAD CIRCLE
+<Multi_key> <U25cb> <U2395> : "⌼" U233c # ○ ⎕ APL
FUNCTIONAL SYMBOL QUAD CIRCLE
+<Multi_key> <U25cb> <bar> : "⌽" U233d # ○ | APL
FUNCTIONAL SYMBOL CIRCLE STILE
+<Multi_key> <bar> <U25cb> : "⌽" U233d # | ○ APL
FUNCTIONAL SYMBOL CIRCLE STILE
+<Multi_key> <U25cb> <U2218> : "⌾" U233e # ○ ∘ APL
FUNCTIONAL SYMBOL CIRCLE JOT
+<Multi_key> <U2218> <U25cb> : "⌾" U233e # ∘ ○ APL
FUNCTIONAL SYMBOL CIRCLE JOT
+<Multi_key> <slash> <minus> : "⌿" U233f # / - APL
FUNCTIONAL SYMBOL SLASH BAR
+<Multi_key> <minus> <slash> : "⌿" U233f # - / APL
FUNCTIONAL SYMBOL SLASH BAR
+<Multi_key> <backslash> <minus> : "⍀" U2340 # \ - APL
FUNCTIONAL SYMBOL BACKSLASH BAR
+<Multi_key> <minus> <backslash> : "⍀" U2340 # - \ APL
FUNCTIONAL SYMBOL BACKSLASH BAR
+<Multi_key> <slash> <U2395> : "⍁" U2341 # / ⎕ APL
FUNCTIONAL SYMBOL QUAD SLASH
+<Multi_key> <U2395> <slash> : "⍁" U2341 # ⎕ / APL
FUNCTIONAL SYMBOL QUAD SLASH
+<Multi_key> <backslash> <U2395> : "⍂" U2342 # \ ⎕ APL
FUNCTIONAL SYMBOL QUAD BACKSLASH
+<Multi_key> <U2395> <backslash> : "⍂" U2342 # ⎕ \ APL
FUNCTIONAL SYMBOL QUAD BACKSLASH
+<Multi_key> <less> <U2395> : "⍃" U2343 # < ⎕ APL
FUNCTIONAL SYMBOL QUAD LESS-THAN
+<Multi_key> <U2395> <less> : "⍃" U2343 # ⎕ < APL
FUNCTIONAL SYMBOL QUAD LESS-THAN
+<Multi_key> <greater> <U2395> : "⍄" U2344 # > ⎕ APL
FUNCTIONAL SYMBOL QUAD GREATER-THAN
+<Multi_key> <U2395> <greater> : "⍄" U2344 # ⎕ > APL
FUNCTIONAL SYMBOL QUAD GREATER-THAN
+<Multi_key> <U2190> <bar> : "⍅" U2345 # ← | APL
FUNCTIONAL SYMBOL LEFTWARDS VANE
+<Multi_key> <bar> <U2190> : "⍅" U2345 # | ← APL
FUNCTIONAL SYMBOL LEFTWARDS VANE
+<Multi_key> <U2192> <bar> : "⍆" U2346 # → | APL
FUNCTIONAL SYMBOL RIGHTWARDS VANE
+<Multi_key> <bar> <U2192> : "⍆" U2346 # | → APL
FUNCTIONAL SYMBOL RIGHTWARDS VANE
+<Multi_key> <U2190> <U2395> : "⍇" U2347 # ← ⎕ APL
FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW
+<Multi_key> <U2395> <U2190> : "⍇" U2347 # ⎕ ← APL
FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW
+<Multi_key> <U2192> <U2395> : "⍈" U2348 # → ⎕ APL
FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW
+<Multi_key> <U2395> <U2192> : "⍈" U2348 # ⎕ → APL
FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW
+<Multi_key> <U25cb> <backslash> : "⍉" U2349 # ○ \ APL
FUNCTIONAL SYMBOL CIRCLE SLOPE
+<Multi_key> <backslash> <U25cb> : "⍉" U2349 # \ ○ APL
FUNCTIONAL SYMBOL CIRCLE SLOPE
+<Multi_key> <underscore> <U22a5> : "⍊" U234a # _ ⊥ APL
FUNCTIONAL SYMBOL DOWN TACK UNDERBAR
+<Multi_key> <U22a5> <underscore> : "⍊" U234a # ⊥ _ APL
FUNCTIONAL SYMBOL DOWN TACK UNDERBAR
+<Multi_key> <U2206> <bar> : "⍋" U234b # ∆ | APL
FUNCTIONAL SYMBOL DELTA STILE
+<Multi_key> <bar> <U2206> : "⍋" U234b # | ∆ APL
FUNCTIONAL SYMBOL DELTA STILE
+<Multi_key> <U2228> <U2395> : "⍌" U234c # ∨ ⎕ APL
FUNCTIONAL SYMBOL QUAD DOWN CARET
+<Multi_key> <U2395> <U2228> : "⍌" U234c # ⎕ ∨ APL
FUNCTIONAL SYMBOL QUAD DOWN CARET
+<Multi_key> <U2206> <U2395> : "⍍" U234d # ∆ ⎕ APL
FUNCTIONAL SYMBOL QUAD DELTA
+<Multi_key> <U2395> <U2206> : "⍍" U234d # ⎕ ∆ APL
FUNCTIONAL SYMBOL QUAD DELTA
+<Multi_key> <U2218> <U22a5> : "⍎" U234e # ∘ ⊥ APL
FUNCTIONAL SYMBOL DOWN TACK JOT
+<Multi_key> <U22a5> <U2218> : "⍎" U234e # ⊥ ∘ APL
FUNCTIONAL SYMBOL DOWN TACK JOT
+<Multi_key> <U2191> <minus> : "⍏" U234f # ↑ - APL
FUNCTIONAL SYMBOL UPWARDS VANE
+<Multi_key> <minus> <U2191> : "⍏" U234f # - ↑ APL
FUNCTIONAL SYMBOL UPWARDS VANE
+<Multi_key> <U2191> <U2395> : "⍐" U2350 # ↑ ⎕ APL
FUNCTIONAL SYMBOL QUAD UPWARDS ARROW
+<Multi_key> <U2395> <U2191> : "⍐" U2350 # ⎕ ↑ APL
FUNCTIONAL SYMBOL QUAD UPWARDS ARROW
+XCOMM I cannot get anything to work with <macron>. Given that no extant APLs
use ⍑ I will just leave the lines
+XCOMM in place.
+<Multi_key> <macron> <U22a4> : "⍑" U2351 # ¯ ⊤ APL
FUNCTIONAL SYMBOL UP TACK OVERBAR
+<Multi_key> <U22a4> <macron> : "⍑" U2351 # ⊤ ¯ APL
FUNCTIONAL SYMBOL UP TACK OVERBAR
+<Multi_key> <U2207> <bar> : "⍒" U2352 # ∇ | APL
FUNCTIONAL SYMBOL DEL STILE
+<Multi_key> <bar> <U2207> : "⍒" U2352 # | ∇ APL
FUNCTIONAL SYMBOL DEL STILE
+<Multi_key> <U2227> <U2395> : "⍓" U2353 # ∧ ⎕ APL
FUNCTIONAL SYMBOL QUAD UP CARET
+<Multi_key> <U2395> <U2227> : "⍓" U2353 # ⎕ ∧ APL
FUNCTIONAL SYMBOL QUAD UP CARET
+<Multi_key> <U2207> <U2395> : "⍔" U2354 # ∇ ⎕ APL
FUNCTIONAL SYMBOL QUAD DEL
+<Multi_key> <U2395> <U2207> : "⍔" U2354 # ⎕ ∇ APL
FUNCTIONAL SYMBOL QUAD DEL
+<Multi_key> <U2218> <U22a4> : "⍕" U2355 # ∘ ⊤ APL
FUNCTIONAL SYMBOL UP TACK JOT
+<Multi_key> <U22a4> <U2218> : "⍕" U2355 # ⊤ ∘ APL
FUNCTIONAL SYMBOL UP TACK JOT
+<Multi_key> <U2193> <minus> : "⍖" U2356 # ↓ - APL
FUNCTIONAL SYMBOL DOWNWARDS VANE
+<Multi_key> <minus> <U2193> : "⍖" U2356 # - ↓ APL
FUNCTIONAL SYMBOL DOWNWARDS VANE
+<Multi_key> <U2193> <U2395> : "⍗" U2357 # ↓ ⎕ APL
FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW
+<Multi_key> <U2395> <U2193> : "⍗" U2357 # ⎕ ↓ APL
FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW
+XCOMM This line clashes with the <apostrophe> <underscore> <E> (and similar)
that appear to be there to provide
+XCOMM a work around for the problems with <macron>. Or to cope with keyboards
that do not have <macron> (more likely).
+XCOMM All APL keyboards have <macron>, it is used as the -ve sign for numbers.
+XCOMM I do not know of an extant APL using ⍘
+<Multi_key> <apostrophe> <underscore> : "⍘" U2358 # ' _ APL
FUNCTIONAL SYMBOL QUOTE UNDERBAR
+<Multi_key> <underscore> <apostrophe> : "⍘" U2358 # _ ' APL
FUNCTIONAL SYMBOL QUOTE UNDERBAR
+<Multi_key> <U2206> <underscore> : "⍙" U2359 # ∆ _ APL
FUNCTIONAL SYMBOL DELTA UNDERBAR
+<Multi_key> <underscore> <U2206> : "⍙" U2359 # _ ∆ APL
FUNCTIONAL SYMBOL DELTA UNDERBAR
+<Multi_key> <U22c4> <underscore> : "⍚" U235a # ⋄ _ APL
FUNCTIONAL SYMBOL DIAMOND UNDERBAR
+<Multi_key> <underscore> <U22c4> : "⍚" U235a # _ ⋄ APL
FUNCTIONAL SYMBOL DIAMOND UNDERBAR
+<Multi_key> <U2218> <underscore> : "⍛" U235b # ∘ _ APL
FUNCTIONAL SYMBOL JOT UNDERBAR
+<Multi_key> <underscore> <U2218> : "⍛" U235b # _ ∘ APL
FUNCTIONAL SYMBOL JOT UNDERBAR
+<Multi_key> <U25cb> <underscore> : "⍜" U235c # ○ _ APL
FUNCTIONAL SYMBOL CIRCLE UNDERBAR
+<Multi_key> <underscore> <U25cb> : "⍜" U235c # _ ○ APL
FUNCTIONAL SYMBOL CIRCLE UNDERBAR
+<Multi_key> <U2218> <U2229> : "⍝" U235d # ∘ ∩ APL
FUNCTIONAL SYMBOL UP SHOE JOT
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ubcbi-0002ve...@vasks.debian.org
