svn merge ^/branches/released .

4 files changed, 256 insertions, 256 deletions

diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index 707433742..9a41b8873 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -1,90 +1,75 @@
-# 

-#  Copyright 2005  Red Hat, Inc.

-# 

-#  Permission to use, copy, modify, distribute, and sell this software and its

-#  documentation for any purpose is hereby granted without fee, provided that

-#  the above copyright notice appear in all copies and that both that

-#  copyright notice and this permission notice appear in supporting

-#  documentation, and that the name of Red Hat not be used in

-#  advertising or publicity pertaining to distribution of the software without

-#  specific, written prior permission.  Red Hat makes no

-#  representations about the suitability of this software for any purpose.  It

-#  is provided "as is" without express or implied warranty.

-# 

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-#  EVENT SHALL RED HAT BE LIABLE FOR 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.

-

-bin_PROGRAMS = xkbcomp

-

-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS)

-xkbcomp_LDADD = $(XKBCOMP_LIBS)

-

-xkbcomp_SOURCES = \

-        action.c \

-        action.h \

-        alias.c \

-        alias.h \

-        compat.c \

-        compat.h \

-        expr.c \

-        expr.h \

-        geometry.c \

-        indicators.c \

-        indicators.h \

-        keycodes.c \

-        keycodes.h \

-        keymap.c \

-        keytypes.c \

-        listing.c \

-        misc.c \

-        misc.h \

-        parseutils.c \

-        parseutils.h \

-        symbols.c \

-        tokens.h \

-        utils.c \

-        utils.h \

-        vmod.c \

-        vmod.h \

-        xkbcomp.c \

-        xkbcomp.h \

-        xkbparse.y \

-        xkbpath.c \

-        xkbpath.h \

-        xkbscan.c

-

-appman_PRE = \

-        xkbcomp.man

-

-BUILT_SOURCES = xkbparse.c

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-MAINTAINERCLEANFILES += $(BUILT_SOURCES)

-

-appmandir = $(APP_MAN_DIR)

-

-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)

-

-EXTRA_DIST = $(appman_PRE)

-CLEANFILES = $(appman_DATA)

-

-SUFFIXES = .$(APP_MAN_SUFFIX) .man

-

-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

-.man.$(APP_MAN_SUFFIX):

-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

-

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR 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.
+
+SUBDIRS = man
+bin_PROGRAMS = xkbcomp
+
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS)
+xkbcomp_LDADD = $(XKBCOMP_LIBS)
+
+xkbcomp_SOURCES = \
+        action.c \
+        action.h \
+        alias.c \
+        alias.h \
+        compat.c \
+        compat.h \
+        expr.c \
+        expr.h \
+        geometry.c \
+        indicators.c \
+        indicators.h \
+        keycodes.c \
+        keycodes.h \
+        keymap.c \
+        keytypes.c \
+        listing.c \
+        misc.c \
+        misc.h \
+        parseutils.c \
+        parseutils.h \
+        symbols.c \
+        tokens.h \
+        utils.c \
+        utils.h \
+        vmod.c \
+        vmod.h \
+        xkbcomp.c \
+        xkbcomp.h \
+        xkbparse.y \
+        xkbpath.c \
+        xkbpath.h \
+        xkbscan.c
+
+
+BUILT_SOURCES = xkbparse.c
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac
index 9ac84f682..f438c072f 100644
--- a/xkbcomp/configure.ac
+++ b/xkbcomp/configure.ac
@@ -1,59 +1,62 @@
-dnl  Copyright 2005 Red Hat, Inc.

-dnl 

-dnl  Permission to use, copy, modify, distribute, and sell this software and its

-dnl  documentation for any purpose is hereby granted without fee, provided that

-dnl  the above copyright notice appear in all copies and that both that

-dnl  copyright notice and this permission notice appear in supporting

-dnl  documentation, and that the name of Red Hat not be used in

