libx11: Changes to 'debian-unstable'
ChangeLog | 1069 +++++++++++++++++
Makefile.am | 1
configure.ac | 21
cpprules.in | 2
debian/changelog | 33
debian/control | 5
debian/libx11-6.symbols | 1
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 21
debian/patches/015_russian_locale_alias.diff | 8
debian/rules | 24
docbook.am | 112 -
include/X11/Xlib.h | 1
include/X11/Xlibint.h | 101 -
include/X11/Xutil.h | 2
man/IsCursorKey.man | 1
man/XChangeKeyboardControl.man | 4
man/XChangeKeyboardMapping.man | 1
man/XGrabKey.man | 2
man/XLookupKeysym.man | 2
man/XStringToKeysym.man | 1
modules/im/ximcp/imDefFlt.c | 16
modules/im/ximcp/imDefIc.c | 4
modules/im/ximcp/imDefLkup.c | 12
modules/im/ximcp/imExten.c | 2
modules/im/ximcp/imLcFlt.c | 52
modules/im/ximcp/imRm.c | 18
modules/im/ximcp/imRmAttr.c | 7
modules/lc/gen/lcGenConv.c | 9
nls/Makefile.am | 104 -
nls/compose-chart.pl | 389 ------
nls/en_US.UTF-8/Compose.pre | 482 +++++++
nls/fi_FI.UTF-8/Compose.pre | 4
nls/iso8859-1/Compose.pre | 2
nls/locale.alias.pre | 19
nls/pt_BR.UTF-8/Compose.pre | 10
nls/xmlrules.in | 59
specs/XIM/xim.xml | 504 ++++----
specs/XKB/ch01.xml | 39
specs/XKB/ch02.xml | 120 +
specs/XKB/ch03.xml | 12
specs/XKB/ch04.xml | 122 +
specs/XKB/ch05.xml | 164 +-
specs/XKB/ch06.xml | 97 -
specs/XKB/ch07.xml | 29
specs/XKB/ch08.xml | 295 ++--
specs/XKB/ch09.xml | 190 +--
specs/XKB/ch10.xml | 805 ++++++------
specs/XKB/ch11.xml | 88 -
specs/XKB/ch12.xml | 119 +
specs/XKB/ch13.xml | 651 +++++-----
specs/XKB/ch14.xml | 233 ++-
specs/XKB/ch15.xml | 390 +++---
specs/XKB/ch16.xml | 791 ++++++------
specs/XKB/ch17.xml | 216 +--
specs/XKB/ch18.xml | 191 +--
specs/XKB/ch19.xml | 21
specs/XKB/ch20.xml | 194 +--
specs/XKB/ch21.xml | 249 ++--
specs/XKB/ch22.xml | 40
specs/XKB/xkblib.xml | 19
specs/i18n/Makefile.am | 2
specs/i18n/compose/.gitignore | 2
specs/i18n/compose/Makefile.am | 20
specs/i18n/compose/compose-chart.pl | 388 ++++++
specs/i18n/compose/docbook-nl.am | 128 ++
specs/i18n/framework/framework.xml | 345 ++---
specs/i18n/localedb/localedb.xml | 179 +-
specs/i18n/trans/trans.xml | 463 +++----
specs/libX11/AppA.xml | 996 ++++++++--------
specs/libX11/AppB.xml | 2
specs/libX11/AppC.xml | 334 ++---
specs/libX11/AppD.xml | 230 +--
specs/libX11/CH01.xml | 20
specs/libX11/CH02.xml | 270 ++--
specs/libX11/CH03.xml | 413 +++---
specs/libX11/CH04.xml | 238 +--
specs/libX11/CH05.xml | 88 -
specs/libX11/CH06.xml | 585 ++++-----
specs/libX11/CH07.xml | 394 +++---
specs/libX11/CH08.xml | 552 ++++----
specs/libX11/CH09.xml | 284 ++--
specs/libX11/CH10.xml | 307 ++--
specs/libX11/CH11.xml | 399 +++---
specs/libX11/CH12.xml | 417 +++---
specs/libX11/CH13.xml | 1306 ++++++++++-----------
specs/libX11/CH14.xml | 631 +++++-----
specs/libX11/CH15.xml | 297 ++--
specs/libX11/CH16.xml | 486 +++----
specs/libX11/credits.xml | 32
specs/libX11/glossary.xml | 30
specs/libX11/libX11.xml | 39
src/FSWrap.c | 2
src/KeysymStr.c | 3
src/OpenDis.c | 19
src/QuColors.c | 32
src/UIThrStubs.c | 4
src/XlibInt.c | 31
src/Xresinternal.h | 4
src/Xrm.c | 2
src/Xxcbint.h | 3
src/locking.c | 2
src/util/Makefile.am | 3
src/util/makekeys.c | 7
src/xcb_io.c | 4
src/xlibi18n/XimintP.h | 40
src/xlibi18n/XlcSL.c | 6
src/xlibi18n/imKStoUCS.c | 2
src/xlibi18n/lcFile.c | 2
108 files changed, 10033 insertions(+), 8190 deletions(-)
New commits:
commit 8be033d1263c00456a178cd0bd463c425fad44e9
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:58:39 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 408d96c..5b436d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
+libx11 (2:1.4.99.901-1) unstable; urgency=low
* New upstream release candidate (1.5 RC1)
- XQueryColors: split a request into multiple requests if necessary
@@ -11,8 +11,9 @@ libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
* Add build-indep and build-arch targets, don't build specs in build-arch.
* Rediff 006_tailor_pt_BR.UTF-8_Compose.diff and
015_russian_locale_alias.diff.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:58:30 +0200
libx11 (2:1.4.99.1-1) experimental; urgency=low
commit 91c834139026c7d50a1dbac19a8062ca4d6151e4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:58:02 2012 +0200
Update patch stack
diff --git a/debian/changelog b/debian/changelog
index f64faa7..408d96c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
included in the html files directly. Also add Breaks in addition to the
Replaces on old libx11-dev.
* Add build-indep and build-arch targets, don't build specs in build-arch.
+ * Rediff 006_tailor_pt_BR.UTF-8_Compose.diff and
+ 015_russian_locale_alias.diff.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
diff --git a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
index d6fa3df..a4b5de4 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -7,8 +7,10 @@ This patch by Denis Barbier.
Not submitted upstream to X.Org.
---- a/nls/pt_BR.UTF-8/Compose.pre
-+++ b/nls/pt_BR.UTF-8/Compose.pre
+Index: libx11/nls/pt_BR.UTF-8/Compose.pre
+===================================================================
+--- libx11.orig/nls/pt_BR.UTF-8/Compose.pre
++++ libx11/nls/pt_BR.UTF-8/Compose.pre
@@ -1,4275 +1,3 @@
-XCOMM UTF-8 (Unicode) compose sequence
-XCOMM David.Monniaux@ens.fr
@@ -608,11 +610,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <semicolon> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
-<dead_ogonek> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
-<Multi_key> <semicolon> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
--<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
++include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+ <dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
-<Multi_key> <acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<Multi_key> <apostrophe> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
-+<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
<dead_acute> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
-<Multi_key> <acute> <c> : "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
-<Multi_key> <apostrophe> <c> : "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
@@ -1042,10 +1043,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <macron> <semicolon> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <dead_ogonek> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <semicolon> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<dead_caron> <U01b7> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<Multi_key> <c> <U01b7> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<dead_caron> <U0292> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
--<Multi_key> <c> <U0292> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
+-<dead_caron> <EZH> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
+-<Multi_key> <c> <EZH> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
+-<dead_caron> <ezh> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
+-<Multi_key> <c> <ezh> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
-<dead_caron> <j> : "ǰ" U01F0 # LATIN SMALL LETTER J WITH CARON
-<Multi_key> <c> <j> : "ǰ" U01F0 # LATIN SMALL LETTER J WITH CARON
-<dead_acute> <G> : "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
diff --git a/debian/patches/015_russian_locale_alias.diff b/debian/patches/015_russian_locale_alias.diff
index f87c179..ae0f968 100644
--- a/debian/patches/015_russian_locale_alias.diff
+++ b/debian/patches/015_russian_locale_alias.diff
@@ -10,9 +10,11 @@ appropriate perjorative language here.
Suggestion: can the russian default be changed to UTF-8 instead of KOI8-R?
This will make it easier for russians to fit in with the rest of the world.
---- a/nls/locale.alias.pre
-+++ b/nls/locale.alias.pre
-@@ -1269,7 +1269,7 @@ portuguese: pt_PT.ISO8859-1
+Index: libx11/nls/locale.alias.pre
+===================================================================
+--- libx11.orig/nls/locale.alias.pre
++++ libx11/nls/locale.alias.pre
+@@ -1250,7 +1250,7 @@ portuguese: pt_PT.ISO8859-1
portuguese.iso88591: pt_PT.ISO8859-1
romanian: ro_RO.ISO8859-2
rumanian: ro_RO.ISO8859-2
commit 45defbfe7a500f66bd95afde23b62180a20a53ba
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:45:03 2012 +0200
Add build-indep and build-arch targets
Don't build specs in build-arch.
diff --git a/debian/changelog b/debian/changelog
index 73a10bf..f64faa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
* Drop xorg-sgml-doctools dependency from libx11-doc, the css is now
included in the html files directly. Also add Breaks in addition to the
Replaces on old libx11-dev.
+ * Add build-indep and build-arch targets, don't build specs in build-arch.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
diff --git a/debian/rules b/debian/rules
index 7fc346e..24e9b12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,12 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-build: build-stamp
+build: build-indep
+build-indep: build-stamp
+build-indep: docflags = --enable-specs --with-xmlto
+build-arch: build-stamp
+build-arch: docflags = --disable-specs
+
build-stamp: configure $(STAMP_DIR)/genscripts
dh_testdir
@@ -59,8 +64,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --enable-specs \
- --with-xmlto \
+ $(docflags) \
--without-fop \
$(confflags) \
CFLAGS="$(CFLAGS)"
@@ -82,7 +86,7 @@ clean: xsfclean
find -name Makefile.in -delete
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -91,7 +95,7 @@ install: build
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-stamp install
dh_testdir
dh_testroot
@@ -121,7 +125,7 @@ binary-arch: build install
dh_builddeb -s
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
dh_testdir
dh_testroot
@@ -146,4 +150,5 @@ binary-indep: build install
dh_builddeb -i
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-indep build-arch
+.PHONY: clean binary-indep binary-arch binary install
commit b8fc2bc108cdcd2e8657c2f39f2f10e621a041c5
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:41:07 2012 +0200
Drop xorg-sgml-doctools dependency from libx11-doc
The css is now included in the html files directly. Also add Breaks in
addition to the Replaces on old libx11-dev.
diff --git a/debian/changelog b/debian/changelog
index 2d4b12f..73a10bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
(closes: #278984)
- Revert "xcb: Add TCP fallback" (closes: #659558)
* Don't require (fake)root for debian/rules clean.
+ * Drop xorg-sgml-doctools dependency from libx11-doc, the css is now
+ included in the html files directly. Also add Breaks in addition to the
+ Replaces on old libx11-dev.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
diff --git a/debian/control b/debian/control
index 2cb809e..3a7dd77 100644
--- a/debian/control
+++ b/debian/control
@@ -201,9 +201,8 @@ Architecture: all
Multi-Arch: foreign
Depends:
${misc:Depends},
-# for xorg.css
- xorg-sgml-doctools (>= 1:1.5),
Replaces: libx11-dev (<< 2:1.4.4-3)
+Breaks: libx11-dev (<< 2:1.4.4-3)
Description: X11 client-side library (development documentation)
This package provides a client interface to the X Window System, otherwise
known as 'Xlib'. It provides a complete API for the basic functions of the
commit d30dd7a72b2832727a0fd36b4d931d1e2b27c1ba
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:35:35 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 60987a8..2d4b12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
- XQueryColors: split a request into multiple requests if necessary
(closes: #278984)
- Revert "xcb: Add TCP fallback" (closes: #659558)
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
diff --git a/debian/rules b/debian/rules
index 6e250a1..7fc346e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,9 +69,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
clean: xsfclean
dh_testdir
- dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -82,7 +80,6 @@ clean: xsfclean
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f src/config.h.in
find -name Makefile.in -delete
-
dh_clean
install: build
commit 3c98723dcc4aea58e999f7de3192eb09e158f93d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 22:21:32 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 3d07ab2..09a519a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,299 @@
+commit abc523fce31fcf2687229697a8eb656e343ecb0c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 15 22:14:45 2012 -0700
+
+ libX11 1.4.99.901 (1.5 RC1)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b2cc5905a4a6d519957223e8ba2caef71520040c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 15 22:03:21 2012 -0700
+
+ Remove "register" qualifier that annoys Solaris Studio compiler
+
+ Fixes warning:
+ "Xrm.c", line 1094: warning: storage class after type is obsolescent
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 62d42953893f93a98db0504eaf06d650ceaf5811
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Mar 14 17:25:46 2012 -0400
+
+ Fix the gtk+ additions
+
+ (Some of) the Dstroke and dstroke entries already were present as U011[01],
+ even though XK_Dstroke and XK_dstroke are part of the latin2 set in keysymdef.h.
+
+ The addition of <Multi_key> <o> <apostrophe> as a postfix version of
+ <Multi_key> <apostrophe> <o> blocks the existing entries for ǻ and Ǻ.
+ That prevents its and <Multi_key> <O> <apostrophe>’s addition.
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 91bcce48d94792f78333d2aea73961cc2e739d2e
+Author: Pander <pander@users.sourceforge.net>
+Date: Wed Mar 14 12:54:53 2012 -0400
+
+ Complete compose key sequences for musical symbols
+
+ Signed-off-by: Pander <pander@users.sourceforge.net>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit cf040016d455bc37f7665d6714337c5eafd8ea94
+Author: Pander <pander@users.sourceforge.net>
+Date: Wed Mar 14 12:46:25 2012 -0400
+
+ Add compose sequences from gtk+ to X.Org
+
+ Signed-off-by: Pander <pander@users.sourceforge.net>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit a4c591ced5cac9301b9abfa0e521be2d0b267882
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 4 02:00:13 2012 -0800
+
+ Block for other threads in _XUserLockDisplay
+
+ Wait for all other threads to release the user-level lock when
+ acquiring it. This ensures that only one thread at a time holds the
+ user-level lock, necessary as it is a nesting lock and a single
+ variable is used to determine when the lock is nesting and when it is
+ contended.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit ed00b460acb08787b695f27b864e96102dfd4867
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Oct 28 11:09:20 2011 -0500
+
+ Don't use caddr_t casts
+
+ (caddr_t) isn't used anywhere else in xcb or libX11.
+ Cast to (char *) for consistency.
+
+ Removing this cast allows building for MinGW without patching.
+
+ v2: Cast to (char *) rather than just dropping the cast
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 20adca02c2a1d0b7c95ecbe387d68f881fd57754
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 19 13:27:38 2012 +0100
+
+ Revert "xcb: Add TCP fallback"
+
+ This reverts commit f09c5299a381e2729e800a0ac43f1c0e371f65f6.
+
+ The TCP fallback ended up falling back to UNIX socket connection if
+ $DISPLAY was set to e.g. some.host:0 and the initial attempt failed.
+
+ Debian bug#659558 <http://bugs.debian.org/659558>
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+ Conflicts:
+
+ src/OpenDis.c
+
+commit f4378193619baa9bb973c1b5b718721bbcbe92c7
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Feb 22 14:13:20 2012 -0500
+
+ Make the compose sequence for ẞ work.
+
+ There is no XK_Ssharp symbol for U+1E9E LATIN CAPITAL LETTER SHARP S,
+ so use the U1e9e symbol in the Compose sequence.
+
+ (Compose sequences do not work when the target symbol is unknown.)
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 2ca641c3a506dcbee97e279b67990d5387389f36
+Author: Marko Myllynen <myllynen@redhat.com>
+Date: Mon Feb 20 17:04:59 2012 +0200
+
+ Use ezh/EZH in compose maps
+
+ Related: https://bugs.freedesktop.org/show_bug.cgi?id=19687
+
+ Signed-off-by: Marko Myllynen <myllynen@redhat.com>
+ Reviewed-by: Matt Dew <marcoz@osource.org>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 61725822f20f47684a545c1797183ee7075243ac
+Author: Marko Myllynen <myllynen@redhat.com>
+Date: Sun Feb 20 17:09:43 2011 +0200
+
+ Provide translation from XK_permille (ad5) to Unicode (U2030)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=19687
+
+ Signed-off-by: Marko Myllynen <myllynen@redhat.com>
+ Reviewed-by: Matt Dew <marcoz@osource.org>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit d2cce0abba0fa0143f49026442c8cab5ed721625
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Feb 12 19:01:43 2012 -0800
+
+ nls: Use LC_CTYPE=C for sed magic
+
+ Stricter versions of sed can trip up if the input does not match
+ LC_CTYPE
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit f180e043f55531933bedfa6e0ff36a00a9ec07f3
+Author: Frédéric Boiteux <fboiteux@calistel.com>
+Date: Wed Nov 30 12:47:31 2011 +0000
+
+ Compositions with the dead greek symbol
+
+ FreeDesktop Bug 21475 <https://bugs.freedesktop.org/show_bug.cgi?id=21475>
+
+ Signed-off-by: Frédéric Boiteux <fboiteux@calistel.com>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit d58e8f8e27790017fcfdeca0843b7318d541c189
+Author: Ryan Pavlik <rpavlik@iastate.edu>
+Date: Sun Jan 1 21:04:52 2012 +0000
+
+ Use pthreads on MinGW also
+
+ Use pthreads (provided by the pthreads-win32 compatability library which implements
+ them using native Win32 threading) on MinGW
+
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit bf15ccb6821664746ec23d769d757edf8059007e
+Author: Ryan Pavlik <rpavlik@iastate.edu>
+Date: Mon Jan 23 14:18:02 2012 +0000
+
+ Add XWindows.h include to Xxcbint.h
+
+ This avoids some conflicting type re-definition errors which occur if
+ we attempt to include Windows headers after Xmd.h
+
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit cadcbd376f0a5d17a71a2fe2f8ced5d93232921a
+Author: Matt Dew <marcoz@osource.org>
+Date: Sat Jan 21 17:59:51 2012 -0700
+
+ informaltable & table cleanup
+
+ On certain tables, add top and bottom borders to table header
+ and a bottom border to the table. This matches what those
+ tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point, IE, 1* -> 1.0*
+ cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified =>
+ falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit bb551f654df8f647c867f79252241964521e689e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Dec 28 21:22:41 2011 -0800
+
+ Add more Xkb man pages to the See Also lists for core keyboard functions
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b7bb23fe7c8b8a17128e5bc98a05f68595190438
+Author: Gaetan Nadon <nadon@memsize.(none)>
+Date: Fri Dec 30 17:08:14 2011 -0500
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <nadon@memsize.(none)>
+
+commit 70505468b7c4a7068cc39be42e421dcee34ec595
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Dec 13 19:58:30 2011 -0800
+
+ makekeys: move buf declaration from global to main to silence gcc -Wshadow
+
+ The global was only referenced in the main() function, which passes it
+ as an argument of the same name to the parse_line() function, leading
+ to gcc -Wshadow warnings:
+
+ makekeys.c: In function ‘parse_line’:
+ makekeys.c:58:24: warning: declaration of ‘buf’ shadows a global declaration
+ makekeys.c:54:13: warning: shadowed declaration is here
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 87e10a7b9a97c951ab4d477f61177779ac0a6a66
+Author: Kusanagi Kouichi <slash@ac.auone-net.jp>
+Date: Wed Dec 14 02:17:55 2011 -0500
+
+ XQueryColors: Split a request into multiple requests if necessary
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=9160
+
+ Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit d3b3570592e9b9e57f270a0bd86762fd205a2833
+Author: Andreas Wettstein <wettstein509@solnet.ch>
+Date: Tue Nov 8 20:18:09 2011 +0000
+
+ XIM: Allow modifier releases in compose sequences (#26705)
+
+ Currently, only non-modifier keys (actually, keysyms) can be part of a compose
+ sequence, and they are matched against the defined compose sequences at the
+ time the key is pressed. The patch allows to use modifier keys an well, but
+ matches them on key release, and only if no other key has been pressed after
+ the modifier.
+
+ Releasing a non-matched modifier during an ongoing compose sequence only aborts
+ the sequence if any modifier release would have matched. In particular, if no
+ compose sequences with modifiers are specified, the compose mechanism works
+ exactly as without this patch.
+
+ Even if modifiers are part of a compose sequence, they are not filtered. This
+ is because modifiers affect the keyboard state no matter what we do here and,
+ therefore, filtering them only could confuse clients.
+
+ The purpose is this extension to the compose mechanism is to allow to make
+ better use of keys in convenient reach for touch typing.
+
+ Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 56448a626fc90bcf75a1fa2f4c294b0eb1f23bd6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Nov 29 23:56:57 2011 -0800
+
+ Reject negative string counts in copy_string_list
+
+ Silences parfait warning of a potential memory leak:
+ Memory leak of pointer 'dst' allocated with malloc(length)
+ at line 160 of FSWrap.c in function 'copy_string_list'.
+ 'dst' allocated at line 145 with malloc(length).
+ dst leaks when count <= 0 at line 154.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit bf2d7c8c6d70539c72560b1921e18df2610acf29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 11 14:56:36 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index eb1a28f..60987a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libx11 (2:1.4.99.901-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate (1.5 RC1)
+ - XQueryColors: split a request into multiple requests if necessary
+ (closes: #278984)
+ - Revert "xcb: Add TCP fallback" (closes: #659558)
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2012 22:20:57 +0200
+
libx11 (2:1.4.99.1-1) experimental; urgency=low
[ Julien Cristau ]
commit abc523fce31fcf2687229697a8eb656e343ecb0c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 15 22:14:45 2012 -0700
libX11 1.4.99.901 (1.5 RC1)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c1f64b6..aaec968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.99.1],
+AC_INIT([libX11], [1.4.99.901],
[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 b2cc5905a4a6d519957223e8ba2caef71520040c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 15 22:03:21 2012 -0700
Remove "register" qualifier that annoys Solaris Studio compiler
Fixes warning:
"Xrm.c", line 1094: warning: storage class after type is obsolescent
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Xrm.c b/src/Xrm.c
index 53467ae..d6899d9 100644
--- a/src/Xrm.c
+++ b/src/Xrm.c
@@ -1091,7 +1091,7 @@ static void GetIncludeFile(
static void GetDatabase(
XrmDatabase db,
- _Xconst register char *str,
+ _Xconst char *str,
_Xconst char *filename,
Bool doall)
{
commit 62d42953893f93a98db0504eaf06d650ceaf5811
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Mar 14 17:25:46 2012 -0400
Fix the gtk+ additions
(Some of) the Dstroke and dstroke entries already were present as U011[01],
even though XK_Dstroke and XK_dstroke are part of the latin2 set in keysymdef.h.
The addition of <Multi_key> <o> <apostrophe> as a postfix version of
<Multi_key> <apostrophe> <o> blocks the existing entries for ǻ and Ǻ.
That prevents its and <Multi_key> <O> <apostrophe>’s addition.
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 1f72ae2..2eae912 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -647,7 +647,6 @@ 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
@@ -773,7 +772,6 @@ 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
@@ -878,12 +876,6 @@ XCOMM Part 3
<Multi_key> <D> <less> : "Ď" U010E # LATIN CAPITAL LETTER D WITH CARON
<dead_caron> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <c> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
-<dead_stroke> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <slash> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<dead_stroke> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <slash> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <less> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <d> <less> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<dead_stroke> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
commit 91bcce48d94792f78333d2aea73961cc2e739d2e
Author: Pander <pander@users.sourceforge.net>
Date: Wed Mar 14 12:54:53 2012 -0400
Complete compose key sequences for musical symbols
Signed-off-by: Pander <pander@users.sourceforge.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index c0de8fa..1f72ae2 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -232,6 +232,10 @@ XCOMM Dashes
<Multi_key> <minus> <minus> <minus> : "—" U2014 # EM DASH
XCOMM Musical alterations
+<Multi_key> <numbersign> <q> : "♩" U2669 # QUARTER NOTE
+<Multi_key> <numbersign> <e> : "♪" U266a # EIGHTH NOTE
+<Multi_key> <numbersign> <E> : "♫" U266b # BEAMED EIGHTH NOTES
+<Multi_key> <numbersign> <S> : "♬" U266c # BEAMED SIXTEENTH NOTES
<Multi_key> <numbersign> <b> : "♭" U266d # MUSIC FLAT SIGN
<Multi_key> <numbersign> <f> : "♮" U266e # MUSIC NATURAL SIGN
<Multi_key> <numbersign> <numbersign> : "♯" U266f # MUSIC SHARP SIGN
commit cf040016d455bc37f7665d6714337c5eafd8ea94
Author: Pander <pander@users.sourceforge.net>
Date: Wed Mar 14 12:46:25 2012 -0400
Add compose sequences from gtk+ to X.Org
Signed-off-by: Pander <pander@users.sourceforge.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 057f621..c0de8fa 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -9,6 +9,7 @@ XCOMM Spacing versions of dead accents
<dead_tilde> <dead_tilde> : "~" asciitilde # TILDE
<dead_acute> <space> : "'" apostrophe # APOSTROPHE
<dead_acute> <dead_acute> : "´" acute # ACUTE ACCENT
+<Multi_key> <apostrophe> <apostrophe> : "´" acute # ACUTE ACCENT
<dead_grave> <space> : "`" grave # GRAVE ACCENT
<dead_grave> <dead_grave> : "`" grave # GRAVE ACCENT
<dead_circumflex> <space> : "^" asciicircum # CIRCUMFLEX ACCENT
@@ -17,22 +18,32 @@ XCOMM Spacing versions of dead accents
<dead_abovering> <dead_abovering> : "°" degree # DEGREE SIGN
<dead_macron> <space> : "¯" macron # MACRON
<dead_macron> <dead_macron> : "¯" macron # MACRON
+<Multi_key> <minus> <asciicircum> : "¯" macron # MACRON
+<Multi_key> <asciicircum> <minus> : "¯" macron # MACRON
+<Multi_key> <underscore> <underscore> : "¯" macron # MACRON
+<Multi_key> <underscore> <asciicircum> : "¯" macron # MACRON
<dead_breve> <space> : "˘" breve # BREVE
<dead_breve> <dead_breve> : "˘" breve # BREVE
+<Multi_key> <space> <parenleft> : "˘" breve # BREVE
+<Multi_key> <parenleft> <space> : "˘" breve # BREVE
<dead_abovedot> <space> : "˙" abovedot # DOT ABOVE
<dead_abovedot> <dead_abovedot> : "˙" abovedot # DOT ABOVE
<dead_diaeresis> <dead_diaeresis> : "¨" diaeresis # DIAERESIS
+<Multi_key> <quotedbl> <quotedbl> : "¨" diaeresis # DIAERESIS
<dead_diaeresis> <space> : "\"" quotedbl # REVERSE SOLIDUS
<dead_doubleacute> <space> : "˝" U2dd # DOUBLE ACUTE ACCENT
<dead_doubleacute> <dead_doubleacute> : "˝" U2dd # DOUBLE ACUTE ACCENT
<dead_caron> <space> : "ˇ" caron # CARON
<dead_caron> <dead_caron> : "ˇ" caron # CARON
+<Multi_key> <space> <less> : "ˇ" caron # CARON
+<Multi_key> <less> <space> : "ˇ" caron # CARON
<dead_cedilla> <space> : "¸" cedilla # CEDILLA
<dead_cedilla> <dead_cedilla> : "¸" cedilla # CEDILLA
<dead_ogonek> <space> : "˛" ogonek # OGONEK
<dead_ogonek> <dead_ogonek> : "˛" ogonek # OGONEK
<dead_iota> <space> : "ͺ" U37a # GREEK YPOGEGRAMMENI
<dead_iota> <dead_iota> : "ͺ" U37a # GREEK YPOGEGRAMMENI
+<Multi_key> <minus> <minus> <space> : "" U00ad # SOFT HYPHEN
XCOMM ASCII characters that may be difficult to access
@@ -57,6 +68,7 @@ XCOMM on some keyboards.
<Multi_key> <comma> <space> : "¸" cedilla # CEDILLA
<Multi_key> <space> <comma> : "¸" cedilla # CEDILLA
+<Multi_key> <comma> <comma> : "¸" cedilla # CEDILLA
<Multi_key> <parenleft> <minus> : "{" braceleft # LEFT CURLY BRACKET
<Multi_key> <minus> <parenleft> : "{" braceleft # LEFT CURLY BRACKET
@@ -84,22 +96,28 @@ XCOMM Spaces
<Multi_key> <o> <C> : "©" copyright # COPYRIGHT SIGN
<Multi_key> <O> <c> : "©" copyright # COPYRIGHT SIGN
<Multi_key> <O> <C> : "©" copyright # COPYRIGHT SIGN
+<Multi_key> <C> <o> : "©" copyright # COPYRIGHT SIGN
+<Multi_key> <C> <O> : "©" copyright # COPYRIGHT SIGN
<Multi_key> <o> <r> : "®" registered # REGISTERED SIGN
<Multi_key> <o> <R> : "®" registered # REGISTERED SIGN
<Multi_key> <O> <r> : "®" registered # REGISTERED SIGN
<Multi_key> <O> <R> : "®" registered # REGISTERED SIGN
+<Multi_key> <R> <O> : "®" registered # REGISTERED SIGN
<Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
<Multi_key> <period> <less> : "‹" U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
<Multi_key> <period> <period> : "…" ellipsis # HORIZONTAL ELLIPSIS
<Multi_key> <period> <minus> : "·" periodcentered # MIDDLE DOT
+<Multi_key> <period> <asciicircum> : "·" periodcentered # MIDDLE DOT
+<Multi_key> <asciicircum> <period> : "·" periodcentered # MIDDLE DOT
<Multi_key> <period> <equal> : "•" enfilledcircbullet # BULLET
<Multi_key> <exclam> <asciicircum> : "¦" brokenbar # BROKEN BAR
<Multi_key> <exclam> <exclam> : "¡" exclamdown # INVERTED EXCLAMATION MARK
<Multi_key> <p> <exclam> : "¶" paragraph # PILCROW SIGN
<Multi_key> <P> <exclam> : "¶" paragraph # PILCROW SIGN
<Multi_key> <plus> <minus> : "±" plusminus # PLUS-MINUS SIGN
+<Multi_key> <minus> <plus> : "±" plusminus # PLUS-MINUS SIGN
<Multi_key> <question> <question> : "¿" questiondown # INVERTED QUESTION MARK
<Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
@@ -120,10 +138,10 @@ XCOMM Spaces
<Multi_key> <i> <j> : "ij" U0133 # LATIN SMALL LIGATURE IJ
<Multi_key> <o> <o> : "°" degree # DEGREE SIGN
+<Multi_key> <asterisk> <0> : "°" degree # DEGREE SIGN
+<Multi_key> <0> <asterisk> : "°" degree # DEGREE SIGN
XCOMM Quotation marks
-<Multi_key> <quotedbl> <backslash> : "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK
-<Multi_key> <quotedbl> <slash> : "〞" U301e # DOUBLE PRIME QUOTATION MARK
<Multi_key> <less> <less> : "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
<Multi_key> <greater> <greater> : "»" guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
<Multi_key> <less> <apostrophe> : "‘" U2018 # LEFT SINGLE QUOTATION MARK
@@ -159,7 +177,8 @@ XCOMM Currencies
<Multi_key> <W> <equal> : "₩" U20a9 # WON SIGN
<Multi_key> <equal> <W> : "₩" U20a9 # WON SIGN
XCOMM "₪" U20aa NEW SHEQEL SIGN
-<Multi_key> <d> <minus> : "₫" U20ab # DONG SIGN
+<Multi_key> <d> <equal> : "₫" U20ab # DONG SIGN
+<Multi_key> <equal> <d> : "₫" U20ab # DONG SIGN
<Multi_key> <C> <equal> : "€" EuroSign # EURO SIGN
<Multi_key> <equal> <C> : "€" EuroSign # EURO SIGN
<Multi_key> <c> <equal> : "€" EuroSign # EURO SIGN
@@ -197,6 +216,10 @@ XCOMM "₵" U20b5 CEDI SIGN
<Multi_key> <y> <equal> : "¥" yen # YEN SIGN
<Multi_key> <equal> <Y> : "¥" yen # YEN SIGN
<Multi_key> <equal> <y> : "¥" yen # YEN SIGN
+<Multi_key> <Y> <minus> : "¥" yen # YEN SIGN
+<Multi_key> <minus> <Y> : "¥" yen # YEN SIGN
+<Multi_key> <y> <minus> : "¥" yen # YEN SIGN
+<Multi_key> <minus> <y> : "¥" yen # YEN SIGN
XCOMM Long S
<Multi_key> <f> <s> : "ſ" U017f # LATIN SMALL LETTER LONG S
@@ -216,10 +239,20 @@ XCOMM Musical alterations
XCOMM Other symbols
<Multi_key> <s> <o> : "§" section # SECTION SIGN
<Multi_key> <o> <s> : "§" section # SECTION SIGN
+<Multi_key> <S> <O> : "§" section # SECTION SIGN
+<Multi_key> <O> <S> : "§" section # SECTION SIGN
+<Multi_key> <s> <exclam> : "§" section # SECTION SIGN
+<Multi_key> <S> <exclam> : "§" section # SECTION SIGN
<Multi_key> <Cyrillic_pe> <Cyrillic_a> : "§" section # SECTION SIGN
<Multi_key> <o> <x> : "¤" currency # CURRENCY SIGN
<Multi_key> <x> <o> : "¤" currency # CURRENCY SIGN
+<Multi_key> <o> <X> : "¤" currency # CURRENCY SIGN
+<Multi_key> <X> <o> : "¤" currency # CURRENCY SIGN
+<Multi_key> <O> <X> : "¤" currency # CURRENCY SIGN
+<Multi_key> <X> <O> : "¤" currency # CURRENCY SIGN
+<Multi_key> <O> <x> : "¤" currency # CURRENCY SIGN
+<Multi_key> <x> <O> : "¤" currency # CURRENCY SIGN
<Multi_key> <P> <P> : "¶" paragraph # PILCROW SIGN
@@ -494,15 +527,34 @@ XCOMM Part 3
<Multi_key> <asciicircum> <KP_Space> : "²" twosuperior # SUPERSCRIPT TWO
<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
Reply to: