Update to libXmu 1.1.1

3 files changed, 255 insertions, 239 deletions

diff --git a/lib/libXmu/doc/Makefile.am b/lib/libXmu/doc/Makefile.am
index 3c1df531b..11a2fe13c 100644
--- a/lib/libXmu/doc/Makefile.am
+++ b/lib/libXmu/doc/Makefile.am
@@ -1,62 +1,16 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_DOCS
-dist_doc_DATA = Xmu.xml xlogo.svg
 
-if HAVE_XMLTO
-doc_DATA = Xmu.html
+# Main DocBook/XML files (DOCTYPE book)
+docbook = Xmu.xml
 
-if HAVE_FOP
-doc_DATA += Xmu.pdf Xmu.ps
-endif
+# Included chapters, appendix, images
+chapters = xlogo.svg
 
-if HAVE_XMLTO_TEXT
-doc_DATA += Xmu.txt
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
 
-CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
 
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
-	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-XML_SOURCEFILES =  $(srcdir)/Xmu.xml $(XSL_STYLESHEET)
-
-Xmu.txt: $(XML_SOURCEFILES)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $(srcdir)/Xmu.xml
-
-Xmu.html: $(XML_SOURCEFILES)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $(srcdir)/Xmu.xml
-
-Xmu.pdf: $(XML_SOURCEFILES)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $(srcdir)/Xmu.xml
-
-Xmu.ps: $(XML_SOURCEFILES)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $(srcdir)/Xmu.xml
-endif HAVE_XMLTO
 endif ENABLE_DOCS
diff --git a/lib/libXmu/doc/Makefile.in b/lib/libXmu/doc/Makefile.in
index 87c1de834..81099e6a3 100644
--- a/lib/libXmu/doc/Makefile.in
+++ b/lib/libXmu/doc/Makefile.in
@@ -15,26 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
+
 #
-# 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.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@@ -59,12 +52,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = Xmu.pdf Xmu.ps
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = Xmu.txt
-@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = xorg.css
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.ps)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(docbook:.xml=.pdf.db)
 subdir = doc