-dnl  advertising or publicity pertaining to distribution of the software without

-dnl  specific, written prior permission.  Red Hat makes no

-dnl  representations about the suitability of this software for any purpose.  It

-dnl  is provided "as is" without express or implied warranty.

-dnl 

-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-dnl  PERFORMANCE OF THIS SOFTWARE.

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.60])

-AC_INIT([xkbcomp], [1.2.0],

-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.8)

-XORG_DEFAULT_OPTIONS

-

-AC_CONFIG_HEADERS([config.h])

-

-# If both the C file and YACC are missing, the package cannot be build.

-AC_PROG_YACC

-AC_PATH_PROG([YACC_INST], $YACC)

-if test ! -f "$srcdir/xkbparse.c"; then

-   if test -z "$YACC_INST"; then

-      AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])

-   fi

-fi

-

-AC_CHECK_FUNCS([strdup strcasecmp])

-

-# Checks for pkg-config packages

-PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)

-

-AC_ARG_WITH([xkb_config_root],

-    [AS_HELP_STRING([--with-xkb-config-root=<paths>],

-        [Set default XKB config root (default: ${datadir}/X11/xkb)])],

-    [XKBCONFIGROOT="$withval"],

-    [XKBCONFIGROOT='${datadir}/X11/xkb'])

-AC_SUBST([XKBCONFIGROOT])

-

-

-AC_OUTPUT([Makefile])

