From 5a5506fed918b6d1a041a040b2060ed25e40d464 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 29 Oct 2009 18:35:06 +0000 Subject: svn merge ^/branches/released --- libX11/ChangeLog | 58 ++++++++++++++ libX11/configure | 88 +++++++++++++-------- libX11/configure.ac | 16 +++- libX11/man/Compose.man | 158 +++++++++++++++++++++++++++++++++++++ libX11/man/Makefile.am | 17 +++- libX11/man/Makefile.in | 62 +++++++++++---- libX11/man/XLookupKeysym.man | 6 +- libX11/man/XmbLookupString.man | 3 +- libX11/nls/en_US.UTF-8/Compose.pre | 3 + libX11/specs/XIM/Makefile.in | 2 +- libX11/specs/i18n/Makefile.in | 2 +- libX11/specs/libX11/Makefile.in | 2 +- libX11/specs/troffrules.in | 2 +- 13 files changed, 357 insertions(+), 62 deletions(-) create mode 100644 libX11/man/Compose.man (limited to 'libX11') diff --git a/libX11/ChangeLog b/libX11/ChangeLog index 4c74e7fc1..d537dd8db 100644 --- a/libX11/ChangeLog +++ b/libX11/ChangeLog @@ -1,3 +1,61 @@ +commit aad10032651cdc2a53b359035954454a28d6db67 +Author: Alan Coopersmith +Date: Fri Oct 23 13:55:14 2009 -0700 + + libX11 1.3.2 + + Signed-off-by: Alan Coopersmith + +commit 6303ada89cb228c0f9656036f798703afb42fc29 +Author: Peter Hutterer +Date: Wed Oct 21 12:42:07 2009 +1000 + + Add smiley faces to compose sequences. + + I wonder how we could have lasted that long without them. + + Signed-off-by: Peter Hutterer + Acked-by: Daniel Stone + Acked-By: James Cloos + +commit 0e104ebd8628803c27e36b16922ad1edd891325a +Author: Alan Coopersmith +Date: Thu Oct 22 23:12:30 2009 -0700 + + Add man page for Compose file format + + Based on grammar description in modules/im/ximcp/imLcPrs.c and + note on XFree86 changes formerly found in xorg-docs RELNOTES.sgml + + Signed-off-by: Alan Coopersmith + +commit 9c95f2af7c442b3a59b1a30cf804f1ef4e7fc5b5 +Author: Jeremy Huddleston +Date: Tue Oct 20 12:46:03 2009 -0700 + + Add extra configuration and sanity checks for groff and ps2pdf + + 1) Add AC_ARG_VAR for GROFF and PS2PDF to inform users of these + environment variables. + 2) Check that groff -ms works + + Some distributions ship the ms macros as a separate package which may + not be installed together with groff, so we need to make sure that groff + works and the required macros are actually installed before attempting + to build the specs. + + Signed-off-by: Jeremy Huddleston + Signed-off-by: Dan Nicholson + Signed-off-by: Yaakov Selkowitz + +commit d3f801fd2f9198eaad6797414dba652f9c006c6d +Author: Yaakov Selkowitz +Date: Sun Oct 18 17:34:53 2009 -0500 + + Fix VPATH build of libX11 specs + + Signed-off-by: Yaakov Selkowitz + commit ad15e1a89d30ccc11d80745897b83def1448e8c0 Author: Alan Coopersmith Date: Sat Oct 17 16:14:34 2009 -0700 diff --git a/libX11/configure b/libX11/configure index 1306cc785..9add11ef0 100644 --- a/libX11/configure +++ b/libX11/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for libX11 1.3.1. +# Generated by GNU Autoconf 2.63 for libX11 1.3.2. # # Report bugs to . # @@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='libX11 1.3.1' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='libX11 1.3.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1057,7 +1057,9 @@ X11_LIBS BIGFONT_CFLAGS BIGFONT_LIBS XKBPROTO_CFLAGS -XKBPROTO_LIBS' +XKBPROTO_LIBS +GROFF +PS2PDF' # Initialize some variables set by options. @@ -1610,7 +1612,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.3.1 to adapt to many kinds of systems. +\`configure' configures libX11 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1680,7 +1682,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.3.1:";; + short | recursive ) echo "Configuration of libX11 1.3.2:";; esac cat <<\_ACEOF @@ -1778,6 +1780,8 @@ Some influential environment variables: C compiler flags for XKBPROTO, overriding pkg-config XKBPROTO_LIBS linker flags for XKBPROTO, overriding pkg-config + GROFF Path to a groff executable that supports -ms + PS2PDF Path to a ps2pdf executable Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1845,7 +1849,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.3.1 +libX11 configure 1.3.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1859,7 +1863,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.3.1, which was +It was created by libX11 $as_me 1.3.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2709,7 +2713,7 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.3.1' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -5421,7 +5425,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5424 "configure"' > conftest.$ac_ext + echo '#line 5428 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8037,11 +8041,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8040: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8044: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8044: \$? = $ac_status" >&5 + echo "$as_me:8048: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8327,11 +8331,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8330: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8334: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8334: \$? = $ac_status" >&5 + echo "$as_me:8338: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8431,11 +8435,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8438: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8438: \$? = $ac_status" >&5 + echo "$as_me:8442: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10831,7 +10835,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13347: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13347: \$? = $ac_status" >&5 + echo "$as_me:13351: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13444,11 +13448,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13451: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13451: \$? = $ac_status" >&5 + echo "$as_me:13455: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15027,11 +15031,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15030: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15034: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15034: \$? = $ac_status" >&5 + echo "$as_me:15038: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15131,11 +15135,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15134: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15138: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15138: \$? = $ac_status" >&5 + echo "$as_me:15142: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17346,11 +17350,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17349: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17353: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17353: \$? = $ac_status" >&5 + echo "$as_me:17357: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17636,11 +17640,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17643: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17643: \$? = $ac_status" >&5 + echo "$as_me:17647: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17740,11 +17744,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17747: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17747: \$? = $ac_status" >&5 + echo "$as_me:17751: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -26661,6 +26665,7 @@ fi # Specification documents are currently provided in troff format + for ac_prog in groff do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -26708,6 +26713,8 @@ fi done test -n "$GROFF" || GROFF="none" + + for ac_prog in ps2pdf do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -26756,6 +26763,19 @@ done test -n "$PS2PDF" || PS2PDF="none" +if test "x${GROFF}" != xnone ; then + { $as_echo "$as_me:$LINENO: checking whether ${GROFF} -ms works" >&5 +$as_echo_n "checking whether ${GROFF} -ms works... " >&6; } + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + GROFF=none + fi + { $as_echo "$as_me:$LINENO: result: ${groff_ms_works}" >&5 +$as_echo "${groff_ms_works}" >&6; } +fi + { $as_echo "$as_me:$LINENO: checking whether to build specifications" >&5 $as_echo_n "checking whether to build specifications... " >&6; } # Check whether --enable-specs was given. @@ -27361,7 +27381,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.3.1, which was +This file was extended by libX11 $as_me 1.3.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27424,7 +27444,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libX11 config.status 1.3.1 +libX11 config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/libX11/configure.ac b/libX11/configure.ac index db83f262a..d62269747 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) @@ -429,9 +429,23 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) XORG_CHECK_MALLOC_ZERO # Specification documents are currently provided in troff format +AC_ARG_VAR([GROFF], [Path to a groff executable that supports -ms]) AC_PATH_PROGS([GROFF], [groff], [none], [$PATH:/usr/gnu/bin]) + +AC_ARG_VAR([PS2PDF], [Path to a ps2pdf executable]) AC_PATH_PROGS([PS2PDF], [ps2pdf], [none], [$PATH:/usr/gnu/bin]) +if test "x${GROFF}" != xnone ; then + AC_MSG_CHECKING([whether ${GROFF} -ms works]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + GROFF=none + fi + AC_MSG_RESULT([${groff_ms_works}]) +fi + AC_MSG_CHECKING([whether to build specifications]) AC_ARG_ENABLE(specs, AC_HELP_STRING([--enable-specs], [Enable building of specification docs]), diff --git a/libX11/man/Compose.man b/libX11/man/Compose.man new file mode 100644 index 000000000..213d6d44c --- /dev/null +++ b/libX11/man/Compose.man @@ -0,0 +1,158 @@ +.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the +.\" "Software"), to deal in the Software without restriction, including +.\" without limitation the rights to use, copy, modify, merge, publish, +.\" distribute, and/or sell copies of the Software, and to permit persons +.\" to whom the Software is furnished to do so, provided that the above +.\" copyright notice(s) and this permission notice appear in all copies of +.\" the Software and that both the above copyright notice(s) and this +.\" permission notice appear in supporting documentation. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" Except as contained in this notice, the name of a copyright holder +.\" shall not be used in advertising or otherwise to promote the sale, use +.\" or other dealings in this Software without prior written authorization +.\" of the copyright holder. +.\" +.\" shorthand for double quote that works everywhere. +.ds q \N'34' +.ds xL Xlib \- C Language X Interface +.TH Compose __filemansuffix__ __vendorversion__ +.SH NAME +Compose \- X client mappings for multi-key input sequences +.SH DESCRIPTION +The X library, libX11, provides a simple input method for characters +beyond those represented on typical keyboards using sequences of key +strokes that are combined to enter a single character. +.PP +The compose file is searched for in the following order: +.IP - +If the environment variable +.B $XCOMPOSEFILE +is set, its value is used as the name of the Compose file. +.IP - +If the user's home directory has a file named +.IR .XCompose , +it is used as the Compose file. +.IP - +The system provided compose file is used by mapping the locale to a compose +file from the list in +.IR __xlocaledir__/compose.dir . +.PP +Compose files can use an +.RB \*q include \*q +instruction. This allows local modifications to be made to existing compose +files without including all of the content directly. For example, the +system's iso8859-1 compose file can be included with a line like this: +.RS 4 +.BI "include \*q" __xlocaledir__/iso8859-1/Compose \*q +.RE +.PP +There are two substitutions that can be made in the file name of the +include instruction. +.I %H +expands to the user's home directory (the +.B $HOME +environment variable), and +.I %L +expands to the name of the locale specific Compose file (i.e., +.RI \*q __xlocaledir__//Compose \*q). +.PP +For example, you can include in your compose file the default Compose file +by using: +.RS +.B "include \*q%L\*q" +.RE +and then rewrite only the few rules that you need to change. New +compose rules can be added, and previous ones replaced. +.SH FILE FORMAT +.\" Based on grammar description in modules/im/ximcp/imLcPrs.c +Compose files are plain text files, with a separate line for each compose +sequence. Comments begin with \fB#\fP characters. Each compose sequence +specifies one or more events and a resulting input sequence, with an optional +comment at the end of the line: +.RS +\fIEVENT\fP [\fIEVENT\fP...] \fB:\fP \fIRESULT\fP [\fB#\fP \fICOMMENT\fP] +.RE +.PP +Each event consists of a specified input keysym, and optional modifier states: +.RS +[\fIMODIFIER_LIST\fP] \fB<\fP\fIkeysym\fP\fB>\fP +.RE +.PP +Each modifier consists of a specified modifier and a state: +.RS +(\fB!\fP \fIMODIFIER\fP ) | \fBNone\fP +.RE +Modifiers may be preceded by a +.RB \*q "~" \*q +character to indicate that the modifier must not be present. +.PP +The result specifies a string, keysym, or both, that the X client receives +as input when the sequence of events is input: +.RS +\fB\*q\fP\fISTRING\fP\fB\*q\fP | \fIkeysym\fP | \fB\*q\fP\fISTRING\fP\fB\*q\fP \fIkeysym\fP +.RE +.PP +Keysyms are specified without the \fBXK_\fP prefix. +.PP +Strings may be direct text encoded in the locale for which the compose file is +to be used, or an escaped octal or hexadecimal character code. Octal codes +are specified as \fB\*q\\123\*q\fP and hexadecimal codes as +\fB\*q\\0x123a\*q\fP. +It is not necessary to specify in the right part of a rule a locale encoded +string in addition to the keysym name. If the string is omitted, Xlib +figures it out from the keysym according to the current locale. +I.e., if a rule looks like: +.RS +\fB : \*q\\300\*q Agrave\fP +.RE +the result of the composition is always the letter with the "\\300" +code. But if the rule is: +.RS +\fB : Agrave\fP +.RE +the result depends on how Agrave is mapped in the current locale. +.SH ENVIRONMENT +.TP +.B XCOMPOSEFILE +File to use for compose sequences. +.TP +.B XCOMPOSECACHE +Directory to use for caching compiled compose files. +.SH FILES +.TP +.I $HOME/.Xcompose +User default compose file if XCOMPOSEFILE is not set. +.TP +.I __xlocaledir__/compose.dir +File listing the compose file path to use for each locale. +.TP +.I __xlocaledir__//Compose +System default compose file for the locale, mapped via compose.dir. +.TP +.I /var/cache/libx11/compose/ +System-wide cache directory for compiled compose files. +.TP +.I $HOME/.compose-cache/ +Per-user cache directory for compiled compose files. +.SH SEE ALSO +.BR XLookupString (__libmansuffix__), +.BR XmbLookupString (__libmansuffix__), +.BR XwcLookupString (__libmansuffix__), +.BR Xutf8LookupString (__libmansuffix__), +.BR mkcomposecache (__appmansuffix__), +.BR locale (__miscmansuffix__). +.br +\fI\*(xL\fP diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am index 045c7dc5b..c6aff51f5 100644 --- a/libX11/man/Makefile.am +++ b/libX11/man/Makefile.am @@ -194,30 +194,39 @@ libman_PRE = \ XmbTextExtents.man \ XmbTextPerCharExtents.man +filemandir = $(FILE_MAN_DIR) +fileman_PRE = Compose.man + # What we actually install if MANPAGES libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(all_shadows:=.@LIB_MAN_SUFFIX@) + +fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) endif -EXTRA_DIST = $(libman_PRE) +EXTRA_DIST = $(libman_PRE) $(fileman_PRE) -CLEANFILES = $(libman_DATA) +CLEANFILES = $(libman_DATA) $(fileman_DATA) include $(top_srcdir)/cpprules.in -SUFFIXES += .$(LIB_MAN_SUFFIX) .man +SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ + -D__xlocaledir__="$(X11_LOCALEDATADIR)" \ -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) -.man.$(LIB_MAN_SUFFIX): +.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX): $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) diff --git a/libX11/man/Makefile.in b/libX11/man/Makefile.in index 303f821de..2032f55bb 100644 --- a/libX11/man/Makefile.in +++ b/libX11/man/Makefile.in @@ -90,8 +90,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libmandir)" -DATA = $(libman_DATA) +am__installdirs = "$(DESTDIR)$(filemandir)" "$(DESTDIR)$(libmandir)" +DATA = $(fileman_DATA) $(libman_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -486,14 +486,17 @@ libman_PRE = \ XmbTextExtents.man \ XmbTextPerCharExtents.man +filemandir = $(FILE_MAN_DIR) +fileman_PRE = Compose.man # What we actually install @MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ @MANPAGES_TRUE@ $(all_shadows:=.@LIB_MAN_SUFFIX@) -EXTRA_DIST = $(libman_PRE) -CLEANFILES = $(libman_DATA) -SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man +@MANPAGES_TRUE@fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) +EXTRA_DIST = $(libman_PRE) $(fileman_PRE) +CLEANFILES = $(libman_DATA) $(fileman_DATA) +SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@ CPP_FILES_FLAGS = $(WCHAR32_FLAGS) @@ -514,6 +517,10 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ + -D__xlocaledir__="$(X11_LOCALEDATADIR)" \ -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) @@ -1523,7 +1530,7 @@ XmbTextPerCharExtents_shadowmen = $(XmbTextPerCharExtents_shadows:=.@LIB_MAN_SUF all: all-recursive .SUFFIXES: -.SUFFIXES: .pre .$(LIB_MAN_SUFFIX) .man +.SUFFIXES: .pre .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/cpprules.in $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1560,6 +1567,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-filemanDATA: $(fileman_DATA) + @$(NORMAL_INSTALL) + test -z "$(filemandir)" || $(MKDIR_P) "$(DESTDIR)$(filemandir)" + @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(filemandir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(filemandir)" || exit $$?; \ + done + +uninstall-filemanDATA: + @$(NORMAL_UNINSTALL) + @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(filemandir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(filemandir)" && rm -f $$files install-libmanDATA: $(libman_DATA) @$(NORMAL_INSTALL) test -z "$(libmandir)" || $(MKDIR_P) "$(DESTDIR)$(libmandir)" @@ -1779,7 +1806,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libmandir)"; do \ + for dir in "$(DESTDIR)$(filemandir)" "$(DESTDIR)$(libmandir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1828,7 +1855,7 @@ info: info-recursive info-am: -install-data-am: install-libmanDATA +install-data-am: install-filemanDATA install-libmanDATA install-dvi: install-dvi-recursive @@ -1872,7 +1899,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-libmanDATA +uninstall-am: uninstall-filemanDATA uninstall-libmanDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1883,20 +1910,21 @@ uninstall-am: uninstall-libmanDATA distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libmanDATA install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + install-exec-am install-filemanDATA install-html \ + install-html-am install-info install-info-am \ + install-libmanDATA install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-filemanDATA \ uninstall-libmanDATA .pre: $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ -.man.$(LIB_MAN_SUFFIX): +.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX): $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ $(AllPlanes_shadowmen): $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/AllPlanes.$(LIB_MAN_SUFFIX)" > $@ diff --git a/libX11/man/XLookupKeysym.man b/libX11/man/XLookupKeysym.man index 4449f2a93..9167ea0c8 100644 --- a/libX11/man/XLookupKeysym.man +++ b/libX11/man/XLookupKeysym.man @@ -267,6 +267,10 @@ Note that you can rebind a KeySym that may not exist. .SH "SEE ALSO" XButtonEvent(__libmansuffix__), XMapEvent(__libmansuffix__), -XStringToKeysym(__libmansuffix__) +XStringToKeysym(__libmansuffix__), +XmbLookupString(__libmansuffix__), +XwcLookupString(__libmansuffix__), +Xutf8LookupString(__libmansuffix__), +Compose(__filemansuffix__) .br \fI\*(xL\fP diff --git a/libX11/man/XmbLookupString.man b/libX11/man/XmbLookupString.man index c5c1ef434..ac1e73a46 100644 --- a/libX11/man/XmbLookupString.man +++ b/libX11/man/XmbLookupString.man @@ -306,6 +306,7 @@ release. Its presence is indicated by the macro .ZN X_HAVE_UTF8_STRING . .SH "SEE ALSO" -XLookupKeysym(__libmansuffix__) +XLookupKeysym(__libmansuffix__), +Compose(__filemansuffix__) .br \fI\*(xL\fP diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index 1edfdebb9..044cae1b0 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -218,6 +218,9 @@ XCOMM Other symbols

: "☭" U262D # HAMMER AND SICKLE <3> : "♥" U2665 # BLACK HEART SUIT + : "☺" U263A # WHITE SMILING FACE + : "☹" U2639 # WHITE FROWNING FACE + XCOMM Part 2 XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically diff --git a/libX11/specs/XIM/Makefile.in b/libX11/specs/XIM/Makefile.in index 73392a119..fbd45fd5f 100644 --- a/libX11/specs/XIM/Makefile.in +++ b/libX11/specs/XIM/Makefile.in @@ -320,7 +320,7 @@ EXTRA_DIST = $(doc_sources) @BUILD_SPECS_TRUE@GROFF_DEFS = -dxV="$(PACKAGE_STRING)" # -e to run through eqn, -t to run through tbl -@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) $(top_srcdir)/specs/macros.t +@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t @BUILD_SPECS_TRUE@SUFFIXES = .ms .ps .txt .html .pdf all: all-am diff --git a/libX11/specs/i18n/Makefile.in b/libX11/specs/i18n/Makefile.in index defb1686d..881b8ba54 100644 --- a/libX11/specs/i18n/Makefile.in +++ b/libX11/specs/i18n/Makefile.in @@ -320,7 +320,7 @@ EXTRA_DIST = $(doc_sources) @BUILD_SPECS_TRUE@GROFF_DEFS = -dxV="$(PACKAGE_STRING)" # -e to run through eqn, -t to run through tbl -@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) $(top_srcdir)/specs/macros.t +@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t @BUILD_SPECS_TRUE@SUFFIXES = .ms .ps .txt .html .pdf all: all-am diff --git a/libX11/specs/libX11/Makefile.in b/libX11/specs/libX11/Makefile.in index d014f41e9..f4e0c89dd 100644 --- a/libX11/specs/libX11/Makefile.in +++ b/libX11/specs/libX11/Makefile.in @@ -346,7 +346,7 @@ EXTRA_DIST = $(doc_sources) $(doc_includes) @BUILD_SPECS_TRUE@GROFF_DEFS = -dxV="$(PACKAGE_STRING)" # -e to run through eqn, -t to run through tbl -@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) $(top_srcdir)/specs/macros.t +@BUILD_SPECS_TRUE@GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t @BUILD_SPECS_TRUE@SUFFIXES = .ms .ps .txt .html .pdf all: all-am diff --git a/libX11/specs/troffrules.in b/libX11/specs/troffrules.in index 03d8463e8..c17490947 100644 --- a/libX11/specs/troffrules.in +++ b/libX11/specs/troffrules.in @@ -46,7 +46,7 @@ MOSTLYCLEANFILES = index.* GROFF_DEFS = -dxV="$(PACKAGE_STRING)" # -e to run through eqn, -t to run through tbl -GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) $(top_srcdir)/specs/macros.t +GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t SUFFIXES = .ms .ps .txt .html .pdf -- cgit v1.2.3