-DIST_COMMON = $(am__dist_doc_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -74,17 +70,17 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_doc_DATA_DIST = Xmu.xml xlogo.svg
+am__dist_shelf_DATA_DIST = Xmu.xml xlogo.svg
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
-dist_docDATA_INSTALL = $(INSTALL_DATA)
-docDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_doc_DATA) $(doc_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -100,6 +96,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -107,17 +104,14 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -125,13 +119,11 @@ EGREP = @EGREP@
 ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
 ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
 GREP = @GREP@
-HAS_SNPRINTF = @HAS_SNPRINTF@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
 HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
@@ -140,11 +132,14 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -157,6 +152,7 @@ LINTLIBUU = @LINTLIBUU@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -165,11 +161,16 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
 MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -182,6 +183,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
@@ -192,14 +194,13 @@ XMU_CFLAGS = @XMU_CFLAGS@
 XMU_LIBS = @XMU_LIBS@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -240,17 +241,76 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_DOCS_TRUE@dist_doc_DATA = Xmu.xml xlogo.svg
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc_DATA = Xmu.html $(am__append_1) \
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2) \
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_3)
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css
-@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@XML_SOURCEFILES = $(srcdir)/Xmu.xml $(XSL_STYLESHEET)
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_DOCS_TRUE@docbook = Xmu.xml
+
+# Included chapters, appendix, images
+@ENABLE_DOCS_TRUE@chapters = xlogo.svg
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_DOCS_TRUE@shelfdir = $(docdir)
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \
+@ENABLE_DOCS_TRUE@	$(am__append_3) $(am__append_4)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(abs_top_builddir)"
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_STYLESHEET_FLAGS)			\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_OLINK_FLAGS)
+
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_STYLESHEET_FLAGS)			\
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_IMAGEPATH_FLAGS)			\
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_PDF_OLINK_FLAGS)
+
+
+# Generate documents cross-reference target databases
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(abs_top_builddir)"
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@" 		\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only" 	\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam olink.base.uri "$(@:.db=)"
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -289,39 +349,39 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_docDATA: $(dist_doc_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-dist_docDATA:
+uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-docDATA: $(doc_DATA)
+install-shelfDATA: $(shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-docDATA:
+uninstall-shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; for p in $$list; do \
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -331,6 +391,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -361,7 +422,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -407,7 +468,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_docDATA install-docDATA
+install-data-am: install-dist_shelfDATA install-shelfDATA
 
 install-exec-am:
 
@@ -433,34 +494,34 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_docDATA uninstall-docDATA \
-	uninstall-info-am
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_docDATA \
-	install-docDATA install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data install-data-am install-dist_shelfDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-shelfDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_docDATA uninstall-docDATA uninstall-info-am
-
-@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
-@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.txt: $(XML_SOURCEFILES)
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $(srcdir)/Xmu.xml
-
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.html: $(XML_SOURCEFILES)
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $(srcdir)/Xmu.xml
-
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.pdf: $(XML_SOURCEFILES)
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $(srcdir)/Xmu.xml
-
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.ps: $(XML_SOURCEFILES)
-@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $(srcdir)/Xmu.xml
+	uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA
+
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters)
+@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libXmu/doc/Xmu.xml b/lib/libXmu/doc/Xmu.xml
index bd79d6efc..2d363a924 100644
--- a/lib/libXmu/doc/Xmu.xml
+++ b/lib/libXmu/doc/Xmu.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <!-- lifted from troff+ms+XMan by doclifter -->
 
 <article id='xmu'>
   <articleinfo>
     <title>Xmu and Xmuu Library API Reference</title>
+    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+    <copyright><year>1989</year><holder>X Consortium</holder>
+    </copyright>
     <abstract><para>&ldquo;Don't ask.&rdquo;</para></abstract>
 
     <legalnotice>
 
       <para>
-Copyright &copy; 1989 X Consortium
-      </para>
-      <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal
 in the Software without restriction, including without limitation the rights
@@ -46,8 +49,8 @@ is a trademark of The Open Group.
     </legalnotice>
   </articleinfo>
 
-  <sect1 id='introduction'>
-    <title>Introduction</title>
+  <sect1 id='Introduction'>
+<title>Introduction</title>
 
     <para>
 The Xmu Library is a collection of miscellaneous (some might say random)
@@ -78,8 +81,8 @@ cc -o xapplication xapplication.o `pkg-config --libs xmu`
 
   </sect1>
 
-  <sect1 id='atom_functions'>
-    <title>Atom Functions</title>
+  <sect1 id='Atom_Functions'>
+<title>Atom Functions</title>
 
     <para>
 To use the functions and macros defined in this section, you should include
@@ -200,11 +203,11 @@ value is cached, such that subsequent requests do not cause
 another round-trip to the server.
     </para>
 
-    <para id="XmuMakeAtom">
+    <para>
       <indexterm zone="XmuMakeAtom">
-	<primary><function>XmuMakeAtom</function></primary>
+	<primary><xref linkend='XmuMakeAtom' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuMakeAtom'>
 	<funcprototype>
 	  <funcdef>AtomPtr <function>XmuMakeAtom</function></funcdef>
 	  <paramdef>const char *<parameter>name</parameter></paramdef>
@@ -225,15 +228,15 @@ for an
 <type>Atom</type>
 with the
 given name.
-<function>XmuInternAtom</function>
+<xref linkend='XmuInternAtom' xrefstyle='select: title'/>
 can be used to cache the Atom value for one or more displays.
     </para>
 
-    <para id="XmuNameOfAtom">
+    <para>
       <indexterm zone="XmuNameOfAtom">
-	<primary><function>XmuNameOfAtom</function></primary>
+	<primary><xref linkend='XmuNameOfAtom' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuNameOfAtom'>
 	<funcprototype>
 	  <funcdef>char *<function>XmuNameOfAtom</function></funcdef>
 	  <paramdef>AtomPtr <parameter>atom_ptr</parameter></paramdef>
@@ -251,11 +254,11 @@ specifies the AtomPtr
 The function returns the name of an AtomPtr.
     </para>
 
-    <para id="XmuInternAtom">
+    <para>
       <indexterm zone="XmuInternAtom">
-	<primary><function>XmuInternAtom</function></primary>
+	<primary><xref linkend='XmuInternAtom' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuInternAtom'>
 	<funcprototype>
 	  <funcdef>Atom <function>XmuInternAtom</function></funcdef>
 	  <paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -287,11 +290,11 @@ is cached,
 such that subsequent requests do not cause another round-trip to the server.
     </para>
 
-    <para id="XmuGetAtomName">
+    <para>
       <indexterm zone="XmuGetAtomName">
-	<primary><function>XmuGetAtomName</function></primary>
+	<primary><xref linkend='XmuGetAtomName' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuGetAtomName'>
 	<funcprototype>
 	  <funcdef>char *<function>XmuGetAtomName</function></funcdef>
 	  <paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -319,11 +322,11 @@ The result is cached, such that subsequent
 requests do not cause another round-trip to the server.
     </para>
 
-    <para id="XmuInternStrings">
+    <para>
       <indexterm zone="XmuInternStrings">
-	<primary><function>XmuInternStrings</function></primary>
+	<primary><xref linkend='XmuInternStrings' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuInternStrings'>
 	<funcprototype>
 	  <funcdef>void <function>XmuInternStrings</function></funcdef>
 	  <paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -368,8 +371,8 @@ The caller is responsible for preallocating the array pointed at by atoms.
 
   </sect1>
 
-  <sect1 id='error_handler_functions'>
-    <title>Error Handler Functions</title>
+  <sect1 id='Error_Handler_Functions'>
+<title>Error Handler Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -381,11 +384,11 @@ file
 and link against the libXmu or libXmuu library.
     </para>
 
-    <para id="XmuPrintDefaultErrorMessage">
+    <para>
       <indexterm zone="XmuPrintDefaultErrorMessage">
-	<primary><function>XmuPrintDefaultErrorMessage</function></primary>
+	<primary><xref linkend='XmuPrintDefaultErrorMessage' xrefstyle='select: title'/></primary>
       </indexterm>
-      <funcsynopsis>
+      <funcsynopsis id='XmuPrintDefaultErrorMessage'>
 	<funcprototype>
 	  <funcdef>int <function>XmuPrintDefaultErrorMessage</function></funcdef>
 	  <paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -451,21 +454,21 @@ specifies the error
 This function ignores errors for
 <errorname>BadWindow</errorname>
 errors for
-<function>XQueryTree</function>
+<olink targetdoc='libX11' targetptr='XQueryTree'><function>XQueryTree</function></olink>
 and
-<function>XGetWindowAttributes</function>,
+<olink targetdoc='libX11' targetptr='XGetWindowAttributes'><function>XGetWindowAttributes</function></olink>,
 and ignores
 <errorname>BadDrawable</errorname>
 errors for
-<function>XGetGeometry</function>;
+<olink targetdoc='libX11' targetptr='XGetGeometry'><function>XGetGeometry</function></olink>;
 it returns 0 in those cases.  Otherwise, it prints the default error message,
 and returns a non-zero value if the caller should consider exiting,
 and 0 if the caller should not exit.
     </para>
   </sect1>
 
-  <sect1 id='system_utility_functions'>
-    <title>System Utility Functions</title>
+  <sect1 id='System_Utility_Functions'>
+<title>System Utility Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -547,8 +550,8 @@ in software that needs to continue to support non-Unix98 compliant platforms.
 
   </sect1>
 
-  <sect1 id='window_utility_functions'>
-    <title>Window Utility Functions</title>
+  <sect1 id='Window_Utility_Functions'>
+<title>Window Utility Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -672,17 +675,17 @@ and
 flags in the hints structure, and then stores the hints for the
 window using
       <indexterm zone="XmuUpdateMapHints">
-	<primary><function>XSetWMNormalHints</function></primary>
+	<primary><olink targetdoc='libX11' targetptr='XSetWMNormalHints'><function>XSetWMNormalHints</function></olink></primary>
       </indexterm>
-<function>XSetWMNormalHints</function>
+<olink targetdoc='libX11' targetptr='XSetWMNormalHints'><function>XSetWMNormalHints</function></olink>
 and returns
 <symbol>True</symbol>.
 If <symbol>NULL</symbol> is passed for the
 hints structure, then the current hints are read back from the window using
       <indexterm zone="XmuUpdateMapHints">
-	<primary><function>XGetWMNormalHints</function></primary>
+	<primary><olink targetdoc='libX11' targetptr='XGetWMNormalHints'><function>XGetWMNormalHints</function></olink></primary>
       </indexterm>
-<function>XGetWMNormalHints</function>
+<olink targetdoc='libX11' targetptr='XGetWMNormalHints'><function>XGetWMNormalHints</function></olink>
 and are used instead, and
 <symbol>True</symbol>
 is returned; otherwise
@@ -692,8 +695,8 @@ is returned.
 
   </sect1>
 
-  <sect1 id='cursor_utility_functions'>
-    <title>Cursor Utility Functions</title>
+  <sect1 id='Cursor_Utility_Functions'>
+<title>Cursor Utility Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -733,8 +736,8 @@ manual.
 
   </sect1>
 
-  <sect1 id='graphics_functions'>
-    <title>Graphics Functions</title>
+  <sect1 id='Graphics_Functions'>
+<title>Graphics Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -978,7 +981,13 @@ specifies the logo height
 	</varlistentry>
       </variablelist>
 
-      <figure id="xlogo" float="1" pgwide="0">
+This function draws the &ldquo;official&rdquo; X Window System logo
+(<xref linkend="xlogo"/>).  The bounding box
+of the logo in the drawable is given by x, y, width, and height.  The logo
+itself is filled using gcFore, and the rest of the rectangle is filled using
+gcBack.
+    </para>
+      <figure id="xlogo" pgwide="0">
 	<title>The X Logo</title>
 	<mediaobject>
 	  <imageobject>
@@ -986,14 +995,6 @@ specifies the logo height
 	  </imageobject>
 	</mediaobject>
       </figure>
-
-This function draws the &ldquo;official&rdquo; X Window System logo
-(<xref linkend="xlogo"/>).  The bounding box
-of the logo in the drawable is given by x, y, width, and height.  The logo
-itself is filled using gcFore, and the rest of the rectangle is filled using
-gcBack.
-    </para>
-
     <para id="XmuCreateStippledPixmap">
       <indexterm zone="XmuCreateStippledPixmap">
 	<primary><function>XmuCreateStippledPixmap</function></primary>
@@ -1127,10 +1128,10 @@ returns the y coordinate of the hotspot
 
 This function reads a standard bitmap file description from the specified
 stream, and returns the parsed data in a format suitable for passing to
-<function>XCreateBitmapFromData</function>.
+<olink targetdoc='libX11' targetptr='XCreateBitmapFromData'><function>XCreateBitmapFromData</function></olink>.
 The return value of the function has the same
 interpretation as the return value for
-<function>XReadBitmapFile</function>.
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>.
     </para>
 
     <para id="XmuReadBitmapDataFromFile">
@@ -1189,10 +1190,10 @@ returns the y coordinate of the hotspot
 
 This function reads a standard bitmap file description from the specified
 file, and returns the parsed data in a format suitable for passing to
-<function>XCreateBitmapFromData</function>.
+<olink targetdoc='libX11' targetptr='XCreateBitmapFromData'><function>XCreateBitmapFromData</function></olink>.
 The return value of the function has the same
 interpretation as the return value for
-<function>XReadBitmapFile</function>.
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>.
     </para>
 
     <para id="XmuLocateBitmapFile">
@@ -1264,7 +1265,7 @@ returns the y coordinate of the hotspot
       </variablelist>
 
 This function reads a file in standard bitmap file format, using
-<function>XReadBitmapFile</function>,
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>,
 and returns the created bitmap.  The filename may be
 absolute, or relative to the global resource named
       <indexterm zone="XmuLocateBitmapFile">
@@ -1351,7 +1352,7 @@ specifies the background pixel value
 
 This function creates a pixmap of the specified width, height, and depth, on
 the same screen as the specified drawable, and then performs an
-<function>XCopyPlane</function>
+<olink targetdoc='libX11' targetptr='XCopyPlane'><function>XCopyPlane</function></olink>
 from the specified bitmap to the pixmap,
 using the specified foreground and background pixel values.
 The created pixmap is returned.
@@ -1359,8 +1360,8 @@ The created pixmap is returned.
 
   </sect1>
 
-  <sect1 id='selection_functions'>
-    <title>Selection Functions</title>
+  <sect1 id='Selection_Functions'>
+<title>Selection Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -1449,8 +1450,8 @@ if the conversion was successful, else it returns
     </para>
   </sect1>
 
-  <sect1 id='type_converter_functions'>
-    <title>Type Converter Functions</title>
+  <sect1 id='Type_Converter_Functions'>
+<title>Type Converter Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -2309,8 +2310,8 @@ XtSetTypeConverter(XtRString, XtRWidget, XmuNewCvtStringToWidget,
 
   </sect1>
 
-  <sect1 id='character_set_functions'>
-    <title>Character Set Functions</title>
+  <sect1 id='Character_Set_Functions'>
+<title>Character Set Functions</title>
 
 <para>
 To use the functions defined in this section, you should include the header
@@ -2516,8 +2517,8 @@ less than second.  The two strings are assumed to be encoded using ISO
     </para>
   </sect1>
 
-  <sect1 id='keyboard_event'>
-    <title>Keyboard Event Translation Functions</title>
+  <sect1 id='Keyboard_Event_Translation_Functions'>
+<title>Keyboard Event Translation Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -2532,7 +2533,7 @@ and link against the libXmu library.
     <warning><para>
 The functions in this section are <emphasis remap='B'>deprecated</emphasis> because they don't work
 in most locales now supported by X11; the function
-<function>XmbLookupString</function>
+<olink targetdoc='libX11' targetptr='XmbLookupString'><function>XmbLookupString</function></olink>
 provides a better alternative.
       </para></warning>
 
@@ -2584,7 +2585,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is identical to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 and exists only for naming symmetry with other functions.
     </para>
 
@@ -2636,7 +2637,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to an Latin-2 (ISO 8859-2) string, or to an ASCII control string.
     </para>
@@ -2689,7 +2690,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to an Latin-3 (ISO 8859-3) string, or to an ASCII control string.
     </para>
@@ -2742,7 +2743,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to an Latin-4 (ISO 8859-4) string, or to an ASCII control string.
     </para>
@@ -2795,7 +2796,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a string in an encoding consisting of Latin-1 (ISO 8859-1) and ASCII
 control in the Graphics Left half (values 0 to 127), and Katakana in the
@@ -2851,7 +2852,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a string in the JIS X0201-1976 encoding, including ASCII control.
     </para>
@@ -2904,7 +2905,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a Latin/Arabic (ISO 8859-6) string, or to an ASCII control string.
     </para>
@@ -2957,7 +2958,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a Latin/Cyrillic (ISO 8859-5) string, or to an ASCII control string.
     </para>
@@ -3010,7 +3011,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a Latin/Greek (ISO 8859-7) string, or to an ASCII control string.
     </para>
@@ -3063,7 +3064,7 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event
 to a Latin/Hebrew (ISO 8859-8) string, or to an ASCII control string.
     </para>
@@ -3116,14 +3117,14 @@ specifies or returns the compose state
       </variablelist>
 
 This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
 except that it maps a key event to an APL string.
     </para>
 
   </sect1>
 
-  <sect1 id='compound_text_functions'>
-    <title>Compound Text Functions</title>
+  <sect1 id='Compound_Text_Functions'>
+<title>Compound Text Functions</title>
 
     <para>
 The functions defined in this section are for parsing Compound Text strings,
@@ -3477,8 +3478,8 @@ structure.
 
   </sect1>
 
-  <sect1 id='closedisplay_hook_functions'>
-    <title>CloseDisplay Hook Functions</title>
+  <sect1 id='CloseDisplay_Hook_Functions'>
+<title>CloseDisplay Hook Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -3651,8 +3652,8 @@ if a matching callback exists, else returns
     </para>
   </sect1>
 
-  <sect1 id='display_queue_functions'>
-    <title>Display Queue Functions</title>
+  <sect1 id='Display_Queue_Functions'>
+<title>Display Queue Functions</title>
 
     <para>
 To use the functions and types defined in this section, you should include the
@@ -3916,8 +3917,8 @@ is not called on the display.
 
   </sect1>
 
-  <sect1 id='toolkit_convenience_functions'>
-    <title>Toolkit Convenience Functions</title>
+  <sect1 id='Toolkit_Convenience_Functions'>
+<title>Toolkit Convenience Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -3994,8 +3995,8 @@ Otherwise, this function does nothing.
 
   </sect1>
 
-  <sect1 id='standard_colormap_functions'>
-    <title>Standard Colormap Functions</title>
+  <sect1 id='Standard_Colormap_Functions'>
+<title>Standard Colormap Functions</title>
 
     <para>
 To use the functions defined in this section, you should include the header
@@ -4533,8 +4534,8 @@ possible.
 
   </sect1>
 
-  <sect1 id='widget_description_functions'>
-    <title>Widget Description Functions</title>
+  <sect1 id='Widget_Description_Functions'>
+<title>Widget Description Functions</title>
 
     <para>
 The functions defined in this section are for building a description of
@@ -4600,7 +4601,7 @@ specifies the widget class for which resources should be obtained.
 specifies the widget that should be used for creating an instance of
 <parameter>node</parameter>
 from which resources are extracted.  This is typically the value returned
-by <function>XtAppInitialize</function>.
+by <olink targetdoc='libXaw' targetptr='XtAppInitialize'><function>XtAppInitialize</function></olink>.
 	    </para></listitem>
 	</varlistentry>
 	<varlistentry>
@@ -4695,8 +4696,8 @@ widget name or widget class name.  If no match is found, it returns
 
   </sect1>
 
-  <sect1 id='participation_in_the_editres_protocol'>
-    <title>Participation in the Editres Protocol</title>
+  <sect1 id='Participation_in_the_Editres_Protocol'>
+<title>Participation in the Editres Protocol</title>
 
     <para>
       <indexterm>