+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.60])
+AC_INIT([xkbcomp], [1.2.0],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
+AC_CONFIG_HEADERS([config.h])
+
+# If both the C file and YACC are missing, the package cannot be build.
+AC_PROG_YACC
+AC_PATH_PROG([YACC_INST], $YACC)
+if test ! -f "$srcdir/xkbparse.c"; then
+   if test -z "$YACC_INST"; then
+      AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
+   fi
+fi
+
+AC_CHECK_FUNCS([strdup strcasecmp])
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
+
+AC_ARG_WITH([xkb_config_root],
+    [AS_HELP_STRING([--with-xkb-config-root=<paths>],
+        [Set default XKB config root (default: ${datadir}/X11/xkb)])],
+    [XKBCONFIGROOT="$withval"],
+    [XKBCONFIGROOT='${datadir}/X11/xkb'])
+AC_SUBST([XKBCONFIGROOT])
+
+
+AC_CONFIG_FILES([
+	Makefile
+	man/Makefile])
+AC_OUTPUT
diff --git a/xkbcomp/man/Makefile.am b/xkbcomp/man/Makefile.am
new file mode 100644
index 000000000..f17336a0f
--- /dev/null
+++ b/xkbcomp/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xkbcomp.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xkbcomp/xkbcomp.man b/xkbcomp/man/xkbcomp.man
index 7bfe3a21c..9b380a0fd 100644
--- a/xkbcomp/xkbcomp.man
+++ b/xkbcomp/man/xkbcomp.man
@@ -1,107 +1,107 @@
-.\"

-.TH XKBCOMP 1 __xorgversion__

-.SH NAME

-xkbcomp \- compile XKB keyboard description

-.SH SYNOPSIS

-.B xkbcomp

-[option] source [ destination ]

-.SH DESCRIPTION

-.PP

-The

-.I xkbcomp

-keymap compiler converts a description of an XKB keymap into one of several

-output formats.   The most common use for xkbcomp is to create a compiled

-keymap file (.xkm extension) which can be read directly by XKB-capable X

-servers or utilities.   The keymap compiler can also produce C header

-files or XKB source files.  The C header files produced by xkbcomp can be

-included by X servers or utilities that need a built-in default keymap.

-The XKB source files produced by \fIxkbcomp\fP are fully resolved and can be 

-used to verify that the files which typically make up an XKB keymap

-are merged correctly or to create a single file which contains a complete

-description of the keymap.

-.PP

-The \fIsource\fP may specify an X display, or an \fI.xkb\fP or \fI.xkm\fP

-file;  unless explicitly specified, the format of \fIdestination\fP

-depends on the format of the source.   Compiling a \fI.xkb\fP (keymap source) 

-file generates a \fI.xkm\fP (compiled keymap file) by default.   If the 

-source is a \fI.xkm\fP file or an X display, \fIxkbcomp\fP generates a 

-keymap source file by default.

-.PP

-If the \fIdestination\fP is an X display, the keymap for the display

-is updated with the compiled keymap.

-.PP

-The name of the \fIdestination\fP is usually computed from the name

-of the source, with the extension replaced as appropriate.  When compiling

-a single map from a file which contains several maps, \fIxkbcomp\fP constructs

-the destination file name by appending an appropriate extension to the

-name of the map to be used.

-.SH OPTIONS

-.TP 8

-.B \-a

-Show all keyboard information, reporting implicit or derived information

-as a comment.  Only affects \fI.xkb\fP format output.

-.TP 8

-.B \-C

-Produce a C header file as output (.h extension).

-.TP 8

-.B \-dflts

-Compute defaults for any missing components, such as key names.

-.TP 8

-.B \-I\fIdir\fP

-Specifies top-level directories to be searched for files included by the 

-keymap description.  After all directories specified by \-I options

-have been searched, the current directory and finally, the default

-xkb directory (usually __projectroot__/lib/X11/xkb) will be searched.

-.sp

-To prevent the current and default directories from being searched,

-use the \-I option alone (i.e. without a directory), before any \-I

-options that specify the directories you do want searched.

-.TP 8

-.B \-i\ \fIdeviceid\fP

-If \fIsource\fP or \fIdestination\fP is a valid X display, load the keymap

-from/into the device with the specified ID (not name).

-.TP 8

-.B \-l

-List maps that specify the \fImap\fP pattern in any files listed on the

-command line (not implemented yet).

-.TP 8

-.B \-m\ \fIname\fP

-Specifies a map to be compiled from an file with multiple entries.

-.TP 8

-.B \-merge

-Merge the compiled information with the map from the server (not implemented

-yet).

-.TP 8

-.B \-o\ \fIname\fP

-Specifies a name for the generated output file.  The default is the name of 

-the source file with an appropriate extension for the output format.

-.TP 8

-.B \-opt\ \fIparts\fP

-Specifies a list of optional parts.  Compilation errors in any optional parts

-are not fatal.  Parts may consist of any combination of the letters \fIc\fP,

-\fIg\fP,\fIk\fP,\fIs\fP,\fIt\fP which specify the compatibility map, geometry,

-keycodes, symbols and types, respectively.

-.TP 8

-.B -R\fIdir\fP

-Specifies the root directory for relative path names.

-.TP 8

-.B -synch

-Force synchronization for X requests.

-.TP 8

-.B \-w\ \fIlvl\fP

-Controls the reporting of warnings during compilation.  A warning level 

-of 0 disables all warnings; a warning level of 10 enables them all.

-.TP 8

-.B \-xkb

-Generate a source description of the keyboard as output (.xkb extension).

-.TP 8

-.B \-xkm

-Generate a compiled keymap file as output (.xkm extension).

-.SH "SEE ALSO"

-X(__miscmansuffix__)

-.SH COPYRIGHT

-Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc.

-.br

-See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.

-.SH AUTHOR

-Erik Fortune, Silicon Graphics

+.\"
+.TH XKBCOMP 1 __xorgversion__
+.SH NAME
+xkbcomp \- compile XKB keyboard description
+.SH SYNOPSIS
+.B xkbcomp
+[option] source [ destination ]
+.SH DESCRIPTION
+.PP
+The
+.I xkbcomp
+keymap compiler converts a description of an XKB keymap into one of several
+output formats.   The most common use for xkbcomp is to create a compiled
+keymap file (.xkm extension) which can be read directly by XKB-capable X
+servers or utilities.   The keymap compiler can also produce C header
+files or XKB source files.  The C header files produced by xkbcomp can be
+included by X servers or utilities that need a built-in default keymap.
+The XKB source files produced by \fIxkbcomp\fP are fully resolved and can be
+used to verify that the files which typically make up an XKB keymap
+are merged correctly or to create a single file which contains a complete
+description of the keymap.
+.PP
+The \fIsource\fP may specify an X display, or an \fI.xkb\fP or \fI.xkm\fP
+file;  unless explicitly specified, the format of \fIdestination\fP
+depends on the format of the source.   Compiling a \fI.xkb\fP (keymap source)
+file generates a \fI.xkm\fP (compiled keymap file) by default.   If the
+source is a \fI.xkm\fP file or an X display, \fIxkbcomp\fP generates a
+keymap source file by default.
+.PP
+If the \fIdestination\fP is an X display, the keymap for the display
+is updated with the compiled keymap.
+.PP
+The name of the \fIdestination\fP is usually computed from the name
+of the source, with the extension replaced as appropriate.  When compiling
+a single map from a file which contains several maps, \fIxkbcomp\fP constructs
+the destination file name by appending an appropriate extension to the
+name of the map to be used.
+.SH OPTIONS
+.TP 8
+.B \-a
+Show all keyboard information, reporting implicit or derived information
+as a comment.  Only affects \fI.xkb\fP format output.
+.TP 8
+.B \-C
+Produce a C header file as output (.h extension).
+.TP 8
+.B \-dflts
+Compute defaults for any missing components, such as key names.
+.TP 8
+.B \-I\fIdir\fP
+Specifies top-level directories to be searched for files included by the
+keymap description.  After all directories specified by \-I options
+have been searched, the current directory and finally, the default
+xkb directory (usually __projectroot__/lib/X11/xkb) will be searched.
+.sp
+To prevent the current and default directories from being searched,
+use the \-I option alone (i.e. without a directory), before any \-I
+options that specify the directories you do want searched.
+.TP 8
+.B \-i\ \fIdeviceid\fP
+If \fIsource\fP or \fIdestination\fP is a valid X display, load the keymap
+from/into the device with the specified ID (not name).
+.TP 8
+.B \-l
+List maps that specify the \fImap\fP pattern in any files listed on the
+command line (not implemented yet).
+.TP 8
+.B \-m\ \fIname\fP
+Specifies a map to be compiled from an file with multiple entries.
+.TP 8
+.B \-merge
+Merge the compiled information with the map from the server (not implemented
+yet).
+.TP 8
+.B \-o\ \fIname\fP
+Specifies a name for the generated output file.  The default is the name of
+the source file with an appropriate extension for the output format.
+.TP 8
+.B \-opt\ \fIparts\fP
+Specifies a list of optional parts.  Compilation errors in any optional parts
+are not fatal.  Parts may consist of any combination of the letters \fIc\fP,
+\fIg\fP,\fIk\fP,\fIs\fP,\fIt\fP which specify the compatibility map, geometry,
+keycodes, symbols and types, respectively.
+.TP 8
+.B -R\fIdir\fP
+Specifies the root directory for relative path names.
+.TP 8
+.B -synch
+Force synchronization for X requests.
+.TP 8
+.B \-w\ \fIlvl\fP
+Controls the reporting of warnings during compilation.  A warning level
+of 0 disables all warnings; a warning level of 10 enables them all.
+.TP 8
+.B \-xkb
+Generate a source description of the keyboard as output (.xkb extension).
+.TP 8
+.B \-xkm
+Generate a compiled keymap file as output (.xkm extension).
+.SH "SEE ALSO"
+X(__miscmansuffix__)
+.SH COPYRIGHT
+Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc.
+.br
+See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+.SH AUTHOR
+Erik Fortune, Silicon Graphics