diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-11 19:18:57 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-11 19:18:57 +0000 |
| commit | 1192c18bbb027514acbd274fd03ef6333253e7bb (patch) | |
| tree | 420882e0eb92f59e72605ab2bf65b43111ac4c9d /lib | |
| parent | f8f894ec6dea2f382b1f038bd4dfb96d5f9722fd (diff) | |
Update to libX11 1.5.0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libX11/AUTHORS | 5 | ||||
| -rw-r--r-- | lib/libX11/ChangeLog | 175 | ||||
| -rw-r--r-- | lib/libX11/aclocal.m4 | 16 | ||||
| -rw-r--r-- | lib/libX11/configure | 80 | ||||
| -rw-r--r-- | lib/libX11/configure.ac | 10 | ||||
| -rw-r--r-- | lib/libX11/nls/en_US.UTF-8/Compose.pre | 213 | ||||
| -rw-r--r-- | lib/libX11/specs/XKB/acknowledgement.xml | 14 | ||||
| -rw-r--r-- | lib/libX11/specs/i18n/localedb/localedb.xml | 4 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/AppC.xml | 97 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/AppD.xml | 4 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH01.xml | 5 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH03.xml | 2 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH04.xml | 6 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH06.xml | 5 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH08.xml | 4 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH09.xml | 3 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH10.xml | 6 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH12.xml | 2 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/CH14.xml | 10 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/credits.xml | 10 | ||||
| -rw-r--r-- | lib/libX11/specs/libX11/glossary.xml | 4 | ||||
| -rw-r--r-- | lib/libX11/src/XlibInt.c | 2 |
22 files changed, 556 insertions, 121 deletions
diff --git a/lib/libX11/AUTHORS b/lib/libX11/AUTHORS index 5b621efb8..58a3acc39 100644 --- a/lib/libX11/AUTHORS +++ b/lib/libX11/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/lib/libX11/ChangeLog b/lib/libX11/ChangeLog index 09a519abe..4e2cda92a 100644 --- a/lib/libX11/ChangeLog +++ b/lib/libX11/ChangeLog @@ -1,3 +1,178 @@ +commit 6c5cb2a90a6479f56855e5167039c37c234cdfe7 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Jun 1 23:37:09 2012 -0700 + + libX11 1.5.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 05c587ec3be880721131a17c1dd4366e458fdd8b +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + +commit d817834d9772e3500d5102e2eae868b04a33c31f +Author: Pander <pander@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.coopersmith@oracle.com> + +commit 6bfd1dca6e7cb2046ee6bf9dbbddc0af5ef7cc00 +Author: Pander <pander@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.coopersmith@oracle.com> + +commit 3a8b1637132d1e36eb5e11f52dfb284081772d14 +Author: Pander <pander@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.coopersmith@oracle.com> + +commit fd514d7a35119dd4413b51c84f2a536f2ca501a6 +Author: Pander <pander@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.coopersmith@oracle.com> + +commit 1b5cad3ca54410c4edbca79c23c463e9e088bc0d +Author: Pander <pander@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.coopersmith@oracle.com> + +commit 0bbc0d5e605e2a4a3eb00a229b651d4546e8aef4 +Author: James Cloos <cloos@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 <cloos@jhcloos.com> + +commit e51e37c118ae6cb9ced8244ce1c410677e0279ce +Author: Geoff Streeter <geoff@dyalog.com> +Date: Thu Mar 22 15:02:00 2012 +0000 + + Add APL support to compose + + Signed-off-by: Geoff Streeter <geoff@dyalog.com> + Signed-off-by: James Cloos <cloos@jhcloos.com> + +commit dac90324cee224df977a428afe80d960dceca769 +Author: Julien Cristau <jcristau@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 <jcristau@debian.org> + +commit f5b50af4324186962e258ffe9be78d5ee4681982 +Author: Julien Cristau <jcristau@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 <jcristau@debian.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 52e1b5cc3b6de76ccf4285b55652474a522ed9a8 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Apr 30 16:36:47 2012 +1000 + + Typo fix + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit b64969f0e510d5d3300cf968741a3726a6409577 +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + +commit 9ea611696f317ac3b3fb67893f1d6d87d49e3b5e +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + +commit b3c1b8cdab7d14220426c9b997ac362dc16318fc +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + +commit ebebb65e753007ad01966dccc90bd6ca9a826488 +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + Acked-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit d5ab4ae0e74ae1fb30fb72add0751effe2759bf2 +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + Acked-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 83878a0e34fffd255597300dd3e6cd43fcd645b0 +Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com> + commit abc523fce31fcf2687229697a8eb656e343ecb0c Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Thu Mar 15 22:14:45 2012 -0700 diff --git a/lib/libX11/aclocal.m4 b/lib/libX11/aclocal.m4 index 0fcdf7076..8c760803a 100644 --- a/lib/libX11/aclocal.m4 +++ b/lib/libX11/aclocal.m4 @@ -2877,9 +2877,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[ fi # Needs to come after above checks for libsocket & libnsl for SVR4 systems - AC_ARG_ENABLE(ipv6, + AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]), - [IPV6CONN=$enableval], + [IPV6CONN=$enableval], [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) AC_MSG_CHECKING([if IPv6 support should be built]) if test "$IPV6CONN" = "yes"; then @@ -2888,7 +2888,7 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[ AC_MSG_RESULT($IPV6CONN) # 4.3BSD-Reno added a new member to struct sockaddr_in - AC_CHECK_MEMBER([struct sockaddr_in.sin_len], + AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE([BSD44SOCKETS],1, [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ #include <sys/types.h> @@ -2900,7 +2900,7 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[ AC_CHECK_TYPES([socklen_t], [], [], [ AC_INCLUDES_DEFAULT #include <sys/socket.h>]) - + ]) # XTRANS_TCP_FLAGS # XTRANS_CONNECTION_FLAGS() @@ -2922,7 +2922,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) fi AC_MSG_RESULT($UNIXCONN) - AC_ARG_ENABLE(tcp-transport, + AC_ARG_ENABLE(tcp-transport, AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), [TCPCONN=$enableval], [TCPCONN=yes]) AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) @@ -2943,7 +2943,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ if test "$LOCALCONN" = "yes"; then AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) fi - + ]) # XTRANS_CONNECTION_FLAGS @@ -2953,7 +2953,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ # so that any necessary networking libraries are already found AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], [AC_REQUIRE([XTRANS_TCP_FLAGS]) - AC_ARG_ENABLE(secure-rpc, + AC_ARG_ENABLE(secure-rpc, AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), [SECURE_RPC=$enableval], [SECURE_RPC="try"]) @@ -2964,7 +2964,7 @@ AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], if test "x$FOUND_SECURE_RPC" = "xno" ; then if test "x$SECURE_RPC" = "xyes" ; then AC_MSG_ERROR([Secure RPC requested, but required functions not found]) - fi + fi SECURE_RPC="no" else dnl FreeBSD keeps getsecretkey in librpcsvc diff --git a/lib/libX11/configure b/lib/libX11/configure index f229aa0cf..205a28d1a 100644 --- a/lib/libX11/configure +++ b/lib/libX11/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libX11 1.4.99.901. +# Generated by GNU Autoconf 2.62 for libX11 1.5.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -676,8 +676,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.4.99.901' -PACKAGE_STRING='libX11 1.4.99.901' +PACKAGE_VERSION='1.5.0' +PACKAGE_STRING='libX11 1.5.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1533,7 +1533,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libX11 1.4.99.901 to adapt to many kinds of systems. +\`configure' configures libX11 1.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1603,7 +1603,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.4.99.901:";; + short | recursive ) echo "Configuration of libX11 1.5.0:";; esac cat <<\_ACEOF @@ -1762,7 +1762,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.4.99.901 +libX11 configure 1.5.0 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1776,7 +1776,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libX11 $as_me 1.4.99.901, which was +It was created by libX11 $as_me 1.5.0, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -4367,7 +4367,7 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.4.99.901' + VERSION='1.5.0' cat >>confdefs.h <<_ACEOF @@ -25502,6 +25502,60 @@ done # Used in lcFile.c (see also --enable-xlocaledir settings below) XLOCALEDIR_IS_SAFE="no" +{ $as_echo "$as_me:$LINENO: checking whether issetugid is declared" >&5 +$as_echo_n "checking whether issetugid is declared... " >&6; } +if test "${ac_cv_have_decl_issetugid+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef issetugid + (void) issetugid; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_issetugid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_issetugid=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_issetugid" >&5 +$as_echo "$ac_cv_have_decl_issetugid" >&6; } + { $as_echo "$as_me:$LINENO: checking for issetugid" >&5 $as_echo_n "checking for issetugid... " >&6; } if test "${ac_cv_func_issetugid+set}" = set; then @@ -25587,15 +25641,15 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_func_issetugid" >&5 $as_echo "$ac_cv_func_issetugid" >&6; } -if test $ac_cv_func_issetugid = yes; then - XLOCALEDIR_IS_SAFE="yes" + +if test "$ac_cv_have_decl_issetugid" = yes && test "$ac_cv_func_issetugid" = yes; then + XLOCALEDIR_IS_SAFE="yes" cat >>confdefs.h <<\_ACEOF #define HASSETUGID 1 _ACEOF fi - { $as_echo "$as_me:$LINENO: checking for getresuid" >&5 $as_echo_n "checking for getresuid... " >&6; } if test "${ac_cv_func_getresuid+set}" = set; then @@ -28006,7 +28060,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libX11 $as_me 1.4.99.901, which was +This file was extended by libX11 $as_me 1.5.0, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28059,7 +28113,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libX11 config.status 1.4.99.901 +libX11 config.status 1.5.0 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac index aaec96810..48a0c8ab9 100644 --- a/lib/libX11/configure.ac +++ b/lib/libX11/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libX11], [1.4.99.901], +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]) @@ -223,8 +223,12 @@ 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]) +if test "$ac_cv_have_decl_issetugid" = yes && test "$ac_cv_func_issetugid" = yes; then + XLOCALEDIR_IS_SAFE="yes" + AC_DEFINE(HASSETUGID,1,[Has issetugid() function]) +fi AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"] AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions])) # Used in Font.c diff --git a/lib/libX11/nls/en_US.UTF-8/Compose.pre b/lib/libX11/nls/en_US.UTF-8/Compose.pre index 2eae91239..bf6599af0 100644 --- a/lib/libX11/nls/en_US.UTF-8/Compose.pre +++ b/lib/libX11/nls/en_US.UTF-8/Compose.pre @@ -532,22 +532,12 @@ 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 <Multi_key> <slash> <u> : "µ" mu # MICRO SIGN <Multi_key> <u> <slash> : "µ" mu # MICRO SIGN <dead_circumflex> <1> : "¹" onesuperior # SUPERSCRIPT ONE @@ -555,10 +545,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 @@ -581,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 @@ -638,8 +622,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 @@ -647,6 +629,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 @@ -655,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 @@ -707,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 @@ -763,8 +742,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 @@ -772,6 +749,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 @@ -780,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 @@ -825,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 @@ -1082,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 @@ -1458,7 +1444,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 +1452,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 @@ -5830,3 +5814,176 @@ 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> <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> <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> <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 +<Multi_key> <U2229> <U2218> : "⍝" U235d # ∩ ∘ APL FUNCTIONAL SYMBOL UP SHOE JOT +<Multi_key> <U2395> <apostrophe> : "⍞" U235e # * ¨ APL FUNCTIONAL SYMBOL QUOTE QUAD +<Multi_key> <apostrophe> <U2395> : "⍞" U235e # ¨ * APL FUNCTIONAL SYMBOL QUOTE QUAD +<Multi_key> <U25cb> <asterisk> : "⍟" U235f # ○ * APL FUNCTIONAL SYMBOL CIRCLE STAR +<Multi_key> <asterisk> <U25cb> : "⍟" U235f # * ○ APL FUNCTIONAL SYMBOL CIRCLE STAR +<Multi_key> <colon> <U2395> : "⍠" U2360 # : ⎕ APL FUNCTIONAL SYMBOL QUAD COLON +<Multi_key> <U2395> <colon> : "⍠" U2360 # ⎕ : APL FUNCTIONAL SYMBOL QUAD COLON +<Multi_key> <diaeresis> <U22a4> : "⍡" U2361 # ¨ ⊤ APL FUNCTIONAL SYMBOL UP TACK DIAERESIS +<Multi_key> <U22a4> <diaeresis> : "⍡" U2361 # ⊤ ¨ APL FUNCTIONAL SYMBOL UP TACK DIAERESIS +<Multi_key> <diaeresis> <U2207> : "⍢" U2362 # ¨ ∇ APL FUNCTIONAL SYMBOL DEL DIAERESIS +<Multi_key> <U2207> <diaeresis> : "⍢" U2362 # ∇ ¨ APL FUNCTIONAL SYMBOL DEL DIAERESIS +<Multi_key> <asterisk> <diaeresis> : "⍣" U2363 # * ¨ APL FUNCTIONAL SYMBOL STAR DIAERESIS +<Multi_key> <diaeresis> <asterisk> : "⍣" U2363 # ¨ * APL FUNCTIONAL SYMBOL STAR DIAERESIS +<Multi_key> <U2218> <diaeresis> : "⍤" U2364 # ∘ ¨ APL FUNCTIONAL SYMBOL JOT DIAERESIS +<Multi_key> <diaeresis> <U2218> : "⍤" U2364 # ¨ ∘ APL FUNCTIONAL SYMBOL JOT DIAERESIS +<Multi_key> <U25cb> <diaeresis> : "⍥" U2365 # ○ ¨ APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS +<Multi_key> <diaeresis> <U25cb> : "⍥" U2365 # ¨ ○ APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS +<Multi_key> <U222a> <bar> : "⍦" U2366 # ∪ | APL FUNCTIONAL SYMBOL DOWN SHOE STILE +<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> <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> <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 +<Multi_key> <asciitilde> <0> : "⍬" U236c # ~ 0 APL FUNCTIONAL SYMBOL ZILDE +<Multi_key> <bar> <asciitilde> : "⍭" U236d # | ~ APL FUNCTIONAL SYMBOL STILE TILDE +<Multi_key> <asciitilde> <bar> : "⍭" U236d # ~ | APL FUNCTIONAL SYMBOL STILE TILDE +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> <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 +<Multi_key> <question> <U2395> : "⍰" U2370 # ? ⎕ APL FUNCTIONAL SYMBOL QUAD QUESTION +<Multi_key> <U2395> <question> : "⍰" U2370 # ⎕ ? APL FUNCTIONAL SYMBOL QUAD QUESTION +<Multi_key> <U2228> <asciitilde> : "⍱" U2371 # ∨ ~ APL FUNCTIONAL SYMBOL DOWN CARET TILDE +<Multi_key> <asciitilde> <U2228> : "⍱" U2371 # ~ ∨ APL FUNCTIONAL SYMBOL DOWN CARET TILDE +<Multi_key> <U2227> <asciitilde> : "⍲" U2372 # ∧ ~ APL FUNCTIONAL SYMBOL UP CARET TILDE +<Multi_key> <asciitilde> <U2227> : "⍲" U2372 # ~ ∧ APL FUNCTIONAL SYMBOL UP CARET TILDE +<Multi_key> <U237a> <underscore> : "⍶" U2376 # ⍺ _ APL FUNCTIONAL SYMBOL ALPHA UNDERBAR +<Multi_key> <underscore> <U237a> : "⍶" U2376 # _ ⍺ APL FUNCTIONAL SYMBOL ALPHA UNDERBAR +<Multi_key> <U220a> <underscore> : "⍷" U2377 # ∊ _ APL FUNCTIONAL SYMBOL EPSILON UNDERBAR +<Multi_key> <underscore> <U220a> : "⍷" U2377 # _ ∊ APL FUNCTIONAL SYMBOL EPSILON UNDERBAR +<Multi_key> <U2373> <underscore> : "⍸" U2378 # ⍳ _ APL FUNCTIONAL SYMBOL IOTA UNDERBAR +<Multi_key> <underscore> <U2373> : "⍸" U2378 # _ ⍳ APL FUNCTIONAL SYMBOL IOTA UNDERBAR +<Multi_key> <U2375> <underscore> : "⍹" U2379 # ⍵ _ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR +<Multi_key> <underscore> <U2375> : "⍹" U2379 # _ ⍵ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR diff --git a/lib/libX11/specs/XKB/acknowledgement.xml b/lib/libX11/specs/XKB/acknowledgement.xml index 2977999c4..4ecb798c1 100644 --- a/lib/libX11/specs/XKB/acknowledgement.xml +++ b/lib/libX11/specs/XKB/acknowledgement.xml @@ -24,12 +24,20 @@ not only for the quality of this document, but for the quality of the Keyboard extension itself. </para> <para> +<literallayout> Matt Landau -</para> -<para> Manager, X Window System +X Consortium Inc. +</literallayout> </para> +<simplesect> +<title>X Version 11, Release 7 addendum</title> <para> -X Consortium Inc. +This document is made available to you in modern formats such as HTML and PDF +thanks to the efforts of Matt Dew, who converted the original troff sources to +DocBook/XML and edited them into shape; Fernando Carrijo, who converted the +images to SVG format; and Gaetan Nadon, who set up the formatting machinery in +the libX11 builds and performed further editing of the DocBook markup. </para> +</simplesect> </preface> diff --git a/lib/libX11/specs/i18n/localedb/localedb.xml b/lib/libX11/specs/i18n/localedb/localedb.xml index caacd82d5..ed9000769 100644 --- a/lib/libX11/specs/i18n/localedb/localedb.xml +++ b/lib/libX11/specs/i18n/localedb/localedb.xml @@ -422,7 +422,7 @@ for this fontset. The format of value is; <para> For detail definition of CHARSET_REGISTRY-CHARSET_ENCODING, refer -"X Logical Font Descriptions" document. +to the <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> document. </para> <literallayout> example: @@ -778,7 +778,7 @@ END XLC_XLOCALE [1] <emphasis remap='I'>ISO/IEC 9899:1990 C Language Standard</emphasis> </para> <para> -[2] <emphasis remap='I'>X Logical Font Descriptions</emphasis> +[2] <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> </para> </sect1> diff --git a/lib/libX11/specs/libX11/AppC.xml b/lib/libX11/specs/libX11/AppC.xml index c2e7f54fb..df250275e 100644 --- a/lib/libX11/specs/libX11/AppC.xml +++ b/lib/libX11/specs/libX11/AppC.xml @@ -37,9 +37,9 @@ and should use minor opcodes to distinguish the requests. <!-- .LP --> The symbols and macros used for writing stubs to Xlib are listed in <filename class="headerfile"><X11/Xlibint.h></filename>. -<!-- .SH --> -Basic Protocol Support Routines </para> +<sect1 id="Basic_Protocol_Support_Routines"> +<title>Basic Protocol Support Routines</title> <para> The basic protocol requests for extensions are <xref linkend='XQueryExtension' xrefstyle='select: title'/> @@ -202,9 +202,10 @@ The <xref linkend='XFreeExtensionList' xrefstyle='select: title'/> function frees the memory allocated by <xref linkend='XListExtensions' xrefstyle='select: title'/>. -<!-- .SH --> -Hooking into Xlib </para> +</sect1> +<sect1 id="Hooking_into_Xlib"> +<title>Hooking into Xlib</title> <para> <!-- .LP --> These functions allow you to hook into the library. @@ -350,9 +351,9 @@ function allocates the structure, bumps the extension number count, and chains the extension onto the extension list. (This permits extensions to Xlib without requiring server extensions.) -<!-- .SH --> -Hooks into the Library </para> +<sect2 id="Hooks_into_the_Library"> +<title>Hooks into the Library</title> <para> <!-- .LP --> These functions allow you to define procedures that are to be @@ -1536,9 +1537,10 @@ The data argument specifies a portion of the outgoing data buffer, and its length in bytes is specified by the len argument. Your procedure must not alter the contents of the data and must not do additional protocol requests to the same display. -<!-- .SH --> -Hooks onto Xlib Data Structures </para> +</sect2> +<sect2 id="Hooks_onto_Xlib_Data_Structures"> +<title>Hooks onto Xlib Data Structures</title> <para> <!-- .LP --> Various Xlib data structures have provisions for extension procedures @@ -1817,9 +1819,11 @@ To correctly handle automatic reuse of resource IDs, you must call <xref linkend='XAllocIDs' xrefstyle='select: title'/> when requesting multiple resource IDs. This call might generate protocol requests. -<!-- .SH --> -GC Caching </para> +</sect2> +</sect1> +<sect1 id="GC_Caching"> +<title>GC Caching</title> <para> <!-- .LP --> GCs are cached by the library to allow merging of independent change @@ -1922,12 +1926,11 @@ Specifies the GC. </listitem> </varlistentry> </variablelist> -<para> <!-- .LP --> <!-- .eM --> -<!-- .SH --> -Graphics Batching -</para> +</sect1> +<sect1 id="Graphics_Batching"> +<title>Graphics Batching</title> <para> <!-- .LP --> If you extend X to add more poly graphics primitives, you may be able to @@ -2010,9 +2013,10 @@ Note that <xref linkend='FlushGC' xrefstyle='select: title'/> is called <emphasis remap='I'>before</emphasis> picking up the value of last_req, because it may modify this field. -<!-- .SH --> -Writing Extension Stubs </para> +</sect1> +<sect1 id="Writing_Extension_Stubs"> +<title>Writing Extension Stubs</title> <para> <!-- .LP --> All X requests always contain the length of the request, @@ -2023,10 +2027,11 @@ Some servers may not support single requests of such a length. The value of dpy->max_request_size contains the maximum length as defined by the server implementation. For further information, -see ``X Window System Protocol.'' -<!-- .SH --> -Requests, Replies, and Xproto.h +see <olink targetdoc='x11protocol' targetptr='Maximum-request-length' +><citetitle>X Window System Protocol</citetitle></olink>. </para> +<sect2 id="Requests_Replies_and_Xproto.h"> +<title>Requests, Replies, and Xproto.h</title> <para> <!-- .LP --> The @@ -2068,9 +2073,10 @@ that looks similar to this: In your extension header file, this will be a minor opcode, instead of a major opcode. -<!-- .SH --> -Request Format </para> +</sect2> +<sect2 id="Request_Format"> +<title>Request Format</title> <para> <!-- .LP --> Every request contains an 8-bit major opcode and a 16-bit length field @@ -2269,9 +2275,10 @@ Instead, they use the <structname>xGenericReply</structname> structure, which contains only a type, length, and sequence number (and sufficient padding to make it 32 bytes long). -<!-- .SH --> -Starting to Write a Stub Procedure </para> +</sect2> +<sect2 id="Starting_to_Write_a_Stub_Procedure"> +<title>Starting to Write a Stub Procedure</title> <para> <!-- .LP --> An Xlib stub procedure should start like this: @@ -2299,9 +2306,10 @@ The following is an example: <programlisting> xDoSomethingReply rep; </programlisting> -<!-- .SH --> -Locking Data Structures </para> +</sect2> +<sect2 id="Locking_Data_Structures"> +<title>Locking Data Structures</title> <para> <!-- .LP --> To lock the display structure for systems that @@ -2343,12 +2351,11 @@ Specifies the connection to the X server. </listitem> </varlistentry> </variablelist> -<para> <!-- .LP --> <!-- .eM --> -<!-- .SH --> -Sending the Protocol Request and Arguments -</para> +</sect2> +<sect2 id="Sending_the_Protocol_Request_and_Arguments"> +<title>Sending the Protocol Request and Arguments</title> <para> <!-- .LP --> After the variable declarations, @@ -2462,9 +2469,10 @@ which is the same as except that it takes an additional argument (the number of extra bytes to allocate in the output buffer after the request structure). This number should always be a multiple of four. -<!-- .SH --> -Variable Length Arguments </para> +</sect2> +<sect2 id="Variable_Length_Arguments"> +<title>Variable Length Arguments</title> <para> <!-- .LP --> Some protocol requests take additional variable-length data that @@ -2544,9 +2552,10 @@ copying it into the output buffer (which would later be flushed anyway by the following call on <xref linkend='_XReply' xrefstyle='select: title'/>), it is faster. -<!-- .SH --> -Replies </para> +</sect2> +<sect2 id="Replies"> +<title>Replies</title> <para> <!-- .LP --> If the protocol request has a reply, @@ -2995,9 +3004,10 @@ reads and discards up to three additional pad bytes. Each protocol request is a little different. For further information, see the Xlib sources for examples. -<!-- .SH --> -Synchronous Calling </para> +</sect2> +<sect2 id="Synchronous_Calling"> +<title>Synchronous Calling</title> <para> <!-- .LP --> Each procedure should have a call, just before returning to the user, @@ -3008,9 +3018,10 @@ If synchronous mode is enabled (see the request is sent immediately. The library, however, waits until any error the procedure could generate at the server has been handled. -<!-- .SH --> -Allocating and Deallocating Memory </para> +</sect2> +<sect2 id="Allocating_and_Deallocating_Memory"> +<title>Allocating and Deallocating Memory</title> <para> <!-- .LP --> To support the possible reentry of these procedures, @@ -3181,9 +3192,10 @@ Specifies the size of the buffer. <!-- .eM --> You must pass back the same pointer and size that were returned by <xref linkend='_XAllocTemp' xrefstyle='select: title'/>. -<!-- .SH --> -Portability Considerations </para> +</sect2> +<sect2 id="Portability_Considerations"> +<title>Portability Considerations</title> <para> <!-- .LP --> Many machine architectures, @@ -3252,9 +3264,10 @@ The <function>PackData</function> macro is a half-hearted attempt to deal with the possibility of 32 bit shorts. However, much more work is needed to make this work properly. -<!-- .SH --> -Deriving the Correct Extension Opcode </para> +</sect2> +<sect2 id="Deriving_the_Correct_Extension_Opcode"> +<title>Deriving the Correct Extension Opcode</title> <para> <!-- .LP --> The remaining problem a writer of an extension stub procedure faces that @@ -3310,4 +3323,6 @@ structure. </para> </listitem> </itemizedlist> +</sect2> +</sect1> </appendix> diff --git a/lib/libX11/specs/libX11/AppD.xml b/lib/libX11/specs/libX11/AppD.xml index f3c0e2f6a..fdea46894 100644 --- a/lib/libX11/specs/libX11/AppD.xml +++ b/lib/libX11/specs/libX11/AppD.xml @@ -361,7 +361,7 @@ The next two functions set and read the <property>WM_ZOOM_HINTS</property> prope To set the zoom hints for a window, use <xref linkend='XSetZoomHints' xrefstyle='select: title'/>. This function is no longer supported by the -<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +<citetitle>Inter-Client Communication Conventions Manual</citetitle>. </para> <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm> <!-- .sM --> @@ -431,7 +431,7 @@ errors. To read the zoom hints for a window, use <xref linkend='XGetZoomHints' xrefstyle='select: title'/>. This function is no longer supported by the -<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +<citetitle>Inter-Client Communication Conventions Manual</citetitle>. </para> <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm> <!-- .sM --> diff --git a/lib/libX11/specs/libX11/CH01.xml b/lib/libX11/specs/libX11/CH01.xml index 8d2092420..67744cfa2 100644 --- a/lib/libX11/specs/libX11/CH01.xml +++ b/lib/libX11/specs/libX11/CH01.xml @@ -26,7 +26,8 @@ programming language. Other higher-level abstractions (for example, those provided by the toolkits for X) are built on top of the Xlib library. For further information about these higher-level libraries, see the appropriate toolkit documentation. -The <citetitle>X Window System Protocol</citetitle> provides the +The <olink targetdoc='x11protocol' targetptr='x11protocol' +><citetitle>X Window System Protocol</citetitle></olink> provides the definitive word on the behavior of X. Although additional information appears here, the protocol document is the ruling document. @@ -684,7 +685,7 @@ What you do inside of your top-level window, however, is up to your application. For further information, see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link> -and the <citetitle>Inter-Client Communication Conventions Manual</citetitle>. +and the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>. </para> </listitem> </itemizedlist> diff --git a/lib/libX11/specs/libX11/CH03.xml b/lib/libX11/specs/libX11/CH03.xml index e2468580d..7d2b20e52 100644 --- a/lib/libX11/specs/libX11/CH03.xml +++ b/lib/libX11/specs/libX11/CH03.xml @@ -1214,7 +1214,7 @@ you should set these properties for top-level windows before mapping them. <!-- .LP --> For further information, see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link> and -the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>. </para> <para> <!-- .LP --> diff --git a/lib/libX11/specs/libX11/CH04.xml b/lib/libX11/specs/libX11/CH04.xml index 973e7907e..9cdfd1a7f 100644 --- a/lib/libX11/specs/libX11/CH04.xml +++ b/lib/libX11/specs/libX11/CH04.xml @@ -893,8 +893,8 @@ see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link>. <!-- .LP --> The core protocol imposes no semantics on these property names, but semantics are specified in other X Consortium standards, -such as the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis> -and the <emphasis remap='I'>X Logical Font Description Conventions</emphasis>. +such as the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink> +and the <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>. </para> <para> <!-- .LP --> @@ -1424,7 +1424,7 @@ To obtain the type, format, and value of a property of a given window, use <paramdef><parameter> actual_format_return</parameter></paramdef> <paramdef><parameter> nitems_return</parameter></paramdef> <paramdef><parameter> bytes_after_return</parameter></paramdef> - <paramdef>.br<parameter> prop_return</parameter></paramdef> + <paramdef><parameter> prop_return</parameter></paramdef> </funcprototype> </funcsynopsis> <!-- .FN --> diff --git a/lib/libX11/specs/libX11/CH06.xml b/lib/libX11/specs/libX11/CH06.xml index 1a6709cd7..b84ce95cc 100644 --- a/lib/libX11/specs/libX11/CH06.xml +++ b/lib/libX11/specs/libX11/CH06.xml @@ -7109,8 +7109,9 @@ a class of output devices. <indexterm><primary>Device Color Characterization</primary></indexterm> For details about how color characterization data is stored in root window properties, -see the section on Device Color Characterization in the -<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +see <olink targetdoc='icccm' targetptr='Device_Color_Characterization'>the +section on Device Color Characterization in the +<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>. The LINEAR_RGB function set is provided by Xlib and will support most color monitors. Function sets may require data that differs diff --git a/lib/libX11/specs/libX11/CH08.xml b/lib/libX11/specs/libX11/CH08.xml index b2348b5ae..e4afa37fa 100644 --- a/lib/libX11/specs/libX11/CH08.xml +++ b/lib/libX11/specs/libX11/CH08.xml @@ -2995,7 +2995,7 @@ A font is not guaranteed to have any properties. The interpretation of the property value (for example, long or unsigned long) must be derived from <emphasis remap='I'>a priori</emphasis> knowledge of the property. A basic set of font properties is specified in the X Consortium standard -<emphasis remap='I'>X Logical Font Description Conventions</emphasis>. +<olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>. </para> <sect2 id="Loading_and_Freeing_Fonts"> <title>Loading and Freeing Fonts</title> @@ -3067,7 +3067,7 @@ In the pattern, the ``?'' character will match any single character, and the ``*'' character will match any number of characters. A structured format for font names is specified in the X Consortium standard -<emphasis remap='I'>X Logical Font Description Conventions</emphasis>. +<olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>. If <xref linkend='XLoadFont' xrefstyle='select: title'/> was unsuccessful at loading the specified font, diff --git a/lib/libX11/specs/libX11/CH09.xml b/lib/libX11/specs/libX11/CH09.xml index e239db2e9..5636df149 100644 --- a/lib/libX11/specs/libX11/CH09.xml +++ b/lib/libX11/specs/libX11/CH09.xml @@ -1434,7 +1434,8 @@ setup. Servers also can implement other access control policies in addition to or in place of this host access facility. For further information about other access control implementations, -see ``X Window System Protocol.'' +see <olink targetdoc='x11protocol' targetptr='Connection_Setup' +><citetitle>X Window System Protocol</citetitle></olink>. </para> <sect2 id="Adding_Getting_or_Removing_Hosts"> <title>Adding, Getting, or Removing Hosts</title> diff --git a/lib/libX11/specs/libX11/CH10.xml b/lib/libX11/specs/libX11/CH10.xml index 2024592b5..9c12ef710 100644 --- a/lib/libX11/specs/libX11/CH10.xml +++ b/lib/libX11/specs/libX11/CH10.xml @@ -4632,8 +4632,10 @@ The owner should convert the selection based on the specified target type and send a <symbol>SelectionNotify</symbol> event back to the requestor. -A complete specification for using selections is given in the X Consortium -standard <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +A <olink targetdoc='icccm' +targetptr='Peer_to_Peer_Communication_by_Means_of_Selections'>complete +specification for using selections</olink> is given in the X Consortium +standard <citetitle>Inter-Client Communication Conventions Manual</citetitle>. </para> </sect2> <sect2 id="SelectionNotify_Events"> diff --git a/lib/libX11/specs/libX11/CH12.xml b/lib/libX11/specs/libX11/CH12.xml index ae8017b2b..cc14fe649 100644 --- a/lib/libX11/specs/libX11/CH12.xml +++ b/lib/libX11/specs/libX11/CH12.xml @@ -1926,7 +1926,7 @@ error. Xlib provides functions that you can use to set and get the input focus. The input focus is a shared resource, and cooperation among clients is required for correct interaction. See the -<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis> +<olink targetdoc='icccm' targetptr='Input_Focus'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink> for input focus policy. </para> <para> diff --git a/lib/libX11/specs/libX11/CH14.xml b/lib/libX11/specs/libX11/CH14.xml index ee14b95ee..6dc947a9c 100644 --- a/lib/libX11/specs/libX11/CH14.xml +++ b/lib/libX11/specs/libX11/CH14.xml @@ -4,11 +4,12 @@ <chapter id='Inter_Client_Communication_Functions'> <title>Inter-Client Communication Functions</title> <para> -The Inter-Client Communication Conventions Manual, hereafter referred to as the <acronym>ICCCM</acronym>, +The <citetitle>Inter-Client Communication Conventions Manual</citetitle>, +hereafter referred to as the <acronym>ICCCM</acronym>, details the X Consortium approved conventions that govern inter-client communications. These conventions ensure peer-to-peer client cooperation in the use of selections, cut buffers, and shared resources as well as client cooperation with window and session managers. For further information, -see the Inter-Client Communication Conventions Manual. +see the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>. </para> <para> Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym> @@ -313,8 +314,9 @@ function sends a <property>WM_CHANGE_STATE</property> <symbol>ClientMessage</symbol> event with a format of 32 and a first data element of <symbol>IconicState</symbol> -(as described in section 4.1.4 of the -<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>) +(as described in <olink targetdoc='icccm' targetptr='Changing_Window_State' +>section 4.1.4 of the +<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>) and a window of w to the root window of the specified screen with an event mask set to diff --git a/lib/libX11/specs/libX11/credits.xml b/lib/libX11/specs/libX11/credits.xml index c8fdfecb4..c3d1f7383 100644 --- a/lib/libX11/specs/libX11/credits.xml +++ b/lib/libX11/specs/libX11/credits.xml @@ -224,4 +224,14 @@ Massachusetts Institute of Technology </literallayout> </para> </simplesect> +<simplesect> +<title>Release 7</title> +<para> +This document is made available to you in modern formats such as HTML and PDF +thanks to the efforts of Matt Dew, who converted the original troff sources to +DocBook/XML and edited them into shape; along with Gaetan Nadon and +Alan Coopersmith, who set up the formatting machinery in the libX11 builds and +performed further editing of the DocBook markup. +</para> +</simplesect> </preface> diff --git a/lib/libX11/specs/libX11/glossary.xml b/lib/libX11/specs/libX11/glossary.xml index 51fa30293..14ad2e2dd 100644 --- a/lib/libX11/specs/libX11/glossary.xml +++ b/lib/libX11/specs/libX11/glossary.xml @@ -1689,8 +1689,8 @@ see the <glossterm linkend="glossary:Host_Portable_Character_Encoding">Host Port <indexterm significance="preferred"><primary><acronym>XLFD</acronym></primary></indexterm> <glossdef> <para> -The X Logical Font Description Conventions that define a standard syntax -for structured font names. +The <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> +that define a standard syntax for structured font names. </para> </glossdef> </glossentry> diff --git a/lib/libX11/src/XlibInt.c b/lib/libX11/src/XlibInt.c index a8f5d0844..2827c106a 100644 --- a/lib/libX11/src/XlibInt.c +++ b/lib/libX11/src/XlibInt.c @@ -886,7 +886,7 @@ void _XEnq( extension = ((xGenericEvent*)event)->extension; qelt->event.type = type; - /* If an extension has registerd a generic_event_vec handler, then + /* If an extension has registered a generic_event_vec handler, then * it can handle event cookies. Otherwise, proceed with the normal * event handlers. * |